From b5ce95e5e7f1134a951eed212e558c9a40732acb Mon Sep 17 00:00:00 2001 From: Simon Boucher Date: Fri, 12 Aug 2022 08:00:51 -0400 Subject: [PATCH] V4.4.0 Released --- .../AeroColors.cs | 7 +- .../AeroTheme.cs | 10 +- .../Brushes.xaml | 2 +- .../Controls/SplineBorder.cs | 284 ++-- .../Properties/AssemblyInfo.cs | 8 +- .../Theme.xaml | 17 +- ...eed.Wpf.AvalonDock.Themes.Aero.NET5.csproj | 88 + .../Brushes.xaml | 2 +- .../MetroTheme.cs | 10 +- .../Properties/AssemblyInfo.cs | 8 +- .../Theme.xaml | 16 +- ...ed.Wpf.AvalonDock.Themes.Metro.NET5.csproj | 85 + .../Brushes.xaml | 2 +- .../Properties/AssemblyInfo.cs | 9 +- .../Theme.xaml | 17 +- .../VS2010Theme.cs | 10 +- ...d.Wpf.AvalonDock.Themes.VS2010.NET5.csproj | 85 + .../Commands/RelayCommand.cs | 2 +- .../AnchorablePaneControlOverlayArea.cs | 2 +- .../Controls/AnchorablePaneDropTarget.cs | 12 +- .../Controls/AnchorablePaneTabPanel.cs | 5 +- .../Controls/AnchorablePaneTitle.cs | 10 +- .../Controls/AutoHideWindowManager.cs | 2 +- .../Controls/BindingHelper.cs | 8 +- .../Controls/ContextMenuEx.cs | 2 +- .../Controls/DockingManagerDropTarget.cs | 11 +- .../Controls/DockingManagerOverlayArea.cs | 2 +- .../DocumentPaneControlOverlayArea.cs | 4 +- .../DocumentPaneDropAsAnchorableTarget.cs | 11 +- .../Controls/DocumentPaneDropTarget.cs | 25 +- .../Controls/DocumentPaneGroupDropTarget.cs | 21 +- .../Controls/DocumentPaneTabPanel.cs | 6 +- .../Controls/DragService.cs | 6 +- .../Xceed.Wpf.AvalonDock/Controls/DropArea.cs | 4 +- .../Controls/DropDownButton.cs | 10 +- .../Controls/DropDownControlArea.cs | 2 +- .../Controls/DropTarget.cs | 8 +- .../Controls/DropTargetBase.cs | 2 +- .../Controls/DropTargetType.cs | 2 +- .../Controls/Extentions.cs | 2 +- .../Controls/FocusElementManager.cs | 10 +- .../Controls/FullWeakDictionary.cs | 2 +- .../Controls/IDropTarget.cs | 2 +- .../Controls/IOverlayWindow.cs | 2 +- .../Controls/IOverlayWindowArea.cs | 2 +- .../Controls/IOverlayWindowDropTarget.cs | 2 +- .../Controls/IOverlayWindowHost.cs | 2 +- .../Controls/LayoutAnchorControl.cs | 2 +- .../Controls/LayoutAnchorGroupControl.cs | 8 +- .../Controls/LayoutAnchorSideControl.cs | 2 +- .../Controls/LayoutAnchorableControl.cs | 8 +- .../LayoutAnchorableFloatingWindowControl.cs | 16 +- .../Controls/LayoutAnchorableItem.cs | 8 +- .../Controls/LayoutAnchorablePaneControl.cs | 5 +- .../LayoutAnchorablePaneGroupControl.cs | 4 +- .../Controls/LayoutAnchorableTabItem.cs | 6 +- .../Controls/LayoutAutoHideWindowControl.cs | 8 +- .../Controls/LayoutCachePaneControl.cs | 6 +- .../Controls/LayoutDocumentControl.cs | 6 +- .../LayoutDocumentFloatingWindowControl.cs | 8 +- .../Controls/LayoutDocumentItem.cs | 12 +- .../Controls/LayoutDocumentPaneControl.cs | 4 +- .../LayoutDocumentPaneGroupControl.cs | 4 +- .../Controls/LayoutDocumentTabItem.cs | 8 +- .../Controls/LayoutFloatingWindowControl.cs | 29 +- .../Controls/LayoutGridControl.cs | 32 +- .../Controls/LayoutGridResizerControl.cs | 4 +- .../Controls/LayoutItem.cs | 10 +- .../Controls/LayoutPanelControl.cs | 7 +- .../Controls/MenuItemEx.cs | 4 +- .../Controls/NavigatorWindow.cs | 100 +- .../Controls/OverlayArea.cs | 2 +- .../Controls/OverlayWindow.cs | 2 +- .../Controls/OverlayWindowDropTarget.cs | 2 +- .../Controls/OverlayWindowDropTargetType.cs | 2 +- .../Controls/ReentrantFlag.cs | 2 +- .../Controls/Shell/Standard/ComGuids.cs | 2 +- .../Controls/Shell/Standard/Debug.cs | 2 +- .../Controls/Shell/Standard/DoubleUtil.cs | 3 +- .../Controls/Shell/Standard/DpiHelper.cs | 2 +- .../Controls/Shell/Standard/ErrorCodes.cs | 2 +- .../Controls/Shell/Standard/MessageWindow.cs | 6 +- .../Controls/Shell/Standard/NativeMethods.cs | 21 +- .../Controls/Shell/Standard/ShellProvider.cs | 2 +- .../Controls/Shell/Standard/StreamHelper.cs | 2 +- .../Controls/Shell/Standard/Utilities.cs | 6 +- .../Controls/Shell/Standard/Verify.cs | 2 +- .../Controls/Shell/SystemCommands.cs | 4 +- .../Controls/Shell/SystemParameters2.cs | 4 +- .../Controls/Shell/WindowChrome.cs | 4 +- .../Controls/Shell/WindowChromeWorker.cs | 7 +- .../Controls/TransformExtentions.cs | 2 +- .../Controls/WeakDictionary.cs | 2 +- .../Controls/WindowActivateEventArgs.cs | 2 +- .../Controls/WindowHookHandler.cs | 2 +- ...mmandLayoutItemFromLayoutModelConverter.cs | 2 +- .../Converters/AnchorSideToAngleConverter.cs | 2 +- .../AnchorSideToOrientationConverter.cs | 4 +- ...rableContextMenuAutoHideHeaderConverter.cs | 6 +- ...rableContextMenuHideVisibilityConverter.cs | 2 +- ...mmandLayoutItemFromLayoutModelConverter.cs | 4 +- .../Converters/BoolToVisibilityConverter.cs | 4 +- ...mmandLayoutItemFromLayoutModelConverter.cs | 4 +- .../InverseBoolToVisibilityConverter.cs | 4 +- .../LayoutItemFromLayoutModelConverter.cs | 2 +- .../Converters/NullToDoNothingConverter.cs | 2 +- .../UriSourceToBitmapImageConverter.cs | 4 +- .../Xceed.Wpf.AvalonDock/DockingManager.cs | 55 +- .../DocumentClosedEventArgs.cs | 2 +- .../DocumentClosingEventArgs.cs | 2 +- .../Src/Xceed.Wpf.AvalonDock/Extentions.cs | 4 +- .../Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs | 2 +- .../Layout/AnchorableShowStrategy.cs | 2 +- .../Layout/ChildrenTreeChangedEventArgs.cs | 2 +- .../Xceed.Wpf.AvalonDock/Layout/Extentions.cs | 4 +- .../Layout/ILayoutAnchorablePane.cs | 2 +- .../Layout/ILayoutContainer.cs | 2 +- .../Layout/ILayoutContentSelector.cs | 2 +- .../Layout/ILayoutControl.cs | 2 +- .../Layout/ILayoutDocumentPane.cs | 2 +- .../Layout/ILayoutElement.cs | 2 +- .../Layout/ILayoutElementWithVisibility.cs | 2 +- .../Layout/ILayoutGroup.cs | 2 +- .../Layout/ILayoutInitialContainer.cs | 2 +- .../Layout/ILayoutOrientableElement.cs | 2 +- .../Layout/ILayoutPane.cs | 2 +- .../Layout/ILayoutPaneSerializable.cs | 2 +- .../Layout/ILayoutPanelElement.cs | 2 +- .../Layout/ILayoutPositionableElement.cs | 2 +- .../Layout/ILayoutPreviousContainer.cs | 2 +- .../Layout/ILayoutRoot.cs | 2 +- .../Layout/ILayoutUpdateStrategy.cs | 2 +- .../Layout/LayoutAnchorGroup.cs | 2 +- .../Layout/LayoutAnchorSide.cs | 2 +- .../Layout/LayoutAnchorable.cs | 17 +- .../Layout/LayoutAnchorableFloatingWindow.cs | 6 +- .../Layout/LayoutAnchorablePane.cs | 2 +- .../Layout/LayoutAnchorablePaneGroup.cs | 12 +- .../Layout/LayoutContent.cs | 26 +- .../Layout/LayoutDocument.cs | 3 +- .../Layout/LayoutDocumentFloatingWindow.cs | 6 +- .../Layout/LayoutDocumentPane.cs | 2 +- .../Layout/LayoutDocumentPaneGroup.cs | 2 +- .../Layout/LayoutElement.cs | 4 +- .../Layout/LayoutElementEventArgs.cs | 2 +- .../Layout/LayoutFloatingWindow.cs | 6 +- .../Layout/LayoutGroup.cs | 6 +- .../Layout/LayoutGroupBase.cs | 2 +- .../Layout/LayoutPanel.cs | 4 +- .../Layout/LayoutPositionableGroup.cs | 4 +- .../Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs | 15 +- .../LayoutSerializationCallbackEventArgs.cs | 2 +- .../Layout/Serialization/LayoutSerializer.cs | 2 +- .../Serialization/XmlLayoutSerializer.cs | 4 +- .../Xceed.Wpf.AvalonDock/LayoutEventArgs.cs | 2 +- .../Src/Xceed.Wpf.AvalonDock/MathHelper.cs | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Resources.cs-CZ.Designer.cs | 2 +- .../Properties/Resources.de.Designer.cs | 2 +- .../Properties/Resources.es.Designer.cs | 2 +- .../Properties/Resources.fr.Designer.cs | 2 +- .../Properties/Resources.hu.Designer.cs | 2 +- .../Properties/Resources.it.Designer.cs | 2 +- .../Properties/Resources.ja-JP.Designer.cs | 2 +- .../Properties/Resources.nl-BE.Designer.cs | 17 + .../Properties/Resources.nl-BE.resx | 183 +++ .../Properties/Resources.pt-BR.Designer.cs | 2 +- .../Properties/Resources.ro.Designer.cs | 2 +- .../Properties/Resources.ru.Designer.cs | 2 +- .../Properties/Resources.sv.Designer.cs | 2 +- .../Properties/Resources.zh-Hans.Designer.cs | 2 +- .../Xceed.Wpf.AvalonDock/Themes/Default.xaml | 16 +- .../Themes/DictionaryTheme.cs | 2 +- .../Themes/GenericTheme.cs | 8 +- .../Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs | 2 +- .../Xceed.Wpf.AvalonDock/Themes/generic.xaml | 2 +- .../Src/Xceed.Wpf.AvalonDock/Win32Helper.cs | 2 +- .../Src/Xceed.Wpf.AvalonDock/WindowHelper.cs | 4 +- .../Xceed.Wpf.AvalonDock.NET5.csproj | 365 +++++ .../Xceed.Wpf.AvalonDock.csproj | 9 + .../Xceed.Wpf.Toolkit.LiveExplorer/App.xaml | 2 +- .../App.xaml.cs | 7 +- .../Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs | 13 +- .../AutoSelectTextboxView.xaml.cs.txt | 2 +- .../CodeFiles/AutoSelectTextboxView.xaml.txt | 2 +- .../AvalonDockPropertiesView.xaml.cs.txt | 2 +- .../AvalonDockPropertiesView.xaml.txt | 2 +- .../AvalonDockSourcesView.xaml.cs.txt | 2 +- .../CodeFiles/AvalonDockSourcesView.xaml.txt | 2 +- .../CodeFiles/AvalonDockView.xaml.cs.txt | 4 +- .../CodeFiles/AvalonDockView.xaml.txt | 2 +- ...catorCustomContentTemplateView.xaml.cs.txt | 2 +- ...ndicatorCustomContentTemplateView.xaml.txt | 2 +- ...BusyIndicatorCustomContentView.xaml.cs.txt | 2 +- .../BusyIndicatorCustomContentView.xaml.txt | 2 +- .../CodeFiles/BusyIndicatorView.xaml.cs.txt | 4 +- .../CodeFiles/BusyIndicatorView.xaml.txt | 2 +- .../CodeFiles/ButtonSpinnerView.xaml.cs.txt | 5 +- .../CodeFiles/ButtonSpinnerView.xaml.txt | 2 +- .../CodeFiles/CalculatorView.xaml.cs.txt | 2 +- .../CodeFiles/CalculatorView.xaml.txt | 2 +- .../CodeFiles/ChartAxisView.xaml.cs.txt | 8 +- .../CodeFiles/ChartAxisView.xaml.txt | 2 +- .../CodeFiles/ChartLegendView.xaml.cs.txt | 4 +- .../CodeFiles/ChartLegendView.xaml.txt | 2 +- .../ChartSeriesBasicTypesView.xaml.cs.txt | 5 +- .../ChartSeriesBasicTypesView.xaml.txt | 2 +- ...artSeriesDataPointsBindingView.xaml.cs.txt | 7 +- .../ChartSeriesDataPointsBindingView.xaml.txt | 2 +- .../ChartStylingAxesGridView.xaml.cs.txt | 7 +- .../ChartStylingAxesGridView.xaml.txt | 2 +- .../ChartStylingColumnSeriesView.xaml.cs.txt | 5 +- .../ChartStylingColumnSeriesView.xaml.txt | 2 +- .../ChartStylingLineSeriesView.xaml.cs.txt | 5 +- .../ChartStylingLineSeriesView.xaml.txt | 2 +- .../ChartStylingPieSeriesView.xaml.cs.txt | 8 +- .../ChartStylingPieSeriesView.xaml.txt | 2 +- .../CodeFiles/CheckListsView.xaml.cs.txt | 5 +- .../CodeFiles/CheckListsView.xaml.txt | 2 +- .../CodeFiles/ChildWindowView.xaml.cs.txt | 6 +- .../CodeFiles/ChildWindowView.xaml.txt | 2 +- .../CodeFiles/ColorView.xaml.cs.txt | 6 +- .../CodeFiles/ColorView.xaml.txt | 2 +- .../CodeFiles/DataGridView.xaml.cs.txt | 2 +- .../CodeFiles/DataGridView.xaml.txt | 2 +- .../CodeFiles/DateTimeView.xaml.cs.txt | 4 +- .../CodeFiles/DateTimeView.xaml.txt | 604 ++++--- .../DropDownSplitButtonView.xaml.cs.txt | 2 +- .../DropDownSplitButtonView.xaml.txt | 2 +- .../CodeFiles/ExtTabControlView.xaml.cs.txt | 4 +- .../CodeFiles/ExtTabControlView.xaml.txt | 14 +- .../CodeFiles/FilePickerView.xaml.cs.txt | 5 +- .../CodeFiles/FilePickerView.xaml.txt | 2 +- .../CodeFiles/IconButtonView.xaml.cs.txt | 2 +- .../CodeFiles/IconButtonView.xaml.txt | 2 +- .../CodeFiles/ListBoxView.xaml.cs.txt | 8 +- .../CodeFiles/ListBoxView.xaml.txt | 2 +- .../CodeFiles/MagnifierView.xaml.cs.txt | 12 +- .../CodeFiles/MagnifierView.xaml.txt | 2 +- .../CodeFiles/MaskedTextboxView.xaml.cs.txt | 2 +- .../CodeFiles/MaskedTextboxView.xaml.txt | 2 +- .../CodeFiles/MaterialButtonView.xaml.cs.txt | 5 +- .../CodeFiles/MaterialButtonView.xaml.txt | 2 +- .../MaterialCheckBoxView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialCheckBoxView.xaml.txt | 2 +- .../MaterialComboBoxView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialComboBoxView.xaml.txt | 2 +- .../MaterialControlsView.xaml.cs.txt | 2 +- .../CodeFiles/MaterialControlsView.xaml.txt | 2 +- .../CodeFiles/MaterialDemoView.cs.txt | 4 +- .../MaterialDropDownView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialDropDownView.xaml.txt | 2 +- .../CodeFiles/MaterialFrameView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialFrameView.xaml.txt | 2 +- .../MaterialHamburgerView.xaml.cs.txt | 2 +- .../CodeFiles/MaterialHamburgerView.xaml.txt | 2 +- .../CodeFiles/MaterialListBoxView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialListBoxView.xaml.txt | 2 +- ...aterialProgressBarCircularView.xaml.cs.txt | 5 +- .../MaterialProgressBarCircularView.xaml.txt | 2 +- .../MaterialProgressBarView.xaml.cs.txt | 5 +- .../MaterialProgressBarView.xaml.txt | 2 +- .../MaterialRadioButtonView.xaml.cs.txt | 7 +- .../MaterialRadioButtonView.xaml.txt | 2 +- .../CodeFiles/MaterialSliderView.xaml.cs.txt | 10 +- .../CodeFiles/MaterialSliderView.xaml.txt | 2 +- .../CodeFiles/MaterialSwitchView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialSwitchView.xaml.txt | 2 +- .../CodeFiles/MaterialTabsView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialTabsView.xaml.txt | 2 +- .../MaterialTextFieldView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialTextFieldView.xaml.txt | 2 +- .../CodeFiles/MaterialToastView.xaml.cs.txt | 2 +- .../CodeFiles/MaterialToastView.xaml.txt | 2 +- .../CodeFiles/MaterialToolTipView.xaml.cs.txt | 7 +- .../CodeFiles/MaterialToolTipView.xaml.txt | 2 +- .../CodeFiles/MultiCalendarView.xaml.cs.txt | 8 +- .../CodeFiles/MultiCalendarView.xaml.txt | 2 +- .../MultiColumnComboBoxView.xaml.cs.txt | 4 +- .../MultiColumnComboBoxView.xaml.txt | 2 +- .../MultiLineTextEditorView.xaml.cs.txt | 2 +- .../MultiLineTextEditorView.xaml.txt | 2 +- .../CodeFiles/NumericView.xaml.cs.txt | 3 +- .../CodeFiles/NumericView.xaml.txt | 2 +- .../CodeFiles/PieChartView.xaml.cs.txt | 7 +- .../CodeFiles/PieChartView.xaml.txt | 2 +- .../CodeFiles/PieProgressView.xaml.cs.txt | 4 +- .../CodeFiles/PieProgressView.xaml.txt | 2 +- .../CodeFiles/PieView.xaml.cs.txt | 9 +- .../CodeFiles/PieView.xaml.txt | 2 +- .../CodeFiles/PileFlowPanelView.xaml.cs.txt | 13 +- .../CodeFiles/PileFlowPanelView.xaml.txt | 2 +- ...rtyGridAdvancedContextMenuView.xaml.cs.txt | 14 +- .../PropertyGridAttributesView.xaml.cs.txt | 90 +- .../PropertyGridAttributesView.xaml.txt | 2 +- ...opertyGridBindingToStructsView.xaml.cs.txt | 4 +- .../PropertyGridBindingToStructsView.xaml.txt | 2 +- .../PropertyGridCategoryOrderView.xaml.cs.txt | 55 +- .../PropertyGridCategoryOrderView.xaml.txt | 2 +- .../PropertyGridCustomEditorsView.xaml.cs.txt | 11 +- .../PropertyGridCustomEditorsView.xaml.txt | 2 +- ...PropertyGridCustomPropertyView.xaml.cs.txt | 10 +- .../PropertyGridCustomPropertyView.xaml.txt | 2 +- ...PropertyGridDefaultEditorsView.xaml.cs.txt | 168 +- .../PropertyGridDefaultEditorsView.xaml.txt | 2 +- .../PropertyGridDefinitionKeyView.xaml.cs.txt | 4 +- .../PropertyGridDefinitionKeyView.xaml.txt | 2 +- ...rtyGridDisplayLocalizationView.xaml.cs.txt | 9 +- ...opertyGridDisplayLocalizationView.xaml.txt | 2 +- ...orComboBoxDefinitionSourceView.xaml.cs.txt | 14 +- ...ditorComboBoxDefinitionSourceView.xaml.txt | 2 +- ...pertyGridEditorDefinitionsView.xaml.cs.txt | 6 +- ...PropertyGridEditorDefinitionsView.xaml.txt | 2 +- ...GridExpandingNonPrimitivesView.xaml.cs.txt | 2 +- ...rtyGridExpandingNonPrimitivesView.xaml.txt | 2 +- ...tyGridMultiSelectedObjectsView.xaml.cs.txt | 15 +- ...pertyGridMultiSelectedObjectsView.xaml.txt | 2 +- ...opertyGridPropertiesSourceView.xaml.cs.txt | 8 +- .../PropertyGridPropertiesSourceView.xaml.txt | 2 +- .../PropertyGridPropertiesView.xaml.cs.txt | 10 +- .../PropertyGridPropertiesView.xaml.txt | 2 +- ...pertyGridPropertyItemStyleView.xaml.cs.txt | 21 +- ...PropertyGridPropertyItemStyleView.xaml.txt | 40 +- ...PropertyGridSelectedObjectView.xaml.cs.txt | 6 +- .../PropertyGridSelectedObjectView.xaml.txt | 2 +- ...tyGridSpecifyingPropertiesView.xaml.cs.txt | 2 +- ...pertyGridSpecifyingPropertiesView.xaml.txt | 2 +- .../CodeFiles/PropertyGridView.xaml.cs.txt | 4 +- .../CodeFiles/PropertyGridView.xaml.txt | 2 +- .../CodeFiles/RadialGaugeView.xaml.cs.txt | 5 +- .../CodeFiles/RadialGaugeView.xaml.txt | 2 +- .../CodeFiles/RangeSliderView.xaml.cs.txt | 9 +- .../CodeFiles/RangeSliderView.xaml.txt | 2 +- .../CodeFiles/RatingView.xaml.cs.txt | 4 +- .../CodeFiles/RatingView.xaml.txt | 2 +- .../CodeFiles/RichTextboxView.xaml.cs.txt | 7 +- .../CodeFiles/RichTextboxView.xaml.txt | 2 +- .../CodeFiles/SlideShowView.xaml.cs.txt | 32 +- .../CodeFiles/SlideShowView.xaml.txt | 2 +- .../CodeFiles/StyleableWindowView.xaml.cs.txt | 144 +- .../CodeFiles/StyleableWindowView.xaml.txt | 326 ++-- .../CodeFiles/SwitchPanelView.xaml.cs.txt | 13 +- .../CodeFiles/SwitchPanelView.xaml.txt | 2 +- .../ThemingAvalonDockView.xaml.cs.txt | 14 +- .../CodeFiles/ThemingAvalonDockView.xaml.txt | 2 +- .../CodeFiles/ThemingCoreWPFView.xaml.cs.txt | 8 +- .../CodeFiles/ThemingCoreWPFView.xaml.txt | 2 +- .../CodeFiles/ThemingDataGridView.xaml.cs.txt | 10 +- .../CodeFiles/ThemingDataGridView.xaml.txt | 2 +- .../ThemingExtendedToolkitView.xaml.cs.txt | 4 +- .../ThemingExtendedToolkitView.xaml.txt | 2 +- .../CodeFiles/ThemingListBoxView.xaml.cs.txt | 8 +- .../CodeFiles/ThemingListBoxView.xaml.txt | 2 +- .../CodeFiles/TimeSpanView.xaml.cs.txt | 15 +- .../CodeFiles/TimeSpanView.xaml.txt | 75 +- .../CodeFiles/TimelinePanelView.xaml.cs.txt | 2 +- .../CodeFiles/TimelinePanelView.xaml.txt | 2 +- .../CodeFiles/ToggleSwitchView.xaml.cs.txt | 27 +- .../CodeFiles/ToggleSwitchView.xaml.txt | 2 +- .../TokenizedTextBoxView.xaml.cs.txt | 15 +- .../CodeFiles/TokenizedTextBoxView.xaml.txt | 2 +- .../WatermarkComboBoxView.xaml.cs.txt | 11 +- .../CodeFiles/WatermarkComboBoxView.xaml.txt | 152 +- .../WatermarkPasswordBoxView.xaml.cs.txt | 2 +- .../WatermarkPasswordBoxView.xaml.txt | 2 +- .../WatermarkTextboxView.xaml.cs.txt | 2 +- .../CodeFiles/WatermarkTextboxView.xaml.txt | 2 +- .../CodeFiles/WindowContainerView.xaml.cs.txt | 11 +- .../CodeFiles/WindowContainerView.xaml.txt | 347 ++-- .../CodeFiles/WizardView.xaml.cs.txt | 3 +- .../CodeFiles/WizardView.xaml.txt | 2 +- .../CodeFiles/ZoomboxView.xaml.cs.txt | 6 +- .../CodeFiles/ZoomboxView.xaml.txt | 2 +- .../Core/CSharpFormatter.cs | 3 +- .../Core/CodeFormatting/XamlFormat.cs | 24 +- .../Core/Converters/ZeroToBoolConverter.cs | 2 +- .../Core/LiveExplorerTreeViewItem.cs | 7 +- .../Core/XamlFormatter.cs | 3 +- .../DemoView.cs | 11 +- .../HomeView.xaml | 2 +- .../HomeView.xaml.cs | 15 +- .../MainWindow.xaml | 2 +- .../MainWindow.xaml.cs | 51 +- .../Properties/AssemblyInfo.cs | 8 +- .../Resources/LiveExplorerScrollViewer.xaml | 2 +- .../Resources/TextBlockStyles.xaml | 2 +- .../Samples/AvalonDock/Resources/Document.cs | 4 +- .../AvalonDock/Resources/DocumentBase.cs | 7 +- .../AvalonDock/Resources/DocumentView.xaml | 2 +- .../AvalonDock/Resources/DocumentView.xaml.cs | 2 +- .../Samples/AvalonDock/Resources/Note.cs | 4 +- .../AvalonDock/Resources/NoteView.xaml | 2 +- .../AvalonDock/Resources/NoteView.xaml.cs | 2 +- .../Samples/AvalonDock/Resources/Page.cs | 4 +- .../AvalonDock/Resources/PageView.xaml | 2 +- .../AvalonDock/Resources/PageView.xaml.cs | 2 +- .../Views/AvalonDockPropertiesView.xaml | 2 +- .../Views/AvalonDockPropertiesView.xaml.cs | 2 +- .../Views/AvalonDockSourcesView.xaml | 2 +- .../Views/AvalonDockSourcesView.xaml.cs | 2 +- .../AvalonDock/Views/AvalonDockView.xaml | 2 +- .../AvalonDock/Views/AvalonDockView.xaml.cs | 4 +- .../Converters/IntegerToTimespanConverter.cs | 5 +- .../BusyIndicator/Resources/Common.xaml | 2 +- ...usyIndicatorCustomContentTemplateView.xaml | 2 +- ...IndicatorCustomContentTemplateView.xaml.cs | 2 +- .../Views/BusyIndicatorCustomContentView.xaml | 2 +- .../BusyIndicatorCustomContentView.xaml.cs | 2 +- .../Views/BusyIndicatorView.xaml | 2 +- .../Views/BusyIndicatorView.xaml.cs | 4 +- .../Button/Views/ButtonSpinnerView.xaml | 2 +- .../Button/Views/ButtonSpinnerView.xaml.cs | 5 +- .../Button/Views/DropDownSplitButtonView.xaml | 2 +- .../Views/DropDownSplitButtonView.xaml.cs | 2 +- .../Samples/Button/Views/IconButtonView.xaml | 2 +- .../Button/Views/IconButtonView.xaml.cs | 2 +- .../Calculator/Views/CalculatorView.xaml | 2 +- .../Calculator/Views/CalculatorView.xaml.cs | 2 +- .../GraduationModeToComboBoxConverter.cs | 5 +- .../Samples/Chart/Views/ChartAxisView.xaml | 2 +- .../Samples/Chart/Views/ChartAxisView.xaml.cs | 8 +- .../Samples/Chart/Views/ChartLegendView.xaml | 2 +- .../Chart/Views/ChartLegendView.xaml.cs | 4 +- .../Views/ChartSeriesBasicTypesView.xaml | 2 +- .../Views/ChartSeriesBasicTypesView.xaml.cs | 5 +- .../ChartSeriesDataPointsBindingView.xaml | 2 +- .../ChartSeriesDataPointsBindingView.xaml.cs | 7 +- .../Chart/Views/ChartStylingAxesGridView.xaml | 2 +- .../Views/ChartStylingAxesGridView.xaml.cs | 7 +- .../Views/ChartStylingColumnSeriesView.xaml | 2 +- .../ChartStylingColumnSeriesView.xaml.cs | 5 +- .../Views/ChartStylingLineSeriesView.xaml | 2 +- .../Views/ChartStylingLineSeriesView.xaml.cs | 5 +- .../Views/ChartStylingPieSeriesView.xaml | 2 +- .../Views/ChartStylingPieSeriesView.xaml.cs | 8 +- .../CheckLists/Views/CheckListsView.xaml | 2 +- .../CheckLists/Views/CheckListsView.xaml.cs | 5 +- .../Samples/Color/Views/ColorView.xaml | 2 +- .../Samples/Color/Views/ColorView.xaml.cs | 6 +- .../DataGrid/Converters/FlagPathConverter.cs | 6 +- .../Samples/DataGrid/Views/DataGridView.xaml | 2 +- .../DataGrid/Views/DataGridView.xaml.cs | 2 +- .../Views/MultiColumnComboBoxView.xaml | 2 +- .../Views/MultiColumnComboBoxView.xaml.cs | 4 +- .../Converters/CustomFormatToBoolConverter.cs | 7 +- .../Converters/DateTimeToTimeSpanConverter.cs | 9 +- .../Samples/DateTime/Views/DateTimeView.xaml | 604 ++++--- .../DateTime/Views/DateTimeView.xaml.cs | 4 +- .../Views/ExtTabControlView.xaml | 14 +- .../Views/ExtTabControlView.xaml.cs | 4 +- .../FilePicker/Views/FilePickerView.xaml | 2 +- .../FilePicker/Views/FilePickerView.xaml.cs | 5 +- .../Samples/Gauge/Views/RadialGaugeView.xaml | 2 +- .../Gauge/Views/RadialGaugeView.xaml.cs | 5 +- .../Converters/BoxArtImageSourceConverter.cs | 2 +- .../Samples/ListBox/Views/ListBoxView.xaml | 2 +- .../Samples/ListBox/Views/ListBoxView.xaml.cs | 8 +- .../Magnifier/Converters/ColorConverter.cs | 5 +- .../Converters/VisibilityConverter.cs | 13 +- .../Magnifier/Views/MagnifierView.xaml | 2 +- .../Magnifier/Views/MagnifierView.xaml.cs | 12 +- .../Converters/EqualsMinusOneConverter.cs | 5 +- .../MaterialControls/Data/RequiredRule.cs | 6 +- .../Resources/CommonResources.xaml | 2 +- .../Views/MaterialButtonView.xaml | 2 +- .../Views/MaterialButtonView.xaml.cs | 5 +- .../Views/MaterialCheckBoxView.xaml | 2 +- .../Views/MaterialCheckBoxView.xaml.cs | 7 +- .../Views/MaterialComboBoxView.xaml | 2 +- .../Views/MaterialComboBoxView.xaml.cs | 7 +- .../Views/MaterialControlsView.xaml | 2 +- .../Views/MaterialControlsView.xaml.cs | 2 +- .../Views/MaterialDemoView.cs | 4 +- .../Views/MaterialDropDownView.xaml | 2 +- .../Views/MaterialDropDownView.xaml.cs | 7 +- .../Views/MaterialFrameView.xaml | 2 +- .../Views/MaterialFrameView.xaml.cs | 7 +- .../Views/MaterialHamburgerView.xaml | 2 +- .../Views/MaterialHamburgerView.xaml.cs | 2 +- .../Views/MaterialListBoxView.xaml | 2 +- .../Views/MaterialListBoxView.xaml.cs | 7 +- .../MaterialProgressBarCircularView.xaml | 2 +- .../MaterialProgressBarCircularView.xaml.cs | 5 +- .../Views/MaterialProgressBarView.xaml | 2 +- .../Views/MaterialProgressBarView.xaml.cs | 5 +- .../Views/MaterialRadioButtonView.xaml | 2 +- .../Views/MaterialRadioButtonView.xaml.cs | 7 +- .../Views/MaterialSliderView.xaml | 2 +- .../Views/MaterialSliderView.xaml.cs | 10 +- .../Views/MaterialSwitchView.xaml | 2 +- .../Views/MaterialSwitchView.xaml.cs | 7 +- .../Views/MaterialTabsView.xaml | 2 +- .../Views/MaterialTabsView.xaml.cs | 7 +- .../Views/MaterialTextFieldView.xaml | 2 +- .../Views/MaterialTextFieldView.xaml.cs | 7 +- .../Views/MaterialToastView.xaml | 2 +- .../Views/MaterialToastView.xaml.cs | 2 +- .../Views/MaterialToolTipView.xaml | 2 +- .../Views/MaterialToolTipView.xaml.cs | 7 +- .../Views/MultiCalendarView.xaml | 2 +- .../Views/MultiCalendarView.xaml.cs | 8 +- .../Samples/Numeric/Views/NumericView.xaml | 2 +- .../Samples/Numeric/Views/NumericView.xaml.cs | 3 +- .../ComboBoxToVisibilityConverter.cs | 7 +- .../Samples/Panels/Views/SwitchPanelView.xaml | 2 +- .../Panels/Views/SwitchPanelView.xaml.cs | 13 +- .../Pie/Converters/SliceLabelConverter.cs | 6 +- .../Samples/Pie/Views/PieChartView.xaml | 2 +- .../Samples/Pie/Views/PieChartView.xaml.cs | 7 +- .../Samples/Pie/Views/PieProgressView.xaml | 2 +- .../Samples/Pie/Views/PieProgressView.xaml.cs | 4 +- .../Samples/Pie/Views/PieView.xaml | 2 +- .../Samples/Pie/Views/PieView.xaml.cs | 9 +- .../Converters/FullNameStringConverter.cs | 7 +- .../Views/PileFlowPanelView.xaml | 2 +- .../Views/PileFlowPanelView.xaml.cs | 13 +- .../Converters/DimensionConverter.cs | 5 +- .../Resources/LastNameUserControlEditor.xaml | 2 +- .../LastNameUserControlEditor.xaml.cs | 2 +- ...ropertyGridAdvancedContextMenuView.xaml.cs | 14 +- .../Views/PropertyGridAttributesView.xaml | 2 +- .../Views/PropertyGridAttributesView.xaml.cs | 90 +- .../PropertyGridBindingToStructsView.xaml | 2 +- .../PropertyGridBindingToStructsView.xaml.cs | 4 +- .../Views/PropertyGridCategoryOrderView.xaml | 2 +- .../PropertyGridCategoryOrderView.xaml.cs | 55 +- .../Views/PropertyGridCustomEditorsView.xaml | 2 +- .../PropertyGridCustomEditorsView.xaml.cs | 11 +- .../Views/PropertyGridCustomPropertyView.xaml | 2 +- .../PropertyGridCustomPropertyView.xaml.cs | 10 +- .../Views/PropertyGridDefaultEditorsView.xaml | 2 +- .../PropertyGridDefaultEditorsView.xaml.cs | 168 +- .../Views/PropertyGridDefinitionKeyView.xaml | 2 +- .../PropertyGridDefinitionKeyView.xaml.cs | 4 +- .../PropertyGridDisplayLocalizationView.xaml | 2 +- ...ropertyGridDisplayLocalizationView.xaml.cs | 9 +- ...ridEditorComboBoxDefinitionSourceView.xaml | 2 +- ...EditorComboBoxDefinitionSourceView.xaml.cs | 14 +- .../PropertyGridEditorDefinitionsView.xaml | 2 +- .../PropertyGridEditorDefinitionsView.xaml.cs | 6 +- ...ropertyGridExpandingNonPrimitivesView.xaml | 2 +- ...ertyGridExpandingNonPrimitivesView.xaml.cs | 2 +- .../PropertyGridMultiSelectedObjectsView.xaml | 2 +- ...opertyGridMultiSelectedObjectsView.xaml.cs | 15 +- .../PropertyGridPropertiesSourceView.xaml | 2 +- .../PropertyGridPropertiesSourceView.xaml.cs | 8 +- .../Views/PropertyGridPropertiesView.xaml | 2 +- .../Views/PropertyGridPropertiesView.xaml.cs | 10 +- .../PropertyGridPropertyItemStyleView.xaml | 40 +- .../PropertyGridPropertyItemStyleView.xaml.cs | 21 +- .../Views/PropertyGridSelectedObjectView.xaml | 2 +- .../PropertyGridSelectedObjectView.xaml.cs | 6 +- .../PropertyGridSpecifyingPropertiesView.xaml | 2 +- ...opertyGridSpecifyingPropertiesView.xaml.cs | 2 +- .../PropertyGrid/Views/PropertyGridView.xaml | 2 +- .../Views/PropertyGridView.xaml.cs | 4 +- .../Converters/AbsoluteAdditionConverter.cs | 8 +- .../Converters/RangeSliderEnabledConverter.cs | 6 +- .../RangeSlider/Views/RangeSliderView.xaml | 2 +- .../RangeSlider/Views/RangeSliderView.xaml.cs | 9 +- .../Samples/Rating/Views/RatingView.xaml | 2 +- .../Samples/Rating/Views/RatingView.xaml.cs | 4 +- .../SlideShow/Views/SlideShowView.xaml | 2 +- .../SlideShow/Views/SlideShowView.xaml.cs | 32 +- .../Text/Views/AutoSelectTextboxView.xaml | 2 +- .../Text/Views/AutoSelectTextboxView.xaml.cs | 2 +- .../Samples/Text/Views/MaskedTextboxView.xaml | 2 +- .../Text/Views/MaskedTextboxView.xaml.cs | 2 +- .../Text/Views/MultiLineTextEditorView.xaml | 2 +- .../Views/MultiLineTextEditorView.xaml.cs | 2 +- .../Samples/Text/Views/RichTextboxView.xaml | 2 +- .../Text/Views/RichTextboxView.xaml.cs | 7 +- .../Text/Views/TokenizedTextBoxView.xaml | 2 +- .../Text/Views/TokenizedTextBoxView.xaml.cs | 15 +- .../Text/Views/WatermarkPasswordBoxView.xaml | 2 +- .../Views/WatermarkPasswordBoxView.xaml.cs | 2 +- .../Text/Views/WatermarkTextboxView.xaml | 2 +- .../Text/Views/WatermarkTextboxView.xaml.cs | 2 +- .../Theming/Converters/FlagPathConverter.cs | 5 +- .../Samples/Theming/ItemTemplates/Common.xaml | 2 +- .../Theming/Views/ThemingAvalonDockView.xaml | 2 +- .../Views/ThemingAvalonDockView.xaml.cs | 14 +- .../Theming/Views/ThemingCoreWPFView.xaml | 2 +- .../Theming/Views/ThemingCoreWPFView.xaml.cs | 8 +- .../Theming/Views/ThemingDataGridView.xaml | 2 +- .../Theming/Views/ThemingDataGridView.xaml.cs | 10 +- .../Views/ThemingExtendedToolkitView.xaml | 2 +- .../Views/ThemingExtendedToolkitView.xaml.cs | 4 +- .../Theming/Views/ThemingListBoxView.xaml | 2 +- .../Theming/Views/ThemingListBoxView.xaml.cs | 8 +- .../Samples/TimeSpan/Views/TimeSpanView.xaml | 75 +- .../TimeSpan/Views/TimeSpanView.xaml.cs | 15 +- .../Views/TimelinePanelView.xaml | 2 +- .../Views/TimelinePanelView.xaml.cs | 2 +- .../ToggleSwitch/Views/ToggleSwitchView.xaml | 2 +- .../Views/ToggleSwitchView.xaml.cs | 27 +- .../Views/WatermarkComboBoxView.xaml | 152 +- .../Views/WatermarkComboBoxView.xaml.cs | 11 +- .../Window/Converters/IntToBoolConverter.cs | 9 +- .../Converters/WindowStateToBoolConverter.cs | 12 +- .../Samples/Window/Resources/FancyStyles.xaml | 2 +- .../Window/Resources/WindowModelEditor.xaml | 213 ++- .../Resources/WindowModelEditor.xaml.cs | 26 +- .../Samples/Window/Views/ChildWindowView.xaml | 2 +- .../Window/Views/ChildWindowView.xaml.cs | 6 +- .../Window/Views/StyleableWindowView.xaml | 326 ++-- .../Window/Views/StyleableWindowView.xaml.cs | 144 +- .../Window/Views/WindowContainerView.xaml | 347 ++-- .../Window/Views/WindowContainerView.xaml.cs | 11 +- .../Samples/Wizard/Views/WizardView.xaml | 2 +- .../Samples/Wizard/Views/WizardView.xaml.cs | 3 +- .../Zoombox/Converters/PointConverter.cs | 5 +- .../Zoombox/Converters/RectConverter.cs | 6 +- .../Zoombox/Converters/SimpleConverter.cs | 5 +- .../Zoombox/Converters/ViewFinderConverter.cs | 6 +- .../Zoombox/Converters/ViewNameConverter.cs | 6 +- .../Converters/ViewStackCountConverter.cs | 8 +- .../Samples/Zoombox/Views/ZoomboxView.xaml | 2 +- .../Samples/Zoombox/Views/ZoomboxView.xaml.cs | 6 +- ...Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj | 1415 +++++++++++++++++ .../Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs | 6 +- .../AssemblyVersionInfoCommon.cs | 2 +- .../Implementation/AutoSelectBehaviorEnum.cs | 6 +- .../Implementation/AutoSelectTextBox.cs | 2 +- .../Implementation/QueryMoveFocusEventArgs.cs | 2 +- .../Implementation/BusyIndicator.cs | 2 +- .../Converters/ProgressBarWidthConverter.cs | 2 +- .../VisualStates.BusyIndicator.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../BusyIndicator/Themes/Generic.xaml | 2 +- .../Implementation/ButtonSpinner.cs | 2 +- .../Implementation/SpinDirection.cs | 2 +- .../Implementation/SpinEventArgs.cs | 2 +- .../ButtonSpinner/Implementation/Spinner.cs | 2 +- .../Implementation/ValidSpinDirections.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../ButtonSpinner/Themes/Generic.xaml | 2 +- .../Calculator/Implementation/Calculator.cs | 6 +- .../Implementation/CalculatorCommands.cs | 2 +- .../Calculator/Themes/Aero2.NormalColor.xaml | 2 +- .../Calculator/Themes/Generic.xaml | 2 +- .../Implementation/CalculatorUpDown.cs | 12 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../CalculatorUpDown/Themes/Generic.xaml | 2 +- .../Implementation/CheckComboBox.cs | 18 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../CheckComboBox/Themes/Generic.xaml | 2 +- .../Implementation/CheckListBox.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../CheckListBox/Themes/Generic.xaml | 2 +- .../ChildWindow/Implementation/ChildWindow.cs | 17 +- .../Implementation/WindowStartupLocation.cs | 2 +- .../ChildWindow/Implementation/WindowState.cs | 2 +- .../ChildWindow/Themes/Aero2.NormalColor.xaml | 2 +- .../ChildWindow/Themes/Generic.xaml | 2 +- .../Chromes/Implementation/ButtonChrome.cs | 2 +- .../Chromes/Themes/Aero2.NormalColor.xaml | 2 +- .../Chromes/Themes/Generic.xaml | 2 +- .../Implementation/CollectionControl.cs | 26 +- .../Implementation/CollectionControlButton.cs | 2 +- .../CollectionControlDialog.xaml | 2 +- .../CollectionControlDialog.xaml.cs | 20 +- .../NewItemTypesComboBoxConverter.cs | 9 +- .../Implementation/ItemAddingEventArgs.cs | 8 +- .../Implementation/ItemDeletingEventArgs.cs | 8 +- .../Implementation/ItemEventArgs.cs | 6 +- .../PrimitiveTypeCollectionControl.cs | 16 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../CollectionControl/Themes/Generic.xaml | 2 +- .../ColorCanvas/Implementation/ColorCanvas.cs | 16 +- .../Implementation/ColorSpectrumSlider.cs | 5 +- .../ColorCanvas/Themes/Aero2.NormalColor.xaml | 2 +- .../ColorCanvas/Themes/Generic.xaml | 2 +- .../ColorPicker/Implementation/ColorItem.cs | 8 +- .../ColorPicker/Implementation/ColorPicker.cs | 20 +- .../Implementation/ColorPickerTabItem.cs | 2 +- .../ColorPicker/Implementation/ColorSorter.cs | 10 +- .../ColorPicker/Themes/Aero2.NormalColor.xaml | 2 +- .../ColorPicker/Themes/Generic.xaml | 2 +- .../Core/CancelRoutedEventArgs.cs | 5 +- .../Core/Converters/AditionConverter.cs | 2 +- ...rderThicknessToStrokeThicknessConverter.cs | 2 +- .../CalculatorMemoryToVisibilityConverter.cs | 2 +- .../Core/Converters/CenterTitleConverter.cs | 52 +- .../Core/Converters/ColorBlendConverter.cs | 12 +- .../ColorModeToTabItemSelectedConverter.cs | 4 +- .../ColorToSolidColorBrushConverter.cs | 2 +- .../CornerRadiusToDoubleConverter.cs | 37 +- .../Core/Converters/HalfConverter.cs | 9 +- .../Converters/IntToThicknessConverter.cs | 47 +- .../Core/Converters/InverseBoolConverter.cs | 2 +- .../Core/Converters/NullToBoolConverter.cs | 17 +- .../Converters/ObjectTypeToNameConverter.cs | 4 +- .../PrintableFontFamilyConverter.cs | 2 +- .../Core/Converters/RoundedValueConverter.cs | 2 +- .../SolidColorBrushToColorConverter.cs | 2 +- .../ThicknessSideRemovalConverter.cs | 25 +- .../Converters/ThicknessToDoubleConverter.cs | 37 +- .../Converters/VisibilityToBoolConverter.cs | 3 +- .../WindowContentBorderMarginConverter.cs | 7 +- .../WindowControlBackgroundConverter.cs | 7 +- .../WizardPageButtonVisibilityConverter.cs | 6 +- .../Core/EditableKeyValuePair.cs | 2 +- .../Xceed.Wpf.Toolkit/Core/ErrorMessages.cs | 2 +- .../Core/GenericTextBlock.cs | 4 +- .../Core/ImageUriExtension.cs | 6 +- .../Core/IndexChangedEventArgs.cs | 2 +- .../Core/IndexChangedEventHandler.cs | 2 +- .../Core/Input/IValidateInput.cs | 7 +- .../Input/InputValidationErrorEventArgs.cs | 5 +- .../Core/Input/KeyModifier.cs | 2 +- .../Core/Input/KeyModifierCollection.cs | 2 +- .../Input/KeyModifierCollectionConverter.cs | 2 +- .../Core/InvalidContentException.cs | 2 +- .../Core/InvalidTemplateException.cs | 2 +- .../Xceed.Wpf.Toolkit/Core/LocationEnum.cs | 2 +- .../Core/Media/Animation/AnimationRate.cs | 16 +- .../Media/Animation/AnimationRateConverter.cs | 2 +- .../Animation/IterativeAnimationEquation.cs | 2 +- .../IterativeAnimationEquationDelegate.cs | 2 +- .../Animation/IterativeEquationConverter.cs | 6 +- .../Core/Media/Animation/PennerEquation.cs | 2 +- .../Core/Media/Animation/PennerEquations.cs | 2 +- .../Core/Media/WindowColors.cs | 25 +- .../Core/PackUriExtension.cs | 76 +- .../Core/PropertyChangedEventArgs.cs | 2 +- .../Core/PropertyChangedEventHandler.cs | 2 +- .../Core/QueryTextFromValueEventArgs.cs | 19 +- .../Core/QueryValueFromTextEventArgs.cs | 29 +- .../Core/ResourceDictionary.cs | 22 +- .../Core/UIElementAdorner.cs | 2 +- .../Core/Utilities/CalculatorUtilities.cs | 6 +- .../Core/Utilities/ChangeTypeHelper.cs | 5 +- .../Core/Utilities/ColorUtilities.cs | 6 +- .../Core/Utilities/ContextMenuUtilities.cs | 4 +- .../Core/Utilities/DateTimeUtilities.cs | 5 +- .../Core/Utilities/DoubleHelper.cs | 2 +- .../Core/Utilities/EllipseHelper.cs | 2 +- .../Core/Utilities/FontUtilities.cs | 9 +- .../Core/Utilities/GeneralUtilities.cs | 12 +- .../Core/Utilities/KeyboardUtilities.cs | 6 +- .../Core/Utilities/ListUtilities.cs | 17 +- .../Core/Utilities/PointHelper.cs | 2 +- .../Core/Utilities/PropertyChangedExt.cs | 9 +- .../Core/Utilities/RectHelper.cs | 2 +- .../Core/Utilities/ReflectionHelper.cs | 2 +- .../Core/Utilities/ResourceHelper.cs | 2 +- .../Core/Utilities/RoutedEventHelper.cs | 2 +- .../Core/Utilities/Segment.cs | 2 +- .../Core/Utilities/TreeHelper.cs | 4 +- .../Core/Utilities/ValueChangeHelper.cs | 9 +- .../Core/Utilities/VisualTreeHelperEx.cs | 2 +- .../Core/Utilities/WeakEventListener.cs | 13 +- .../Core/Utilities/WindowUtilities.cs | 5 +- .../Core/VersionResourceDictionary.cs | 8 +- .../Core/WeakCollectionChangedWrapper.cs | 40 +- .../Converters/BorderThicknessConverter.cs | 2 +- .../Implementation/DateTimePicker.cs | 159 +- .../Themes/Aero2.NormalColor.xaml | 24 +- .../DateTimePicker/Themes/Generic.xaml | 29 +- .../Implementation/DateTimeFormat.cs | 2 +- .../Implementation/DateTimeInfo.cs | 2 +- .../Implementation/DateTimeParser.cs | 12 +- .../Implementation/DateTimePart.cs | 2 +- .../Implementation/DateTimeUpDown.cs | 44 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../DateTimeUpDown/Themes/Generic.xaml | 2 +- .../Implementation/DropDownButton.cs | 15 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../DropDownButton/Themes/Generic.xaml | 2 +- .../IconButton/Implementation/IconButton.cs | 2 +- .../IconButton/Themes/Aero2.NormalColor.xaml | 2 +- .../IconButton/Themes/Generic.xaml | 2 +- .../Converters/RadiusConverter.cs | 2 +- .../Magnifier/Implementation/FrameType.cs | 2 +- .../Magnifier/Implementation/Magnifier.cs | 24 +- .../Implementation/MagnifierAdorner.cs | 4 +- .../Implementation/MagnifierManager.cs | 10 +- .../Magnifier/Themes/Generic.xaml | 2 +- .../AutoCompletingMaskEventArgs.cs | 47 +- .../Implementation/InsertKeyModeEnum.cs | 6 +- .../Implementation/MaskFormatEnum.cs | 6 +- .../Implementation/MaskedTextBox.cs | 56 +- .../MessageBox/Implementation/MessageBox.cs | 45 +- .../Implementation/VisualStates.MessageBox.cs | 2 +- .../MessageBox/Themes/Aero2.NormalColor.xaml | 2 +- .../MessageBox/Themes/Generic.xaml | 2 +- .../Implementation/MultiLineTextEditor.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../MultiLineTextEditor/Themes/Generic.xaml | 2 +- .../AllowedSpecialValuesEnum.cs | 2 +- .../Implementation/ByteUpDown.cs | 4 +- .../Implementation/CommonNumericUpDown.cs | 59 +- .../Implementation/DecimalUpDown.cs | 3 +- .../Implementation/DoubleUpDown.cs | 14 +- .../Implementation/IntegerUpDown.cs | 3 +- .../Implementation/LongUpDown.cs | 3 +- .../Implementation/NumericUpDown.cs | 4 +- .../Implementation/SByteUpDown.cs | 2 +- .../Implementation/ShortUpDown.cs | 3 +- .../Implementation/SingleUpDown.cs | 14 +- .../Implementation/UIntegerUpDown.cs | 5 +- .../Implementation/ULongUpDown.cs | 2 +- .../Implementation/UShortUpDown.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../NumericUpDown/Themes/Generic.xaml | 2 +- .../Implementation/MaskedTextBox.cs | 4 +- .../Panels/AnimationPanel.cs | 2 +- .../Panels/AnimatorConverter.cs | 5 +- .../Src/Xceed.Wpf.Toolkit/Panels/Animators.cs | 2 +- .../Panels/ChildEnteredEventArgs.cs | 2 +- .../Panels/ChildEnteredEventHandler.cs | 2 +- .../Panels/ChildEnteringEventArgs.cs | 2 +- .../Panels/ChildEnteringEventHandler.cs | 2 +- .../Panels/ChildExitedEventArgs.cs | 2 +- .../Panels/ChildExitedEventHandler.cs | 2 +- .../Panels/ChildExitingEventArgs.cs | 2 +- .../Panels/ChildExitingEventHandler.cs | 2 +- .../Panels/DoubleAnimator.cs | 2 +- .../Panels/IterativeAnimator.cs | 4 +- .../Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs | 2 +- .../Xceed.Wpf.Toolkit/Panels/RandomPanel.cs | 2 +- .../Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs | 2 +- .../Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs | 8 +- .../Panels/SwitchPresenter.cs | 8 +- .../Panels/SwitchTemplate.cs | 6 +- .../Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs | 6 +- .../Pie/Implementation/Pie.cs | 4 +- .../Pie/Implementation/PieModeEnum.cs | 2 +- .../Pie/Themes/Aero2.NormalColor.xaml | 2 +- .../Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml | 2 +- .../Primitives/CachedTextInfo.cs | 25 +- .../Primitives/DateTimePickerBase.cs | 12 +- .../Primitives/DateTimeUpDownBase.cs | 4 +- .../Xceed.Wpf.Toolkit/Primitives/HsvColor.cs | 2 +- .../Xceed.Wpf.Toolkit/Primitives/InputBase.cs | 2 +- .../Primitives/MouseWheelActiveTriggerEnum.cs | 7 +- .../Primitives/SelectAllSelector.cs | 41 +- .../Primitives/SelectAllSelectorItem.cs | 2 +- .../Xceed.Wpf.Toolkit/Primitives/Selector.cs | 17 +- .../Primitives/SelectorItem.cs | 2 +- .../Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs | 2 +- .../Primitives/Themes/Aero2/SelectorItem.xaml | 2 +- .../Themes/Aero2/WindowControl.xaml | 7 +- .../Themes/Generic/SelectorItem.xaml | 2 +- .../Themes/Generic/WindowControl.xaml | 8 +- .../Primitives/Themes/ResourceKeys.cs | 4 +- .../Primitives/UpDownBase.cs | 87 +- .../Primitives/ValueRangeTextBox.cs | 22 +- .../Primitives/WindowContainer.cs | 14 +- .../Primitives/WindowControl.cs | 26 +- .../Properties/AssemblyInfo.cs | 8 +- .../Attributes/CategoryOrderAttribute.cs | 4 +- .../CategoryPropertyOrderAttribute.cs | 2 +- .../Attributes/ExpandableObjectAttribute.cs | 2 +- .../Implementation/Attributes/IItemsSource.cs | 2 +- .../Attributes/ItemsSourceAttribute.cs | 2 +- .../Attributes/NewItemTypesAttribute.cs | 2 +- .../Attributes/PropertyOrderAttribute.cs | 2 +- .../CategoryGroupStyleSelector.cs | 6 +- .../Commands/PropertyGridCommands.cs | 2 +- .../Commands/PropertyItemCommands.cs | 2 +- .../CommonPropertyExceptionValidationRule.cs | 9 +- .../Implementation/ContainerHelperBase.cs | 60 +- .../Converters/EditorTimeSpanConverter.cs | 7 +- .../ExpandableObjectMarginConverter.cs | 2 +- .../Converters/IsDefaultCategoryConverter.cs | 5 +- .../Converters/IsStringEmptyConverter.cs | 2 +- .../Converters/ListConverter.cs | 8 +- .../Converters/ObjectToUIElementConverter.cs | 5 +- .../Converters/PropertyItemEditorConverter.cs | 4 +- .../PropertyNameTextTrimmingConverter.cs | 4 +- .../Converters/SelectedObjectConverter.cs | 19 +- .../Implementation/CustomPropertyItem.cs | 16 +- .../Definitions/DefinitionBase.cs | 15 +- .../Definitions/EditorDefinitionBase.cs | 17 +- .../Definitions/EditorTemplateDefinition.cs | 16 +- .../Definitions/PropertyDefinitionBase.cs | 15 +- .../DescriptorPropertyDefinition.cs | 8 +- .../DescriptorPropertyDefinitionBase.cs | 37 +- .../Implementation/EditorDefinition.cs | 8 +- .../Implementation/Editors/CheckBoxEditor.cs | 2 +- .../Editors/CollectionEditor.cs | 18 +- .../Implementation/Editors/ColorEditor.cs | 2 +- .../Implementation/Editors/ComboBoxEditor.cs | 3 +- .../Editors/EnumComboBoxEditor.cs | 4 +- .../Editors/FontComboBoxEditor.cs | 7 +- .../Implementation/Editors/ITypeEditor.cs | 2 +- .../Editors/ItemsSourceAttributeEditor.cs | 2 +- .../Editors/MaskedTextBoxEditor.cs | 6 +- .../Implementation/Editors/PasswordEditor.cs | 4 +- .../Editors/PrimitiveTypeCollectionEditor.cs | 2 +- .../Editors/SourceComboBoxEditor.cs | 10 +- .../Implementation/Editors/TextBlockEditor.cs | 10 +- .../Implementation/Editors/TextBoxEditor.cs | 2 +- .../Implementation/Editors/TypeEditor.cs | 4 +- .../Implementation/Editors/UpDownEditors.cs | 12 +- .../PropertyGrid/Implementation/FilterInfo.cs | 5 +- .../Implementation/IPropertyContainer.cs | 52 +- .../Implementation/ObjectContainerHelper.cs | 8 +- .../ObjectContainerHelperBase.cs | 36 +- .../Implementation/PropertyDefinition.cs | 49 +- .../PropertyDefinitionBaseCollection.cs | 3 +- .../Implementation/PropertyGrid.cs | 75 +- .../Implementation/PropertyGridContextMenu.cs | 2 +- .../Implementation/PropertyGridUtilities.cs | 33 +- .../Implementation/PropertyItem.cs | 36 +- .../Implementation/PropertyItemBase.cs | 94 +- .../Implementation/PropertyItemCollection.cs | 24 +- .../Implementation/PropertyItemsControl.cs | 2 +- .../Implementation/StringConstants.cs | 37 +- .../Implementation/TargetPropertyType.cs | 15 +- .../Implementation/TrimmedTextBlock.cs | 11 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../PropertyGrid/Themes/Generic.xaml | 2 +- .../Converters/SliderThumbWidthConverter.cs | 8 +- .../RangeSlider/Implementation/RangeSlider.cs | 102 +- .../RangeSlider/Themes/Aero2.NormalColor.xaml | 2 +- .../RangeSlider/Themes/Generic.xaml | 2 +- .../RichTextBox/Formatters/ITextFormatter.cs | 2 +- .../Formatters/PlainTextFormatter.cs | 2 +- .../RichTextBox/Formatters/RtfFormatter.cs | 2 +- .../RichTextBox/Formatters/XamlFormatter.cs | 2 +- .../RichTextBox/RichTextBox.cs | 5 +- .../IRichTextBoxFormatBar.cs | 2 +- .../RichTextBoxFormatBar.cs | 38 +- .../RichTextBoxFormatBarManager.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../RichTextBoxFormatBar/Themes/Generic.xaml | 2 +- .../SplitButton/Implementation/SplitButton.cs | 4 +- .../SplitButton/Themes/Aero2.NormalColor.xaml | 2 +- .../SplitButton/Themes/Generic.xaml | 2 +- .../StyleableWindowClippingBorderConverter.cs | 11 +- .../Themes/Aero.NormalColor.xaml | 2 +- .../Themes/Aero/Brushes_NormalColor.xaml | 2 +- .../Themes/Aero/Buttons_NormalColor.xaml | 2 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../Themes/Aero2/Brushes.xaml | 2 +- .../Themes/Aero2/Buttons.xaml | 2 +- .../Themes/Aero2/Common.xaml | 2 +- .../Themes/Aero2/Glyphs.xaml | 2 +- .../Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml | 2 +- .../Themes/Generic/Brushes.xaml | 2 +- .../Themes/Generic/Buttons.xaml | 2 +- .../Themes/Generic/Common.xaml | 2 +- .../Themes/Generic/Glyphs.xaml | 2 +- .../Src/Xceed.Wpf.Toolkit/Themes/classic.xaml | 2 +- .../Themes/luna.homestead.xaml | 2 +- .../Themes/luna.metallic.xaml | 2 +- .../Themes/luna.normalcolor.xaml | 2 +- .../Themes/royale.normalcolor.xaml | 2 +- .../TimePicker/Implementation/TimeItem.cs | 2 +- .../TimePicker/Implementation/TimePicker.cs | 54 +- .../TimePicker/Themes/Aero2.NormalColor.xaml | 54 +- .../TimePicker/Themes/Generic.xaml | 10 +- .../Implementation/TimeSpanUpDown.cs | 132 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../TimeSpanUpDown/Themes/Generic.xaml | 2 +- .../Implementation/DateElement.cs | 2 +- .../Implementation/OverlapBehavior.cs | 2 +- .../Implementation/TimelinePanel.cs | 14 +- .../Utils/Exceptions/ThrowException.cs | 32 +- .../Src/Xceed.Wpf.Toolkit/VisualStates.cs | 2 +- .../Implementation/WatermarkComboBox.cs | 24 +- .../Themes/Aero2.NormalColor.xaml | 30 +- .../WatermarkComboBox/Themes/Generic.xaml | 30 +- .../Implementation/WatermarkPasswordBox.cs | 22 +- .../Implementation/WatermarkTextBox.cs | 2 +- .../Themes/Aero2.NormalColor.xaml | 2 +- .../WatermarkTextBox/Themes/Generic.xaml | 2 +- .../Wizard/Implementation/Wizard.cs | 4 +- .../Wizard/Implementation/WizardCommands.cs | 2 +- .../Wizard/Implementation/WizardPage.cs | 2 +- .../WizardPageButtonVisibility.cs | 2 +- .../Wizard/Implementation/WizardPageType.cs | 2 +- .../Wizard/Themes/Aero2.NormalColor.xaml | 2 +- .../Wizard/Themes/Generic.xaml | 2 +- .../Xceed.Wpf.Toolkit.NET5.csproj | 969 +++++++++++ .../Zoombox/Themes/Aero2.NormalColor.xaml | 2 +- .../Zoombox/Themes/Generic.xaml | 2 +- .../Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs | 360 ++--- .../Zoombox/ZoomboxCursors.cs | 2 +- .../Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs | 4 +- .../Zoombox/ZoomboxViewChangedEventArgs.cs | 2 +- .../Zoombox/ZoomboxViewChangedEventHandler.cs | 2 +- .../Zoombox/ZoomboxViewConverter.cs | 12 +- .../Zoombox/ZoomboxViewException.cs | 4 +- .../Zoombox/ZoomboxViewFinderDisplay.cs | 2 +- .../Zoombox/ZoomboxViewKind.cs | 2 +- .../Zoombox/ZoomboxViewStack.cs | 2 +- .../Zoombox/ZoomboxViewStackMode.cs | 2 +- .../Zoombox/ZoomboxZoomOn.cs | 2 +- .../Xceed.Wpf.Toolkit.NET5.sln | 64 + 994 files changed, 9686 insertions(+), 5120 deletions(-) create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.Designer.cs create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj create mode 100644 ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj create mode 100644 ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.NET5.sln diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs index f3277f081..b9dc39616 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,7 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; -using System.Windows.Media; namespace Xceed.Wpf.AvalonDock.Themes { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs index 1ff53e6e3..29e273eb8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.AvalonDock.Themes { @@ -28,6 +25,11 @@ public override Uri GetResourceUri() { string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Aero"; +#if NETCORE + assemblyName += ".NETCore"; +#elif NET5 + assemblyName += ".NET5"; +#endif return new Uri( "/" + assemblyName + ";component/Theme.xaml", diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml index f6924f561..c3b55b6dd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs index 164d8a35b..b9d5be128 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,148 +15,162 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Xceed.Wpf.AvalonDock.Themes.Controls { - public class SplineBorder : Control + public class SplineBorder : Control + { + + public SplineBorder() + { + //RenderOptions.SetEdgeMode(this, EdgeMode.Aliased); + } + + + #region Thickness + + /// + /// Thickness Dependency Property + /// + public static readonly DependencyProperty ThicknessProperty = + DependencyProperty.Register( "Thickness", typeof( double ), typeof( SplineBorder ), + new FrameworkPropertyMetadata( ( double )1.0, FrameworkPropertyMetadataOptions.AffectsRender ) ); + + /// + /// Gets or sets the Thickness property. This dependency property + /// indicates the border thickness. + /// + public double Thickness + { + get + { + return ( double )GetValue( ThicknessProperty ); + } + set + { + SetValue( ThicknessProperty, value ); + } + } + + #endregion + + #region Fill + + /// + /// Fill Dependency Property + /// + public static readonly DependencyProperty FillProperty = + DependencyProperty.Register( "Fill", typeof( Brush ), typeof( SplineBorder ), + new FrameworkPropertyMetadata( ( Brush )null, FrameworkPropertyMetadataOptions.AffectsRender ) ); + + /// + /// Gets or sets the Fill property. This dependency property + /// indicates the fill color. + /// + public Brush Fill + { + get + { + return ( Brush )GetValue( FillProperty ); + } + set + { + SetValue( FillProperty, value ); + } + } + + #endregion + + #region Stroke + + /// + /// Stroke Dependency Property + /// + public static readonly DependencyProperty StrokeProperty = + DependencyProperty.Register( "Stroke", typeof( Brush ), typeof( SplineBorder ), + new FrameworkPropertyMetadata( Brushes.Black, FrameworkPropertyMetadataOptions.AffectsRender ) ); + + /// + /// Gets or sets the Stroke property. This dependency property + /// indicates the stroke brush. + /// + public Brush Stroke { + get + { + return ( Brush )GetValue( StrokeProperty ); + } + set + { + SetValue( StrokeProperty, value ); + } + } + + #endregion + + #region BottomBorderMargin + + /// + /// BottomBorderMargin Dependency Property + /// + public static readonly DependencyProperty BottomBorderMarginProperty = + DependencyProperty.Register( "BottomBorderMargin", typeof( double ), typeof( SplineBorder ), + new FrameworkPropertyMetadata( ( double )0.0, FrameworkPropertyMetadataOptions.AffectsRender ) ); + + /// + /// Gets or sets the BottomBorderMargin property. This dependency property + /// indicates the adjustment for the bottom margin. + /// + public double BottomBorderMargin + { + get + { + return ( double )GetValue( BottomBorderMarginProperty ); + } + set + { + SetValue( BottomBorderMarginProperty, value ); + } + } + + #endregion + + + + protected override void OnRender( DrawingContext drawingContext ) + { + var pgFill = new PathGeometry(); + var pfFill = new PathFigure() { IsFilled = true, IsClosed = true }; + pfFill.StartPoint = new Point( ActualWidth, 0.0 ); + + var q1Fill = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth * 2 / 3, 0.0 ), Point2 = new Point( ActualWidth / 2.0, ActualHeight / 2.0 ), IsStroked = false }; + pfFill.Segments.Add( q1Fill ); + var q2Fill = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth / 3, ActualHeight ), Point2 = new Point( 0, ActualHeight ), IsStroked = false }; + pfFill.Segments.Add( q2Fill ); + + pfFill.Segments.Add( new LineSegment() { Point = new Point( ActualWidth, ActualHeight ), IsStroked = false } ); + + pgFill.Figures.Add( pfFill ); + + drawingContext.DrawGeometry( Fill, null, pgFill ); + + var pgBorder = new PathGeometry(); + var pfBorder = new PathFigure() { IsFilled = false, IsClosed = false }; + pfBorder.StartPoint = new Point( ActualWidth, Thickness / 2 ); + + var q1Border = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth * 2 / 3, 0.0 ), Point2 = new Point( ActualWidth / 2.0, ActualHeight / 2.0 ) }; + pfBorder.Segments.Add( q1Border ); + var q2Border = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth / 3, ActualHeight ), Point2 = new Point( 0.0, ActualHeight - BottomBorderMargin ) }; + pfBorder.Segments.Add( q2Border ); + + pgBorder.Figures.Add( pfBorder ); - public SplineBorder() - { - //RenderOptions.SetEdgeMode(this, EdgeMode.Aliased); - } - - - #region Thickness - - /// - /// Thickness Dependency Property - /// - public static readonly DependencyProperty ThicknessProperty = - DependencyProperty.Register("Thickness", typeof(double), typeof(SplineBorder), - new FrameworkPropertyMetadata((double)1.0, FrameworkPropertyMetadataOptions.AffectsRender)); - - /// - /// Gets or sets the Thickness property. This dependency property - /// indicates the border thickness. - /// - public double Thickness - { - get { return (double)GetValue(ThicknessProperty); } - set { SetValue(ThicknessProperty, value); } - } - - #endregion - - #region Fill - - /// - /// Fill Dependency Property - /// - public static readonly DependencyProperty FillProperty = - DependencyProperty.Register("Fill", typeof(Brush), typeof(SplineBorder), - new FrameworkPropertyMetadata((Brush)null, FrameworkPropertyMetadataOptions.AffectsRender)); - - /// - /// Gets or sets the Fill property. This dependency property - /// indicates the fill color. - /// - public Brush Fill - { - get { return (Brush)GetValue(FillProperty); } - set { SetValue(FillProperty, value); } - } - - #endregion - - #region Stroke - - /// - /// Stroke Dependency Property - /// - public static readonly DependencyProperty StrokeProperty = - DependencyProperty.Register("Stroke", typeof(Brush), typeof(SplineBorder), - new FrameworkPropertyMetadata(Brushes.Black, FrameworkPropertyMetadataOptions.AffectsRender)); - - /// - /// Gets or sets the Stroke property. This dependency property - /// indicates the stroke brush. - /// - public Brush Stroke - { - get { return (Brush)GetValue(StrokeProperty); } - set { SetValue(StrokeProperty, value); } - } - - #endregion - - #region BottomBorderMargin - - /// - /// BottomBorderMargin Dependency Property - /// - public static readonly DependencyProperty BottomBorderMarginProperty = - DependencyProperty.Register("BottomBorderMargin", typeof(double), typeof(SplineBorder), - new FrameworkPropertyMetadata((double)0.0, FrameworkPropertyMetadataOptions.AffectsRender)); - - /// - /// Gets or sets the BottomBorderMargin property. This dependency property - /// indicates the adjustment for the bottom margin. - /// - public double BottomBorderMargin - { - get { return (double)GetValue(BottomBorderMarginProperty); } - set { SetValue(BottomBorderMarginProperty, value); } - } - - #endregion - - - - protected override void OnRender(DrawingContext drawingContext) - { - var pgFill = new PathGeometry(); - var pfFill = new PathFigure() { IsFilled = true, IsClosed = true }; - pfFill.StartPoint = new Point(ActualWidth, 0.0); - - var q1Fill = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth * 2 / 3, 0.0), Point2 = new Point(ActualWidth / 2.0, ActualHeight / 2.0), IsStroked = false }; - pfFill.Segments.Add(q1Fill); - var q2Fill = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth / 3, ActualHeight ), Point2 = new Point(0, ActualHeight ), IsStroked = false }; - pfFill.Segments.Add(q2Fill); - - pfFill.Segments.Add(new LineSegment() { Point = new Point(ActualWidth, ActualHeight ), IsStroked = false }); - - pgFill.Figures.Add(pfFill); - - drawingContext.DrawGeometry(Fill, null, pgFill); - - var pgBorder = new PathGeometry(); - var pfBorder = new PathFigure() { IsFilled = false, IsClosed = false }; - pfBorder.StartPoint = new Point(ActualWidth, Thickness / 2); - - var q1Border = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth * 2 / 3, 0.0), Point2 = new Point(ActualWidth / 2.0, ActualHeight / 2.0) }; - pfBorder.Segments.Add(q1Border); - var q2Border = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth / 3, ActualHeight), Point2 = new Point(0.0, ActualHeight - BottomBorderMargin) }; - pfBorder.Segments.Add(q2Border); - - pgBorder.Figures.Add(pfBorder); - - drawingContext.DrawGeometry(null, new Pen(Stroke, Thickness), pgBorder); + drawingContext.DrawGeometry( null, new Pen( Stroke, Thickness ), pgBorder ); - base.OnRender(drawingContext); - } + base.OnRender( drawingContext ); } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs index ae56ddba6..ee01ad2bf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -31,7 +31,7 @@ [assembly: AssemblyCompany( "Xceed Software Inc." )] [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )] +[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )] @@ -65,7 +65,11 @@ #pragma warning disable 1699 [assembly: AssemblyDelaySign( false )] +#if NETCORE || NET5 +[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )] +#else [assembly: AssemblyKeyFile( @"..\..\sn.snk" )] +#endif [assembly: AssemblyKeyName( "" )] #pragma warning restore 1699 diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml index 9e7055d63..3e3752e16 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -1832,15 +1832,8 @@ Value="WidthAndHeight" /> - + @@ -1902,7 +1895,7 @@ - @@ -1940,7 +1933,7 @@ - diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj new file mode 100644 index 000000000..e3f047e97 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj @@ -0,0 +1,88 @@ + + + + obj\net5\ + false + + + + net5.0-windows + Xceed.Wpf.AvalonDock.Themes + Xceed.Wpf.AvalonDock.Themes.Aero.NET5 + false + true + + + TRACE;DEBUG;NET5 + full + True + + + TRACE;NET5 + none + False + + + + AssemblyVersionInfo.cs + + + AssemblyVersionInfoCommon.cs + + + + + Code + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml index e92fe5a52..d512c2e69 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs index 40bb5528c..b3c6eacd4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.AvalonDock.Themes { @@ -28,6 +25,11 @@ public override Uri GetResourceUri() { string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Metro"; +#if NETCORE + assemblyName += ".NETCore"; +#elif NET5 + assemblyName += ".NET5"; +#endif return new Uri( "/" + assemblyName + ";component/Theme.xaml", diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs index a217ef86f..2428296d8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -31,7 +31,7 @@ [assembly: AssemblyCompany( "Xceed Software Inc." )] [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )] +[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )] @@ -65,6 +65,10 @@ #pragma warning disable 1699 [assembly: AssemblyDelaySign( false )] +#if NETCORE || NET5 +[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )] +#else [assembly: AssemblyKeyFile( @"..\..\sn.snk" )] +#endif [assembly: AssemblyKeyName( "" )] #pragma warning restore 1699 diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml index 3359df82b..be9650275 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -1902,14 +1902,8 @@ Value="WidthAndHeight" /> - + @@ -1969,7 +1963,7 @@ - @@ -2007,7 +2001,7 @@ - diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj new file mode 100644 index 000000000..fbd778b9a --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj @@ -0,0 +1,85 @@ + + + + obj\net5\ + false + + + + net5.0-windows + Xceed.Wpf.AvalonDock.Themes.Metro + Xceed.Wpf.AvalonDock.Themes.Metro.NET5 + false + true + + + TRACE;DEBUG;NET5 + full + True + + + TRACE;NET5 + none + False + + + + AssemblyVersionInfo.cs + + + AssemblyVersionInfoCommon.cs + + + Code + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml index b9c488fa2..fc60125ed 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs index d5baadef8..ddee1b954 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -31,7 +31,7 @@ [assembly: AssemblyCompany( "Xceed Software Inc." )] [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )] +[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )] // Setting ComVisible to false makes the types in this assembly not visible @@ -64,6 +64,11 @@ #pragma warning disable 1699 [assembly: AssemblyDelaySign( false )] +#if NETCORE || NET5 +[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )] +#else [assembly: AssemblyKeyFile( @"..\..\sn.snk" )] +#endif [assembly: AssemblyKeyName( "" )] #pragma warning restore 1699 + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml index e2c481462..289ce722a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -2040,15 +2040,8 @@ Value="WidthAndHeight" /> - + @@ -2110,7 +2103,7 @@ - @@ -2148,7 +2141,7 @@ - diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs index c36f4fd99..0f01c239d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.AvalonDock.Themes { @@ -28,6 +25,11 @@ public override Uri GetResourceUri() { string assemblyName = "Xceed.Wpf.AvalonDock.Themes.VS2010"; +#if NETCORE + assemblyName += ".NETCore"; +#elif NET5 + assemblyName += ".NET5"; +#endif return new Uri( "/" + assemblyName + ";component/Theme.xaml", diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj new file mode 100644 index 000000000..b9a15e3e7 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj @@ -0,0 +1,85 @@ + + + + obj\net5\ + false + + + + net5.0-windows + Xceed.Wpf.AvalonDock.Themes + Xceed.Wpf.AvalonDock.Themes.VS2010.NET5 + false + true + + + TRACE;DEBUG;NET5 + full + True + + + TRACE;NET5 + none + False + + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + AssemblyVersionInfo.cs + + + AssemblyVersionInfoCommon.cs + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs index 1f16c95d6..7def2607b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs index 60fb72a75..0135766b5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs index 3d3566745..c4ded83e9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -55,6 +55,12 @@ protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow ) ILayoutAnchorablePane targetModel = _targetPane.Model as ILayoutAnchorablePane; LayoutAnchorable anchorableActive = floatingWindow.Descendents().OfType().FirstOrDefault(); + if( ( targetModel.FindParent() == null ) + && ( anchorableActive != null ) ) + { + anchorableActive.IsFloating = false; + } + switch( Type ) { case DropTargetType.AnchorablePaneDockBottom: @@ -231,8 +237,6 @@ protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow ) } break; #endregion - - case DropTargetType.AnchorablePaneDockInside: #region DropTargetType.AnchorablePaneDockInside { @@ -250,8 +254,6 @@ protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow ) } break; #endregion - - } anchorableActive.IsActive = true; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs index 282490bf4..2160a7a71 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,9 +17,8 @@ using System; using System.Linq; -using System.Windows.Controls; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; +using System.Windows.Controls; namespace Xceed.Wpf.AvalonDock.Controls { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs index 3ecb941ef..ffdea2f61 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System.Linq; -using System.Windows.Controls; using System.Windows; +using System.Windows.Controls; using System.Windows.Input; using Xceed.Wpf.AvalonDock.Layout; @@ -53,7 +53,7 @@ public AnchorablePaneTitle() /// /// Model Dependency Property /// - public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( AnchorablePaneTitle ), + public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( AnchorablePaneTitle ), new FrameworkPropertyMetadata( ( LayoutAnchorable )null, new PropertyChangedCallback( _OnModelChanged ) ) ); /// @@ -99,10 +99,10 @@ protected virtual void OnModelChanged( DependencyPropertyChangedEventArgs e ) /// /// LayoutItem Read-Only Dependency Property /// - private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( AnchorablePaneTitle ), + private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( AnchorablePaneTitle ), new FrameworkPropertyMetadata( ( LayoutItem )null ) ); - public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty; + public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty; /// /// Gets the LayoutItem property. This dependency property diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs index e413c9ffc..28d4d862c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs index 61bc43e9d..fbd3d2de6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System; -using System.Windows; using System.ComponentModel; +using System.Windows; using System.Windows.Data; using System.Windows.Threading; @@ -42,8 +42,8 @@ public static void RebindInactiveBindings( DependencyObject dependencyObject ) // Ensure that no pending calls are in the dispatcher queue Dispatcher.CurrentDispatcher.BeginInvoke( DispatcherPriority.SystemIdle, ( Action )delegate { - // Remove and add the binding to re-trigger the binding error - dependencyObject.ClearValue( dpd.DependencyProperty ); + // Remove and add the binding to re-trigger the binding error + dependencyObject.ClearValue( dpd.DependencyProperty ); BindingOperations.SetBinding( dependencyObject, dpd.DependencyProperty, binding.ParentBindingBase ); } ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs index c0cc99cbd..6936da990 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs index 422bef2fc..5d9ba5ca7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -45,6 +45,14 @@ internal DockingManagerDropTarget( DockingManager manager, Rect detectionRect, D protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow ) { + if( ( floatingWindow != null ) + && ( floatingWindow.Root != null ) + && ( floatingWindow.Root.ActiveContent != null ) ) + { + var currentActiveContent = floatingWindow.Root.ActiveContent; + currentActiveContent.IsFloating = false; + } + switch( Type ) { case DropTargetType.DockingManagerDockLeft: @@ -236,7 +244,6 @@ protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow ) #endregion } - base.Drop( floatingWindow ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs index 77191380e..2e9d7ad14 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs index 933eb7d25..ac8069231 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -35,7 +35,7 @@ public class DocumentPaneControlOverlayArea : OverlayArea : base( overlayWindow ) { _documentPaneControl = documentPaneControl; - base.SetScreenDetectionArea( new Rect( _documentPaneControl.PointToScreenDPI( new Point() ), _documentPaneControl.TransformActualSizeToAncestor() ) ); + base.SetScreenDetectionArea( new Rect( _documentPaneControl.PointToScreenDPI( new Point() ), _documentPaneControl.TransformActualSizeToAncestor() ) ); } #endregion diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs index de1296f69..add66502f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -58,6 +58,15 @@ protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow ) LayoutPanel parentGroupPanel; FindParentLayoutDocumentPane( targetModel, out parentGroup, out parentGroupPanel ); + if( ( targetModel.FindParent() == null ) + && ( floatingWindow != null ) + && ( floatingWindow.Root != null ) + && ( floatingWindow.Root.ActiveContent != null ) ) + { + var currentActiveContent = floatingWindow.Root.ActiveContent; + currentActiveContent.IsFloating = false; + } + switch( Type ) { case DropTargetType.DocumentPaneDockAsAnchorableBottom: diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs index 153eef3d1..683d7326e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -55,6 +55,15 @@ protected override void Drop( LayoutDocumentFloatingWindow floatingWindow ) { ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane; + if( ( targetModel.FindParent() == null ) + && ( floatingWindow != null ) + && ( floatingWindow.Root != null ) + && ( floatingWindow.Root.ActiveContent != null ) ) + { + var currentActiveContent = floatingWindow.Root.ActiveContent; + currentActiveContent.IsFloating = false; + } + switch( Type ) { case DropTargetType.DocumentPaneDockBottom: @@ -205,7 +214,7 @@ protected override void Drop( LayoutDocumentFloatingWindow floatingWindow ) if( targetPane.DockWidth.IsStar ) { targetPane.DockWidth = new GridLength( targetPane.DockWidth.Value / 2d, GridUnitType.Star ); - newLayoutDocumentPane.DockWidth = targetPane.DockWidth; + newLayoutDocumentPane.DockWidth = targetPane.DockWidth; } } var parentModel = targetModel.Parent as LayoutDocumentPaneGroup; @@ -240,7 +249,6 @@ protected override void Drop( LayoutDocumentFloatingWindow floatingWindow ) } break; #endregion - case DropTargetType.DocumentPaneDockInside: #region DropTargetType.DocumentPaneDockInside { @@ -269,8 +277,6 @@ protected override void Drop( LayoutDocumentFloatingWindow floatingWindow ) } break; #endregion - - } base.Drop( floatingWindow ); @@ -280,6 +286,15 @@ protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow ) { ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane; + if( ( targetModel.FindParent() == null ) + && ( floatingWindow != null ) + && ( floatingWindow.Root != null ) + && ( floatingWindow.Root.ActiveContent != null ) ) + { + var currentActiveContent = floatingWindow.Root.ActiveContent; + currentActiveContent.IsFloating = false; + } + switch( Type ) { case DropTargetType.DocumentPaneDockBottom: diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs index cc43cec43..74761643c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -46,6 +46,15 @@ protected override void Drop( LayoutDocumentFloatingWindow floatingWindow ) { ILayoutPane targetModel = _targetPane.Model as ILayoutPane; + if( ( targetModel.FindParent() == null ) + && ( floatingWindow != null ) + && ( floatingWindow.Root != null ) + && ( floatingWindow.Root.ActiveContent != null ) ) + { + var currentActiveContent = floatingWindow.Root.ActiveContent; + currentActiveContent.IsFloating = false; + } + switch( Type ) { case DropTargetType.DocumentPaneGroupDockInside: @@ -60,6 +69,7 @@ protected override void Drop( LayoutDocumentFloatingWindow floatingWindow ) break; #endregion } + base.Drop( floatingWindow ); } @@ -67,6 +77,15 @@ protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow ) { ILayoutPane targetModel = _targetPane.Model as ILayoutPane; + if( ( targetModel.FindParent() == null ) + && ( floatingWindow != null ) + && ( floatingWindow.Root != null ) + && ( floatingWindow.Root.ActiveContent != null ) ) + { + var currentActiveContent = floatingWindow.Root.ActiveContent; + currentActiveContent.IsFloating = false; + } + switch( Type ) { case DropTargetType.DocumentPaneGroupDockInside: diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs index 728f2eb1f..e7c83a69c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,8 @@ using System; using System.Linq; -using System.Windows.Controls; using System.Windows; +using System.Windows.Controls; using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls @@ -60,7 +60,7 @@ protected override Size ArrangeOverride( Size finalSize ) if( skipAllOthers || offset + doc.DesiredSize.Width > finalSize.Width ) { var layoutContent = doc.Content as LayoutContent; - if( (layoutContent != null) && layoutContent.IsSelected && !doc.IsVisible ) + if( ( layoutContent != null ) && layoutContent.IsSelected && !doc.IsVisible ) { var parentContainer = layoutContent.Parent as ILayoutContainer; var parentSelector = layoutContent.Parent as ILayoutContentSelector; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs index c083b23e1..981626715 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -192,8 +192,8 @@ internal void Abort() #region Private Methods private void GetOverlayWindowHosts() - { - var windows = _manager.GetWindowsByZOrder().Where( w => (w != _floatingWindow) && w.IsVisible ); + { + var windows = _manager.GetWindowsByZOrder().Where( w => ( w != _floatingWindow ) && w.IsVisible ); foreach( var w in windows ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs index d851b4149..89eb40558 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -69,7 +69,7 @@ public Rect DetectionRect { return _detectionRect; } - } + } public DropAreaType Type { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs index 0ef7d1450..ed514268c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,9 @@ ***********************************************************************************/ -using System.Windows.Controls.Primitives; using System.Windows; using System.Windows.Controls; +using System.Windows.Controls.Primitives; namespace Xceed.Wpf.AvalonDock.Controls { @@ -39,8 +39,8 @@ public DropDownButton() /// /// DropDownContextMenu Dependency Property /// - public static readonly DependencyProperty DropDownContextMenuProperty = DependencyProperty.Register( "DropDownContextMenu", typeof( ContextMenu ), typeof( DropDownButton ), - new FrameworkPropertyMetadata( ( ContextMenu )null, new PropertyChangedCallback( OnDropDownContextMenuChanged ) ) ); + public static readonly DependencyProperty DropDownContextMenuProperty = DependencyProperty.Register( "DropDownContextMenu", typeof( ContextMenu ), typeof( DropDownButton ), + new FrameworkPropertyMetadata( ( ContextMenu )null, new PropertyChangedCallback( OnDropDownContextMenuChanged ) ) ); /// /// Gets or sets the DropDownContextMenu property. This dependency property @@ -83,7 +83,7 @@ protected virtual void OnDropDownContextMenuChanged( DependencyPropertyChangedEv /// /// DropDownContextMenuDataContext Dependency Property /// - public static readonly DependencyProperty DropDownContextMenuDataContextProperty = DependencyProperty.Register( "DropDownContextMenuDataContext", typeof( object ), typeof( DropDownButton ), + public static readonly DependencyProperty DropDownContextMenuDataContextProperty = DependencyProperty.Register( "DropDownContextMenuDataContext", typeof( object ), typeof( DropDownButton ), new FrameworkPropertyMetadata( ( object )null ) ); /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs index aabdc86e3..594be3ca1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs index 624dcb9fc..b458838fc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -20,9 +20,8 @@ using System.Linq; using System.Windows; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; using System.Windows.Threading; -using System.Windows.Input; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { @@ -70,7 +69,7 @@ public T TargetElement { return _targetElement; } - } + } public DropTargetType Type { @@ -119,7 +118,6 @@ public void Drop( LayoutFloatingWindow floatingWindow ) currentActiveContent.IsSelected = false; currentActiveContent.IsActive = false; currentActiveContent.IsActive = true; - currentActiveContent.IsFloating = false; } ), DispatcherPriority.Background ); } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs index 0a29d1b29..f0a732a3e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs index ef6e5f7df..2e17c608d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs index 991659e33..05a68083a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs index 5b6e47004..995979936 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,15 +17,15 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; +using System.Reflection; +using System.Windows; using System.Windows.Input; using System.Windows.Interop; -using System.Windows; -using System.Diagnostics; -using Xceed.Wpf.AvalonDock.Layout; using System.Windows.Media; using System.Windows.Threading; -using System.Reflection; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs index c2e104260..a3300e959 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs index 04c42c743..ce2d61462 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs index b9e1bfdbc..5521eed77 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs index d406d73a5..f46952cfb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs index c73acb16d..f10e2f8a6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs index 02ee27bd6..d1bbe0ccd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs index cfb07aaf2..87df25647 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs index dc05fce84..25c35b79b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,12 @@ ***********************************************************************************/ -using System.Linq; -using System.Windows.Controls; using System.Collections.ObjectModel; -using Xceed.Wpf.AvalonDock.Layout; +using System.Linq; using System.Windows; +using System.Windows.Controls; using System.Windows.Data; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs index f1c88ab31..3c020c132 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs index aaf670059..eaad3349e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -45,7 +45,7 @@ public LayoutAnchorableControl() /// /// Model Dependency Property /// - public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( LayoutAnchorableControl ), + public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( LayoutAnchorableControl ), new FrameworkPropertyMetadata( ( LayoutAnchorable )null, new PropertyChangedCallback( OnModelChanged ) ) ); /// @@ -82,7 +82,7 @@ protected virtual void OnModelChanged( DependencyPropertyChangedEventArgs e ) ( ( LayoutContent )e.OldValue ).PropertyChanged -= this.Model_PropertyChanged; } - if( ( this.Model != null) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) ) + if( ( this.Model != null ) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) ) { this.Model.PropertyChanged += this.Model_PropertyChanged; this.SetLayoutItem( this.Model.Root.Manager.GetLayoutItemFromModel( this.Model ) ); @@ -158,7 +158,7 @@ protected override void OnGotKeyboardFocus( System.Windows.Input.KeyboardFocusCh { if( Model != null ) Model.IsActive = true; - } + } base.OnGotKeyboardFocus( e ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs index f1a9563e5..b8d3b7ee4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,17 +15,17 @@ ***********************************************************************************/ +using Microsoft.Windows.Shell; using System; using System.Collections.Generic; using System.Linq; using System.Windows; +using System.Windows.Controls.Primitives; using System.Windows.Data; using System.Windows.Input; -using Xceed.Wpf.AvalonDock.Layout; -using Xceed.Wpf.AvalonDock.Converters; -using System.Windows.Controls.Primitives; using Xceed.Wpf.AvalonDock.Commands; -using Microsoft.Windows.Shell; +using Xceed.Wpf.AvalonDock.Converters; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { @@ -143,9 +143,9 @@ protected override void OnClosed( EventArgs e ) _overlayWindow = null; } - base.OnClosed( e ); + base.OnClosed( e ); - _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged ); + _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged ); IsVisibleChanged -= this.LayoutAnchorableFloatingWindowControl_IsVisibleChanged; BindingOperations.ClearBinding( this, VisibilityProperty ); BindingOperations.ClearBinding( this, SingleContentLayoutItemProperty ); @@ -336,7 +336,7 @@ public ICommand HideWindowCommand private bool CanExecuteHideWindowCommand( object parameter ) { - return this.CanHide( parameter ); + return this.CanHide( parameter ); } private void OnExecuteHideWindowCommand( object parameter ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs index 05ad414c8..adc075264 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,11 @@ ***********************************************************************************/ using System; -using Xceed.Wpf.AvalonDock.Layout; -using System.Windows.Input; using System.Windows; -using Xceed.Wpf.AvalonDock.Commands; using System.Windows.Data; +using System.Windows.Input; +using Xceed.Wpf.AvalonDock.Commands; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs index c9ff68609..6dc97eb79 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ***********************************************************************************/ using System; -using System.Windows.Controls; using System.Windows; using System.Windows.Data; using Xceed.Wpf.AvalonDock.Layout; @@ -113,7 +112,7 @@ protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButton _model.SelectedContent.IsActive = true; } } - } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs index 572b0feef..a51c9a3f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,8 @@ ***********************************************************************************/ -using System.Windows.Controls; using System.Windows; +using System.Windows.Controls; using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs index e0b88aad5..99a908e07 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -193,9 +193,9 @@ protected override void OnMouseMove( System.Windows.Input.MouseEventArgs e ) _mouseLastChangePositionX = currentTabScreenArea.Left + ( currentTabScreenArea.Width / 2 ); } - if( ( containerPane is LayoutAnchorablePane ) && !( (LayoutAnchorablePane)containerPane ).CanRepositionItems ) + if( ( containerPane is LayoutAnchorablePane ) && !( ( LayoutAnchorablePane )containerPane ).CanRepositionItems ) return; - if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutAnchorablePaneGroup ) && !( (LayoutAnchorablePaneGroup)containerPane.Parent ).CanRepositionItems ) + if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutAnchorablePaneGroup ) && !( ( LayoutAnchorablePaneGroup )containerPane.Parent ).CanRepositionItems ) return; var childrenList = container.Children.ToList(); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs index 3f628d8af..c95f04980 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,12 +17,12 @@ using System; using System.Linq; -using System.Windows.Interop; -using System.Windows.Controls; using System.Runtime.InteropServices; using System.Windows; -using System.Windows.Input; +using System.Windows.Controls; using System.Windows.Data; +using System.Windows.Input; +using System.Windows.Interop; using System.Windows.Media; using Xceed.Wpf.AvalonDock.Layout; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs index 2d23853a0..733d65189 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,10 +17,10 @@ using System.Collections.Generic; +using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Data; -using System.Linq; using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls @@ -61,6 +61,7 @@ static LayoutCachePaneControl() + #endregion @@ -100,6 +101,7 @@ protected override void OnSelectionChanged( SelectionChangedEventArgs e ) + } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs index 2e5f0b4fa..ab5b8a8b0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -119,7 +119,7 @@ private void Model_PropertyChanged( object sender, PropertyChangedEventArgs e ) /// LayoutItem Read-Only Dependency Property /// private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( LayoutDocumentControl ), - new FrameworkPropertyMetadata(( LayoutItem )null ) ); + new FrameworkPropertyMetadata( ( LayoutItem )null ) ); public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty; @@ -153,7 +153,7 @@ protected void SetLayoutItem( LayoutItem value ) protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e ) { - var setIsActive = !( (e.NewFocus != null) && (e.OldFocus != null) && (e.OldFocus is LayoutFloatingWindowControl) ); + var setIsActive = !( ( e.NewFocus != null ) && ( e.OldFocus != null ) && ( e.OldFocus is LayoutFloatingWindowControl ) ); if( setIsActive ) { this.SetIsActive(); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs index c66e51003..aa537acd3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,12 @@ ***********************************************************************************/ +using Microsoft.Windows.Shell; using System; -using Xceed.Wpf.AvalonDock.Layout; +using System.Linq; using System.Windows; using System.Windows.Controls.Primitives; -using Microsoft.Windows.Shell; -using System.Linq; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs index b199b6e9b..3945011f5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,11 @@ ***********************************************************************************/ -using Xceed.Wpf.AvalonDock.Layout; using System.Windows; -using Xceed.Wpf.AvalonDock.Commands; -using System.Windows.Input; using System.Windows.Data; +using System.Windows.Input; +using Xceed.Wpf.AvalonDock.Commands; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { @@ -98,7 +98,7 @@ protected override void Close() protected override void OnVisibilityChanged() { - if( (_document != null) && (_document.Root != null) ) + if( ( _document != null ) && ( _document.Root != null ) ) { _document.IsVisible = ( this.Visibility == Visibility.Visible ); @@ -141,6 +141,6 @@ internal override void Detach() -#endregion + #endregion } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs index 00cf0600d..b8c0bce62 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -105,7 +105,7 @@ protected override void OnMouseLeftButtonDown( System.Windows.Input.MouseButtonE _model.SelectedContent.IsActive = true; } } - } + } } protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButtonEventArgs e ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs index 88c01dfab..220060a36 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,8 @@ ***********************************************************************************/ -using System.Windows.Controls; using System.Windows; +using System.Windows.Controls; using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs index d3286ab4e..bcb10b755 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -63,7 +63,7 @@ public LayoutDocumentTabItem() /// /// Model Dependency Property /// - public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutContent ), typeof( LayoutDocumentTabItem ), + public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutContent ), typeof( LayoutDocumentTabItem ), new FrameworkPropertyMetadata( ( LayoutContent )null, new PropertyChangedCallback( OnModelChanged ) ) ); /// @@ -201,9 +201,9 @@ protected override void OnMouseMove( System.Windows.Input.MouseEventArgs e ) _mouseLastChangePositionX = currentTabScreenArea.Left + ( currentTabScreenArea.Width / 2 ); } - if( ( containerPane is LayoutDocumentPane ) && !( (LayoutDocumentPane)containerPane ).CanRepositionItems ) + if( ( containerPane is LayoutDocumentPane ) && !( ( LayoutDocumentPane )containerPane ).CanRepositionItems ) return; - if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutDocumentPaneGroup ) && !( (LayoutDocumentPaneGroup)containerPane.Parent ).CanRepositionItems ) + if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutDocumentPaneGroup ) && !( ( LayoutDocumentPaneGroup )containerPane.Parent ).CanRepositionItems ) return; var childrenList = container.Children.ToList(); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs index 48d107ad4..049a8fe5c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -21,13 +21,10 @@ using System.Runtime.InteropServices; using System.Windows.Interop; using System.Windows.Input; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Media; using Xceed.Wpf.AvalonDock.Layout; -using System.Windows.Documents; using Xceed.Wpf.AvalonDock.Themes; using Standard; +using System.Windows.Threading; namespace Xceed.Wpf.AvalonDock.Controls { @@ -291,7 +288,7 @@ protected override void OnClosed( EventArgs e ) root.FloatingWindows.Remove( this.Model as LayoutFloatingWindow ); } - this.BringFocusOnDockingManager(); + this.BringFocusOnDockingManager(); } protected override void OnInitialized( EventArgs e ) @@ -413,7 +410,7 @@ protected virtual IntPtr FilterMessage( IntPtr hwnd, int msg, IntPtr wParam, Int if( wParam != IntPtr.Zero ) { handled = true; - var client = (RECT)Marshal.PtrToStructure( lParam, typeof( RECT ) ); + var client = ( RECT )Marshal.PtrToStructure( lParam, typeof( RECT ) ); client.Bottom -= 1; Marshal.StructureToPtr( client, lParam, false ); } @@ -438,7 +435,7 @@ protected virtual IntPtr FilterMessage( IntPtr hwnd, int msg, IntPtr wParam, Int // break; case Win32Helper.WM_ACTIVATE: - if( ( (int)wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE ) + if( ( ( int )wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE ) { if( lParam == this.GetParentWindowHandle() ) { @@ -481,7 +478,7 @@ protected virtual IntPtr FilterMessage( IntPtr hwnd, int msg, IntPtr wParam, Int } break; case Win32Helper.WM_SYSCOMMAND: - int command = (int)wParam & 0xFFF0; + int command = ( int )wParam & 0xFFF0; if( command == Win32Helper.SC_MAXIMIZE || command == Win32Helper.SC_RESTORE ) { UpdateMaximizedState( command == Win32Helper.SC_MAXIMIZE ); @@ -500,7 +497,13 @@ internal void InternalClose() if( !_isClosing ) { _isClosing = true; - this.Close(); + + // Added Dispatcher to prevent InvalidOperationException issue in reference to bug case + // DevOps #2106 + Dispatcher.BeginInvoke( new Action( () => + { + this.Close(); + } ), DispatcherPriority.Send ); } } @@ -513,8 +516,8 @@ internal void BringFocusOnDockingManager() } else { - if( (this.Model != null) && ( this.Model.Root != null) && ( this.Model.Root.Manager != null ) ) - { + if( ( this.Model != null ) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) ) + { var firstUIElement = this.Model.Root.Manager.FindVisualChildren().Where( control => control.Focusable ).FirstOrDefault(); if( firstUIElement != null ) { @@ -547,7 +550,7 @@ private static object CoerceContentValue( DependencyObject sender, object conten private void LayoutFloatingWindowControl_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e ) { - if( (bool)e.NewValue ) + if( ( bool )e.NewValue ) { } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs index 4ec5413f8..bf2e362c9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,12 +17,12 @@ using System; using System.Linq; -using System.Windows.Controls; using System.Windows; +using System.Windows.Controls; using System.Windows.Input; using System.Windows.Media; -using Xceed.Wpf.AvalonDock.Layout; using System.Windows.Threading; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { @@ -68,7 +68,7 @@ public ILayoutElement Model { return _model; } - } + } public Orientation Orientation { @@ -76,7 +76,7 @@ public Orientation Orientation { return ( _model as ILayoutOrientableGroup ).Orientation; } - } + } private bool AsyncRefreshCalled { @@ -405,11 +405,11 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri var nextChild = GetNextVisibleChild( indexOfResizer ); var prevChildActualSize = prevChild.TransformActualSizeToAncestor(); - var nextChildActualSize = (nextChild != null) ? nextChild.TransformActualSizeToAncestor() : new Size(); - var totalActualSize = new Size(prevChildActualSize.Width + nextChildActualSize.Width, prevChildActualSize.Height + nextChildActualSize.Height ); + var nextChildActualSize = ( nextChild != null ) ? nextChild.TransformActualSizeToAncestor() : new Size(); + var totalActualSize = new Size( prevChildActualSize.Width + nextChildActualSize.Width, prevChildActualSize.Height + nextChildActualSize.Height ); var prevChildModel = ( ILayoutPositionableElement )( prevChild as ILayoutControl ).Model; - var nextChildModel = (nextChild != null) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null; + var nextChildModel = ( nextChild != null ) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null; var totalStarSize = new Size( prevChildModel.DockWidth.IsStar && nextChildModel.DockWidth.IsStar ? prevChildModel.DockWidth.Value + nextChildModel.DockWidth.Value : 1d, prevChildModel.DockHeight.IsStar && nextChildModel.DockHeight.IsStar ? prevChildModel.DockHeight.Value + nextChildModel.DockHeight.Value : 1d ); @@ -417,7 +417,7 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri { if( prevChildModel.DockWidth.IsStar ) { - prevChildModel.DockWidth = new GridLength( ((prevChildActualSize.Width + delta) / totalActualSize.Width) * totalStarSize.Width, GridUnitType.Star ); + prevChildModel.DockWidth = new GridLength( ( ( prevChildActualSize.Width + delta ) / totalActualSize.Width ) * totalStarSize.Width, GridUnitType.Star ); } else { @@ -431,7 +431,7 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri { if( nextChildModel.DockWidth.IsStar ) { - nextChildModel.DockWidth = new GridLength( ((nextChildActualSize.Width - delta) / totalActualSize.Width) * totalStarSize.Width, GridUnitType.Star ); + nextChildModel.DockWidth = new GridLength( ( ( nextChildActualSize.Width - delta ) / totalActualSize.Width ) * totalStarSize.Width, GridUnitType.Star ); } else { @@ -446,7 +446,7 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri { if( prevChildModel.DockHeight.IsStar ) { - prevChildModel.DockHeight = new GridLength( ((prevChildActualSize.Height + delta) / totalActualSize.Height) * totalStarSize.Height, GridUnitType.Star ); + prevChildModel.DockHeight = new GridLength( ( ( prevChildActualSize.Height + delta ) / totalActualSize.Height ) * totalStarSize.Height, GridUnitType.Star ); } else { @@ -460,7 +460,7 @@ private void OnSplitterDragCompleted( object sender, System.Windows.Controls.Pri { if( nextChildModel.DockHeight.IsStar ) { - nextChildModel.DockHeight = new GridLength( ((nextChildActualSize.Height - delta) / totalActualSize.Height) * totalStarSize.Height, GridUnitType.Star ); + nextChildModel.DockHeight = new GridLength( ( ( nextChildActualSize.Height - delta ) / totalActualSize.Height ) * totalStarSize.Height, GridUnitType.Star ); } else { @@ -511,10 +511,10 @@ private void ShowResizerOverlayWindow( LayoutGridResizerControl splitter ) var nextChild = GetNextVisibleChild( indexOfResizer ); var prevChildActualSize = prevChild.TransformActualSizeToAncestor(); - var nextChildActualSize = (nextChild != null) ? nextChild.TransformActualSizeToAncestor() : new Size(); + var nextChildActualSize = ( nextChild != null ) ? nextChild.TransformActualSizeToAncestor() : new Size(); var prevChildModel = ( ILayoutPositionableElement )( prevChild as ILayoutControl ).Model; - var nextChildModel = (nextChild != null) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null; + var nextChildModel = ( nextChild != null ) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null; Point ptTopLeftScreen = prevChild.PointToScreenDPIWithoutFlowDirection( new Point() ); @@ -522,7 +522,7 @@ private void ShowResizerOverlayWindow( LayoutGridResizerControl splitter ) if( Orientation == System.Windows.Controls.Orientation.Horizontal ) { - var nextChildDockMinWidth = (nextChildModel != null) ? nextChildModel.DockMinWidth : 0d; + var nextChildDockMinWidth = ( nextChildModel != null ) ? nextChildModel.DockMinWidth : 0d; actualSize = new Size( prevChildActualSize.Width - prevChildModel.DockMinWidth + splitter.ActualWidth + nextChildActualSize.Width - nextChildDockMinWidth, @@ -589,7 +589,7 @@ private void ShowResizerOverlayWindow( LayoutGridResizerControl splitter ) _resizerWindowHost.Show(); } - private void HideResizerOverlayWindow() + private void HideResizerOverlayWindow() { if( _resizerWindowHost != null ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs index df11a3182..7772fb731 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,8 @@ ***********************************************************************************/ -using System.Windows.Controls.Primitives; using System.Windows; +using System.Windows.Controls.Primitives; using System.Windows.Media; namespace Xceed.Wpf.AvalonDock.Controls diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs index d5471b491..ec03f39c6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,12 +18,12 @@ using System; using System.Linq; using System.Windows; -using Xceed.Wpf.AvalonDock.Layout; -using System.Windows.Input; -using Xceed.Wpf.AvalonDock.Commands; +using System.Windows.Controls; using System.Windows.Data; +using System.Windows.Input; using System.Windows.Media; -using System.Windows.Controls; +using Xceed.Wpf.AvalonDock.Commands; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs index 428b528ea..3feea236f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ ***********************************************************************************/ -using System; -using System.Windows.Controls; -using System.Windows; using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Controls @@ -46,7 +43,7 @@ internal LayoutPanelControl( LayoutPanel model ) protected override void OnFixChildrenDockLengths() { // This is because the commented part is setting DockWidth of children....strange code. - return; + return; //if (ActualWidth == 0.0 || // ActualHeight == 0.0) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs index abb62f174..7de333ebd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,8 @@ ***********************************************************************************/ -using System.Windows.Controls; using System.Windows; +using System.Windows.Controls; namespace Xceed.Wpf.AvalonDock.Controls { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs index 6daccdf73..df3c8f653 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -60,16 +60,16 @@ public NavigatorWindow( DockingManager manager ) _manager = manager; _internalSetSelectedDocument = true; - this.SetAnchorables( _manager.Layout.Descendents().OfType().Where( a => a.IsVisible && a.IsEnabled).Select( d => (LayoutAnchorableItem)_manager.GetLayoutItemFromModel( d ) ).ToArray() ); - this.SetDocuments( _manager.Layout.Descendents().OfType().Where( d => d.IsEnabled ).OrderByDescending( d => d.LastActivationTimeStamp.GetValueOrDefault() ).Select( d => (LayoutDocumentItem)_manager.GetLayoutItemFromModel( d ) ).ToArray() ); + this.SetAnchorables( _manager.Layout.Descendents().OfType().Where( a => a.IsVisible && a.IsEnabled ).Select( d => ( LayoutAnchorableItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() ); + this.SetDocuments( _manager.Layout.Descendents().OfType().Where( d => d.IsEnabled ).OrderByDescending( d => d.LastActivationTimeStamp.GetValueOrDefault() ).Select( d => ( LayoutDocumentItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() ); _internalSetSelectedDocument = false; - if( ( this.Documents != null) && (this.Documents.Length > 1) ) + if( ( this.Documents != null ) && ( this.Documents.Length > 1 ) ) { this.InternalSetSelectedDocument( this.Documents[ 1 ] ); _isSelectingDocument = true; } - else if( (this.Anchorables != null) && (this.Anchorables.Count() > 1) ) + else if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 1 ) ) { this.InternalSetSelectedAnchorable( this.Anchorables.ToArray()[ 1 ] ); _isSelectingDocument = false; @@ -105,7 +105,7 @@ public LayoutDocumentItem[] Documents { get { - return (LayoutDocumentItem[])GetValue( DocumentsProperty ); + return ( LayoutDocumentItem[] )GetValue( DocumentsProperty ); } } @@ -117,7 +117,7 @@ public LayoutDocumentItem[] Documents /// Anchorables Read-Only Dependency Property /// private static readonly DependencyPropertyKey AnchorablesPropertyKey = DependencyProperty.RegisterReadOnly( "Anchorables", typeof( IEnumerable ), typeof( NavigatorWindow ), - new FrameworkPropertyMetadata( (IEnumerable)null ) ); + new FrameworkPropertyMetadata( ( IEnumerable )null ) ); public static readonly DependencyProperty AnchorablesProperty = AnchorablesPropertyKey.DependencyProperty; @@ -129,7 +129,7 @@ public IEnumerable Anchorables { get { - return (IEnumerable)GetValue( AnchorablesProperty ); + return ( IEnumerable )GetValue( AnchorablesProperty ); } } @@ -141,7 +141,7 @@ public IEnumerable Anchorables /// SelectedDocument Dependency Property /// public static readonly DependencyProperty SelectedDocumentProperty = DependencyProperty.Register( "SelectedDocument", typeof( LayoutDocumentItem ), typeof( NavigatorWindow ), - new FrameworkPropertyMetadata( (LayoutDocumentItem)null, new PropertyChangedCallback( OnSelectedDocumentChanged ) ) ); + new FrameworkPropertyMetadata( ( LayoutDocumentItem )null, new PropertyChangedCallback( OnSelectedDocumentChanged ) ) ); /// /// Gets or sets the SelectedDocument property. This dependency property @@ -151,7 +151,7 @@ public LayoutDocumentItem SelectedDocument { get { - return (LayoutDocumentItem)GetValue( SelectedDocumentProperty ); + return ( LayoutDocumentItem )GetValue( SelectedDocumentProperty ); } set { @@ -164,7 +164,7 @@ public LayoutDocumentItem SelectedDocument /// private static void OnSelectedDocumentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) { - ( (NavigatorWindow)d ).OnSelectedDocumentChanged( e ); + ( ( NavigatorWindow )d ).OnSelectedDocumentChanged( e ); } /// @@ -191,7 +191,7 @@ protected virtual void OnSelectedDocumentChanged( DependencyPropertyChangedEvent /// SelectedAnchorable Dependency Property /// public static readonly DependencyProperty SelectedAnchorableProperty = DependencyProperty.Register( "SelectedAnchorable", typeof( LayoutAnchorableItem ), typeof( NavigatorWindow ), - new FrameworkPropertyMetadata( (LayoutAnchorableItem)null, new PropertyChangedCallback( OnSelectedAnchorableChanged ) ) ); + new FrameworkPropertyMetadata( ( LayoutAnchorableItem )null, new PropertyChangedCallback( OnSelectedAnchorableChanged ) ) ); /// /// Gets or sets the SelectedAnchorable property. This dependency property @@ -201,7 +201,7 @@ public LayoutAnchorableItem SelectedAnchorable { get { - return (LayoutAnchorableItem)GetValue( SelectedAnchorableProperty ); + return ( LayoutAnchorableItem )GetValue( SelectedAnchorableProperty ); } set { @@ -214,7 +214,7 @@ public LayoutAnchorableItem SelectedAnchorable /// private static void OnSelectedAnchorableChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) { - ( (NavigatorWindow)d ).OnSelectedAnchorableChanged( e ); + ( ( NavigatorWindow )d ).OnSelectedAnchorableChanged( e ); } /// @@ -236,6 +236,50 @@ protected virtual void OnSelectedAnchorableChanged( DependencyPropertyChangedEve #endregion + #region LayoutDocumentsLabel + + public static readonly DependencyProperty LayoutDocumentsLabelProperty = DependencyProperty.Register( + "LayoutDocumentsLabel", + typeof( string ), + typeof( NavigatorWindow ), + new FrameworkPropertyMetadata( "Active Files" ) ); + + public string LayoutDocumentsLabel + { + get + { + return ( string )GetValue( LayoutDocumentsLabelProperty ); + } + set + { + SetValue( LayoutDocumentsLabelProperty, value ); + } + } + + #endregion // LayoutDocumentsLabel + + #region LayoutAnchorablesLabel + + public static readonly DependencyProperty LayoutAnchorablesLabelProperty = DependencyProperty.Register( + "LayoutAnchorablesLabel", + typeof( string ), + typeof( NavigatorWindow ), + new FrameworkPropertyMetadata( "Active Tool Windows" ) ); + + public string LayoutAnchorablesLabel + { + get + { + return ( string )GetValue( LayoutAnchorablesLabelProperty ); + } + set + { + SetValue( LayoutAnchorablesLabelProperty, value ); + } + } + + #endregion // LayoutAnchorablesLabel + #endregion #region Overrides @@ -262,7 +306,7 @@ protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e ) // Selecting LayoutDocuments if( _isSelectingDocument ) { - if( (this.SelectedDocument != null) && ( this.Documents != null) ) + if( ( this.SelectedDocument != null ) && ( this.Documents != null ) ) { var docIndex = this.Documents.IndexOf( this.SelectedDocument ); @@ -270,7 +314,7 @@ protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e ) { // Jump to next LayoutDocument if( ( docIndex < ( this.Documents.Length - 1 ) ) - || (this.Anchorables == null) + || ( this.Anchorables == null ) || ( this.Anchorables.Count() == 0 ) ) { this.SelectNextDocument(); @@ -299,7 +343,7 @@ protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e ) } else if( ( e.Key == System.Windows.Input.Key.Left ) || ( e.Key == System.Windows.Input.Key.Right ) ) { - if( (this.Anchorables != null) && (this.Anchorables.Count() > 0) ) + if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 0 ) ) { _isSelectingDocument = false; this.InternalSetSelectedDocument( null ); @@ -319,7 +363,7 @@ protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e ) // There is no SelectedDocument, select the first one. else { - if( ( this.Documents != null ) && (this.Documents.Length > 0) ) + if( ( this.Documents != null ) && ( this.Documents.Length > 0 ) ) { this.InternalSetSelectedDocument( this.Documents[ 0 ] ); shouldHandle = true; @@ -331,19 +375,19 @@ protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e ) { if( this.SelectedAnchorable != null ) { - var anchorableIndex = ( this.Anchorables != null) ? this.Anchorables.ToArray().IndexOf( this.SelectedAnchorable ) : -1; + var anchorableIndex = ( this.Anchorables != null ) ? this.Anchorables.ToArray().IndexOf( this.SelectedAnchorable ) : -1; if( e.Key == System.Windows.Input.Key.Tab ) { // Jump to next LayoutAnchorable - if( ( ( this.Anchorables != null) && ( anchorableIndex < ( this.Anchorables.Count() - 1 ) ) ) + if( ( ( this.Anchorables != null ) && ( anchorableIndex < ( this.Anchorables.Count() - 1 ) ) ) || ( ( this.Documents != null ) && ( this.Documents.Length == 0 ) ) ) { this.SelectNextAnchorable(); shouldHandle = true; } // Jump to first LayoutDocument - else if( ( this.Documents != null) && (this.Documents.Length > 0) ) + else if( ( this.Documents != null ) && ( this.Documents.Length > 0 ) ) { _isSelectingDocument = true; this.InternalSetSelectedAnchorable( null ); @@ -365,7 +409,7 @@ protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e ) } else if( ( e.Key == System.Windows.Input.Key.Left ) || ( e.Key == System.Windows.Input.Key.Right ) ) { - if( ( this.Documents != null) && (this.Documents.Count() > 0) ) + if( ( this.Documents != null ) && ( this.Documents.Count() > 0 ) ) { _isSelectingDocument = true; this.InternalSetSelectedAnchorable( null ); @@ -384,7 +428,7 @@ protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e ) // There is no SelectedAnchorable, select the first one. else { - if( ( this.Anchorables != null) && (this.Anchorables.Count() > 0) ) + if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 0 ) ) { this.InternalSetSelectedAnchorable( this.Anchorables.ToArray()[ 0 ] ); shouldHandle = true; @@ -482,7 +526,7 @@ internal void UpdateThemeResources( Theme oldTheme = null ) { if( _manager.Theme is DictionaryTheme ) { - currentThemeResourceDictionary = ( (DictionaryTheme)_manager.Theme ).ThemeResourceDictionary; + currentThemeResourceDictionary = ( ( DictionaryTheme )_manager.Theme ).ThemeResourceDictionary; this.Resources.MergedDictionaries.Add( currentThemeResourceDictionary ); } else @@ -494,7 +538,7 @@ internal void UpdateThemeResources( Theme oldTheme = null ) internal void SelectNextDocument() { - if( (this.SelectedDocument != null) && ( this.Documents != null) ) + if( ( this.SelectedDocument != null ) && ( this.Documents != null ) ) { int docIndex = this.Documents.IndexOf( this.SelectedDocument ); docIndex++; @@ -508,7 +552,7 @@ internal void SelectNextDocument() internal void SelectPreviousDocument() { - if( (this.SelectedDocument != null) && ( this.Documents != null) ) + if( ( this.SelectedDocument != null ) && ( this.Documents != null ) ) { int docIndex = this.Documents.IndexOf( this.SelectedDocument ); docIndex--; @@ -522,7 +566,7 @@ internal void SelectPreviousDocument() internal void SelectNextAnchorable() { - if( (this.SelectedAnchorable != null) && ( this.Anchorables != null) ) + if( ( this.SelectedAnchorable != null ) && ( this.Anchorables != null ) ) { var anchorablesArray = this.Anchorables.ToArray(); int anchorableIndex = anchorablesArray.IndexOf( this.SelectedAnchorable ); @@ -537,7 +581,7 @@ internal void SelectNextAnchorable() internal void SelectPreviousAnchorable() { - if( (this.SelectedAnchorable != null) && ( this.Anchorables != null ) ) + if( ( this.SelectedAnchorable != null ) && ( this.Anchorables != null ) ) { var anchorablesArray = this.Anchorables.ToArray(); int anchorableIndex = anchorablesArray.IndexOf( this.SelectedAnchorable ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs index 8c4b5c0d0..d4b7353c2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs index c3127e5f5..a5007e369 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs index 8342261e0..baa95f406 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs index deb1dc048..7423dee61 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs index 7a795fe28..f0036eae1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs index c67833f4e..4fe53bc46 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs index e4c402d36..681572e7e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs index 4e5c7a15f..2ecc70214 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,7 +18,6 @@ namespace Standard { - using System; using System.Diagnostics.CodeAnalysis; /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs index aacca05e1..e161dca1c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs index 4bcdf3cc1..e6d2cfb8f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs index 47573d1da..70aab6e28 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -22,11 +22,11 @@ namespace Standard { using System; + using System.Collections.Generic; + using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Threading; - using System.Collections.Generic; - using System.Diagnostics.CodeAnalysis; internal sealed class MessageWindow : DispatcherObject, IDisposable { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs index 1a03eb714..ed367258d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -21,6 +21,7 @@ namespace Standard { + using Microsoft.Win32.SafeHandles; using System; using System.ComponentModel; using System.Diagnostics.CodeAnalysis; @@ -30,12 +31,8 @@ namespace Standard using System.Runtime.InteropServices.ComTypes; using System.Security.Permissions; using System.Text; - using Microsoft.Win32.SafeHandles; - // Some COM interfaces and Win32 structures are already declared in the framework. // Interesting ones to remember in System.Runtime.InteropServices.ComTypes are: - using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; - using IPersistFile = System.Runtime.InteropServices.ComTypes.IPersistFile; using IStream = System.Runtime.InteropServices.ComTypes.IStream; #region Native Values @@ -1646,9 +1643,9 @@ protected override bool ReleaseHandle() } } -#endregion + #endregion -#region Native Types + #region Native Types [StructLayout( LayoutKind.Sequential )] internal struct BLENDFUNCTION @@ -1882,7 +1879,7 @@ public void Clear() Assert.IsTrue( hr.Succeeded ); } -#region IDisposable Pattern + #region IDisposable Pattern public void Dispose() { @@ -1901,7 +1898,7 @@ private void Dispose( bool disposing ) Clear(); } -#endregion + #endregion } [SuppressMessage( "Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses" )] @@ -2464,7 +2461,7 @@ internal struct DWM_TIMING_INFO public ulong cBuffersEmpty; } -#endregion + #endregion /// Delegate declaration that matches native WndProc signatures. internal delegate IntPtr WndProc( IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam ); @@ -3460,7 +3457,7 @@ public static void UnregisterClass( string lpClassName, IntPtr hInstance ) } } -#region Win7 declarations + #region Win7 declarations [DllImport( "shell32.dll", EntryPoint = "SHAddToRecentDocs" )] private static extern void _SHAddToRecentDocs_String( SHARD uFlags, [MarshalAs( UnmanagedType.LPWStr )] string pv ); @@ -3548,6 +3545,6 @@ public static void SHAddToRecentDocs( IShellLinkW shellLink ) [DllImport( "shell32.dll" )] public static extern HRESULT GetCurrentProcessExplicitAppUserModelID( [Out, MarshalAs( UnmanagedType.LPWStr )] out string AppID ); -#endregion + #endregion } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs index 5d5449668..619ea1763 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs index 8af54c8f5..7e66dad74 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs index 3320fb695..0b023bc88 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -1007,7 +1007,7 @@ public static void RemoveDependencyPropertyChangeListener( object component, Dep dpd.RemoveValueChanged( component, listener ); } -#region Extension Methods + #region Extension Methods public static bool IsThicknessNonNegative( Thickness thickness ) { @@ -1069,6 +1069,6 @@ public static bool IsDoubleFiniteAndNonNegative( double d ) return true; } -#endregion + #endregion } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs index c56c0a6e5..6951ee7e2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs index d9fc08473..e41346b00 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,11 +18,11 @@ namespace Microsoft.Windows.Shell { + using Standard; using System; using System.Windows; using System.Windows.Input; using System.Windows.Interop; - using Standard; public static class SystemCommands { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs index 2f71ceaa7..f4fc1b739 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -21,6 +21,7 @@ namespace Microsoft.Windows.Shell { + using Standard; using System; using System.Collections.Generic; using System.ComponentModel; @@ -28,7 +29,6 @@ namespace Microsoft.Windows.Shell using System.Runtime.InteropServices; using System.Windows; using System.Windows.Media; - using Standard; [SuppressMessage( "Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable" )] public class SystemParameters2 : INotifyPropertyChanged diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs index b203b8ed0..7fc2973e0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -21,12 +21,12 @@ namespace Microsoft.Windows.Shell { + using Standard; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Windows; using System.Windows.Data; - using Standard; public class WindowChrome : Freezable { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs index d9c84fc15..fb2c2b16a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -21,18 +21,17 @@ namespace Microsoft.Windows.Shell { + using Standard; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Windows; + using System.Windows.Controls.Primitives; using System.Windows.Interop; using System.Windows.Media; using System.Windows.Threading; - using Standard; - using HANDLE_MESSAGE = System.Collections.Generic.KeyValuePair; - using System.Windows.Controls.Primitives; internal class WindowChromeWorker : DependencyObject { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs index b5e21d637..9af45ea12 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs index 514ad11d3..05bb640bf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs index 5641f8434..c62808c27 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs index 06a1a2b4a..cfaddf9d8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs index e6b0bfc67..8357ee1b3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs index c7a0c350e..8fd9ff0d8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs index 118229810..a8e160db3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System; -using System.Windows.Data; using System.Windows.Controls; +using System.Windows.Data; using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Converters diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuAutoHideHeaderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuAutoHideHeaderConverter.cs index 2139e8af8..e1cbdb8e2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuAutoHideHeaderConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuAutoHideHeaderConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System; -using System.Windows.Data; using System.Globalization; +using System.Windows.Data; using Xceed.Wpf.AvalonDock.Properties; namespace Xceed.Wpf.AvalonDock.Converters @@ -28,7 +28,7 @@ public object Convert( object value, Type targetType, object parameter, CultureI { var isAutoHidden = value as bool?; - return (isAutoHidden != null) && isAutoHidden.Value ? Resources.Window_Restore : Resources.Anchorable_AutoHide; + return ( isAutoHidden != null ) && isAutoHidden.Value ? Resources.Window_Restore : Resources.Anchorable_AutoHide; } public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs index 77f016cdd..4657aa327 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs index 478fb462a..a69614990 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,8 @@ using System; using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; using Xceed.Wpf.AvalonDock.Controls; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs index 333032135..ac167c203 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System; -using System.Windows.Data; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.AvalonDock.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs index 9d441690d..11917e5ae 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,8 @@ using System; using System.Windows.Data; -using Xceed.Wpf.AvalonDock.Layout; using Xceed.Wpf.AvalonDock.Controls; +using Xceed.Wpf.AvalonDock.Layout; namespace Xceed.Wpf.AvalonDock.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs index e629d9969..18fddab64 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System; -using System.Windows.Data; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.AvalonDock.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs index c601e2489..3dac29ce2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs index 6e3238837..7038baf6c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs index a4c6f7eb2..970369022 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,9 @@ ***********************************************************************************/ using System; +using System.Windows.Controls; using System.Windows.Data; using System.Windows.Media.Imaging; -using System.Windows.Controls; namespace Xceed.Wpf.AvalonDock.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs index ad37afa39..2b7f1ccff 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -34,7 +34,6 @@ using System.Diagnostics; using System.Windows.Media; using System.Windows.Controls.Primitives; -using System.Globalization; namespace Xceed.Wpf.AvalonDock { @@ -2348,8 +2347,10 @@ internal void _ExecuteCloseCommand( LayoutAnchorable anchorable ) var model = anchorable as LayoutAnchorable; if( model != null ) { - model.CloseAnchorable(); - this.RemoveViewFromLogicalChild( anchorable ); + if( model.CloseAnchorable() ) + { + this.RemoveViewFromLogicalChild( anchorable ); + } } } @@ -2499,7 +2500,14 @@ private void DockingManager_Unloaded( object sender, RoutedEventArgs e ) //fw.Owner = null; fw.SetParentWindowToNull(); fw.KeepContentVisibleOnClose = true; - fw.Close(); + + // Added Dispatcher to prevent InvalidOperationException issue in reference to bug case + // DevOps #2106 + Dispatcher.BeginInvoke( new Action( () => + { + fw.Close(); + } ), DispatcherPriority.Send ); + } _fwList.Clear(); @@ -3089,7 +3097,7 @@ private void CollectLayoutItemsDeleted() for( int i = 0; i < layoutItems.Count(); ++i ) { var itemToRemove = layoutItems[ i ]; - this.RemoveDocumentLayoutItem(itemToRemove.LayoutElement as LayoutDocument); + this.RemoveDocumentLayoutItem( itemToRemove.LayoutElement as LayoutDocument ); } } ) ); } @@ -3319,6 +3327,17 @@ private LayoutFloatingWindowControl CreateFloatingWindowCore( LayoutContent cont parentPane.RemoveChildAt( contentModelParentChildrenIndex ); + while( ( parentPane != null ) && ( parentPane.ChildrenCount == 0 ) ) + { + var grandParent = parentPane.Parent as ILayoutPane; + if( grandParent != null ) + { + grandParent.RemoveChild( parentPane ); + } + + parentPane = grandParent; + } + double fwWidth = contentModel.FloatingWidth; double fwHeight = contentModel.FloatingHeight; @@ -3355,11 +3374,14 @@ private LayoutFloatingWindowControl CreateFloatingWindowCore( LayoutContent cont Layout.FloatingWindows.Add( fw ); + // Must be done after Layout.FloatingWindows.Add( fw ) to be able to modify the values in _dockingManager.Layout.FloatingWindows.CollectionChanged. + var fwSize = this.UpdateFloatingDimensions( contentModel, new Size( fwWidth, fwHeight ) ); + fwc = new LayoutAnchorableFloatingWindowControl( fw as LayoutAnchorableFloatingWindow, isContentImmutable ) { - Width = fwWidth, - Height = fwHeight, + Width = fwSize.Width, + Height = fwSize.Height, Left = contentModel.FloatingLeft, Top = contentModel.FloatingTop }; @@ -3374,11 +3396,14 @@ private LayoutFloatingWindowControl CreateFloatingWindowCore( LayoutContent cont Layout.FloatingWindows.Add( fw ); + // Must be done after Layout.FloatingWindows.Add( fw ) to be able to modify the values in _dockingManager.Layout.FloatingWindows.CollectionChanged. + var fwSize = this.UpdateFloatingDimensions( contentModel, new Size( fwWidth, fwHeight ) ); + fwc = new LayoutDocumentFloatingWindowControl( fw as LayoutDocumentFloatingWindow, isContentImmutable ) { - Width = fwWidth, - Height = fwHeight, + Width = fwSize.Width, + Height = fwSize.Height, Left = contentModel.FloatingLeft, Top = contentModel.FloatingTop }; @@ -3401,6 +3426,16 @@ private LayoutFloatingWindowControl CreateFloatingWindowCore( LayoutContent cont return fwc; } + private Size UpdateFloatingDimensions( ILayoutElementForFloatingWindow contentModel, Size currentSize ) + { + if( contentModel.FloatingWidth != 0d ) + currentSize.Width = contentModel.FloatingWidth; + if( contentModel.FloatingHeight != 0d ) + currentSize.Height = contentModel.FloatingHeight; + + return currentSize; + } + private void UpdateStarSize( LayoutContent contentModel ) { if( contentModel == null ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs index 793f54bc4..ce89b550c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs index fd6321692..b05297ba9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs index 55a6cb97c..b743ffb8d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; using System.Collections; +using System.Collections.Generic; namespace Xceed.Wpf.AvalonDock { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs index 975668a43..bf8aa13ed 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs index 160a70cfd..a749cb4c7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs index 6d7f49599..5b3fd13ed 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs index 7128646a0..71c3d3ac0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -97,7 +97,7 @@ public static AnchorSide GetSide( this ILayoutElement element ) layoutPanel = parentContainer.FindParent(); } - if( (layoutPanel != null) && ( layoutPanel.Children.Count > 0 ) ) + if( ( layoutPanel != null ) && ( layoutPanel.Children.Count > 0 ) ) { var childrenCount = layoutPanel.Children.Count; var currentChildID = -1; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs index 13c31de07..a0d28c7e4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs index 53f7012ed..7852ed9f5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs index c9e752e52..828538247 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs index f644126d2..0fc2a5506 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs index cec68a20a..0e47ad13e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs index 77a96b656..2f16148fc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs index ab133fade..23f1ac7a6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs index 8173d31d7..ca52229f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutInitialContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutInitialContainer.cs index a2f7ea7bf..fe5507b8a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutInitialContainer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutInitialContainer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs index 7dad2b199..a999a67e1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs index 642196a41..e88d66a65 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs index df31a743d..47c78abd1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs index 91354d523..aa29335db 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs index b4c3f5a8d..ca0af3895 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs index a81cb47c1..4749c706f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs index ad44ad61d..5972a6516 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs index 72b97a6fa..695edfa36 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs index ae32ddb6b..93bb27eb5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs index 77effd68b..14f25b648 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs index a973717fa..eb6aed2b2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,12 +16,12 @@ ***********************************************************************************/ using System; +using System.ComponentModel; +using System.Globalization; using System.Linq; using System.Windows; -using System.Xml.Serialization; using System.Windows.Controls; -using System.Globalization; -using System.ComponentModel; +using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout { @@ -481,7 +481,7 @@ public void Show() } // When InitialContainer exists, set it to PreviousContainer in order to dock in expected position. - this.PreviousContainer = ( this.InitialContainer != null) ? this.InitialContainer : null; + this.PreviousContainer = ( this.InitialContainer != null ) ? this.InitialContainer : null; this.PreviousContainerIndex = ( this.InitialContainerIndex != -1 ) ? this.InitialContainerIndex : -1; this.InitialContainer = null; @@ -751,15 +751,18 @@ protected virtual void OnHidden() Hidden( this, EventArgs.Empty ); } - internal void CloseAnchorable() + internal bool CloseAnchorable() { - if( this.TestCanClose() ) + var canClose = this.TestCanClose(); + if( canClose ) { if( this.IsAutoHidden ) this.ToggleAutoHide(); this.CloseInternal(); } + + return canClose; } internal void SetCanCloseInternal( bool canClose ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs index 880d2b5fb..b4e0a41f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,11 +17,11 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Windows.Markup; -using System.Diagnostics; -using System.Xml.Serialization; using System.Xml; +using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs index ee0f44bc2..99845472c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs index d05ae91fb..11c858a23 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -95,11 +95,11 @@ protected override void OnDockHeightChanged() //protected override void OnChildrenCollectionChanged() //{ - //if( DockWidth.IsAbsolute && ChildrenCount == 1 ) - // ( (ILayoutPositionableElement)Children[ 0 ] ).DockWidth = DockWidth; - //if( DockHeight.IsAbsolute && ChildrenCount == 1 ) - // ( ( ILayoutPositionableElement )Children[ 0 ] ).DockHeight = DockHeight; - //base.OnChildrenCollectionChanged(); + //if( DockWidth.IsAbsolute && ChildrenCount == 1 ) + // ( (ILayoutPositionableElement)Children[ 0 ] ).DockWidth = DockWidth; + //if( DockHeight.IsAbsolute && ChildrenCount == 1 ) + // ( ( ILayoutPositionableElement )Children[ 0 ] ).DockHeight = DockHeight; + //base.OnChildrenCollectionChanged(); //} public override void WriteXml( System.Xml.XmlWriter writer ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs index 741abc981..6d13ad0ef 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,14 +16,13 @@ ***********************************************************************************/ using System; +using System.ComponentModel; +using System.Globalization; using System.Linq; -using System.Windows.Markup; -using System.Xml.Serialization; using System.Windows; -using System.Globalization; +using System.Windows.Markup; using System.Windows.Media; -using System.ComponentModel; -using Xceed.Wpf.AvalonDock.Controls; +using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout { @@ -43,7 +42,7 @@ internal LayoutContent() #region Title - public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( LayoutContent ), new UIPropertyMetadata( null, OnTitlePropertyChanged, CoerceTitleValue ) ); + public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( LayoutContent ), new UIPropertyMetadata( null, OnTitlePropertyChanged, CoerceTitleValue ) ); public string Title { @@ -114,7 +113,7 @@ public string ContentId { get { - return (string)GetValue( ContentIdProperty ); + return ( string )GetValue( ContentIdProperty ); } set { @@ -127,7 +126,7 @@ private static void OnContentIdPropertyChanged( DependencyObject obj, Dependency var layoutContent = obj as LayoutContent; if( layoutContent != null ) { - layoutContent.OnContentIdPropertyChanged( (string)args.OldValue, (string)args.NewValue ); + layoutContent.OnContentIdPropertyChanged( ( string )args.OldValue, ( string )args.NewValue ); } } @@ -897,9 +896,9 @@ public void DockAsDocument() if( this is LayoutAnchorable ) { - if( ( (LayoutAnchorable)this ).CanClose ) + if( ( ( LayoutAnchorable )this ).CanClose ) { - ( (LayoutAnchorable)this ).SetCanCloseInternal( true ); + ( ( LayoutAnchorable )this ).SetCanCloseInternal( true ); } } @@ -958,13 +957,14 @@ public void Dock() IsSelected = true; IsActive = true; - IsFloating = false; } else { InternalDock(); } + IsFloating = false; + if( this.Root != null ) { Root.CollectGarbage(); @@ -1043,6 +1043,6 @@ protected virtual void InternalDock() public event EventHandler Closing; -#endregion + #endregion } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs index 63f2daed3..cfebd727c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ***********************************************************************************/ using System; -using System.Globalization; using System.Linq; namespace Xceed.Wpf.AvalonDock.Layout diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs index 82d51772e..a2225d798 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,10 +17,10 @@ using System; using System.Collections.Generic; -using System.Windows.Markup; using System.Diagnostics; -using System.Xml.Serialization; +using System.Windows.Markup; using System.Xml; +using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs index 90f855363..0bff878c7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs index 51ff4bcff..555075c34 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs index 5fafdd473..05c061df3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System; -using System.Windows; using System.ComponentModel; +using System.Windows; using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs index b3d1cef86..80b52fb45 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs index 2be7529c3..86e3a38ee 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,9 +17,9 @@ using System; using System.Collections.Generic; -using System.Xml.Serialization; -using System.Xml.Schema; using System.Xml; +using System.Xml.Schema; +using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs index ceeae0974..5f44f0042 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,8 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; +using System.Linq; using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout @@ -149,7 +149,7 @@ public void ReplaceChild( ILayoutElement oldElement, ILayoutElement newElement ) public void ReplaceChildAt( int index, ILayoutElement element ) { - if( (index >= 0) && (index < _children.Count) ) + if( ( index >= 0 ) && ( index < _children.Count ) ) { _children[ index ] = ( T )element; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs index cc4156e63..65bce1964 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs index d6dba4d4f..766f2eddc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,8 @@ using System; using System.Linq; -using System.Windows.Markup; using System.Windows.Controls; +using System.Windows.Markup; namespace Xceed.Wpf.AvalonDock.Layout { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs index 609e84781..13d112bfb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,8 @@ ***********************************************************************************/ using System; -using System.Windows; using System.Globalization; +using System.Windows; namespace Xceed.Wpf.AvalonDock.Layout { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs index 1c3c7ff4f..70449988d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,16 +17,13 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; using System.Collections.ObjectModel; +using System.Linq; +using System.Windows.Controls; using System.Windows.Markup; -using System.Xml.Serialization; -using Standard; using System.Xml; using System.Xml.Schema; -using System.Windows.Controls; +using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout { @@ -473,7 +470,7 @@ public void CollectGarbage() } //...if this empty panes is not referenced by anyone, than removes it from its parent container - if( !this.Descendents().OfType().Any( c => c.PreviousContainer == emptyPane ) + if( !this.Descendents().OfType().Any( c => c.PreviousContainer == emptyPane ) && !this.Descendents().OfType().Any( c => c.InitialContainer == emptyPane ) ) { var parentGroup = emptyPane.Parent as ILayoutContainer; @@ -940,7 +937,7 @@ private List ReadRootPanel( XmlReader reader, out Orientati if( reader.LocalName.Equals( "RootPanel" ) ) { - orientation = (reader.GetAttribute( "Orientation" ) == "Vertical") ? Orientation.Vertical : Orientation.Horizontal; + orientation = ( reader.GetAttribute( "Orientation" ) == "Vertical" ) ? Orientation.Vertical : Orientation.Horizontal; reader.Read(); while( true ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs index e3dcfc206..40233fe80 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs index da0f7b00d..242de2a06 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs index da110fe42..0328dc181 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,8 @@ ***********************************************************************************/ -using System.Xml.Serialization; using System.IO; +using System.Xml.Serialization; namespace Xceed.Wpf.AvalonDock.Layout.Serialization { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs index 76693d1c2..c0cc1b546 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs index b63755a5c..166747b02 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs index 369fb9650..fddba0e8a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -72,7 +72,11 @@ #pragma warning disable 1699 [assembly: AssemblyDelaySign( false )] +#if NETCORE || NET5 +[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )] +#else [assembly: AssemblyKeyFile( @"..\..\sn.snk" )] +#endif [assembly: AssemblyKeyName( "" )] #pragma warning restore 1699 diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs index 128084eed..2eea1533a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ja-JP.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ja-JP.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ja-JP.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ja-JP.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.Designer.cs new file mode 100644 index 000000000..a0c04405d --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.Designer.cs @@ -0,0 +1,17 @@ +/************************************************************************************* + + Toolkit for WPF + + Copyright (C) 2007-2022 Xceed Software Inc. + + This program is provided to you under the terms of the XCEED SOFTWARE, INC. + COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at + https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md + + For more features, controls, and fast professional support, + pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/ + + Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids + + ***********************************************************************************/ + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx new file mode 100644 index 000000000..76acb0b6f --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Automatisch Verbergen + + + Automatisch Verbergen + + + Verstop Alles + + + Venster Positie + + + Anker + + + Dock Als Documenttabblad + + + Drijvend + + + Verstoppen + + + Ankeren / Losmaken + + + Sluiten + + + Sluit Alles + + + Sluit Alles Behalve Dit + + + Venster Positie + + + Tabblad Dock Als Document + + + Drijvend + + + Naar De Volgende Groep Tabbladen Gaan + + + Verplaatsen Naar Vorige Tabbladgroep + + + Nieuwe Horizontale Tabbladgroep + + + Nieuwe Verticale Tabbladgroep + + + Volledig Scherm + + + Herstellen + + \ No newline at end of file diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs index 6a519dc11..a0c04405d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Default.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Default.xaml index 313c181fc..8de02e259 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Default.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Default.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -1249,14 +1249,8 @@ Value="WidthAndHeight" /> - - - - - + @@ -1311,7 +1305,7 @@ - @@ -1364,7 +1358,7 @@ - diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs index c02a357a6..474b767da 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs index af2a9e84f..c251c40df 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -24,7 +24,13 @@ public class GenericTheme : Theme public override Uri GetResourceUri() { string uri; +#if NETCORE + uri = "Xceed.Wpf.AvalonDock.NETCore"; +#elif NET5 + uri = "Xceed.Wpf.AvalonDock.NET5"; +#else uri = "Xceed.Wpf.AvalonDock"; +#endif return new Uri( "/" + uri + ";component/Themes/generic.xaml", UriKind.Relative ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs index 12fce8ab7..4ee5d9400 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml index 7804e2afb..f5b899458 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs index 93389b9b4..e5f695cb9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs index 90c4958b7..6705fe973 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,9 @@ ***********************************************************************************/ using System; -using System.Windows.Media; using System.Windows; using System.Windows.Interop; +using System.Windows.Media; namespace Xceed.Wpf.AvalonDock { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj new file mode 100644 index 000000000..49de2dcc8 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj @@ -0,0 +1,365 @@ + + + + obj\net5\ + false + + + + net5.0-windows + Xceed.Wpf.AvalonDock + Xceed.Wpf.AvalonDock.NET5 + false + true + + + TRACE;DEBUG;NET5 + full + True + + + TRACE;NET5 + none + False + + + + AssemblyVersionInfo.cs + + + AssemblyVersionInfoCommon.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + Resources.ja-JP.resx + True + True + + + Resources.cs-CZ.resx + True + True + + + True + True + Resources.de.resx + + + True + True + Resources.resx + + + True + True + Resources.es.resx + + + True + True + Resources.fr.resx + + + True + True + Resources.hu.resx + + + True + True + Resources.it.resx + + + True + True + Resources.pt-BR.resx + + + True + True + Resources.ro.resx + + + True + True + Resources.ru.resx + + + True + True + Resources.sv.resx + + + True + True + Resources.zh-Hans.resx + + + + + + Utils\Exceptions\ThrowException.cs + + + + + PublicResXFileCodeGenerator + Resources.ja-JP.Designer.cs + Designer + + + PublicResXFileCodeGenerator + Resources.cs-CZ.Designer.cs + Designer + + + PublicResXFileCodeGenerator + Resources.hu.Designer.cs + Designer + + + PublicResXFileCodeGenerator + Resources.Designer.cs + Designer + + + PublicResXFileCodeGenerator + Resources.it.Designer.cs + Designer + + + PublicResXFileCodeGenerator + Resources.fr.Designer.cs + Designer + + + PublicResXFileCodeGenerator + Resources.es.Designer.cs + + + Designer + PublicResXFileCodeGenerator + Resources.pt-BR.Designer.cs + + + Designer + PublicResXFileCodeGenerator + Resources.ru.Designer.cs + + + Designer + PublicResXFileCodeGenerator + Resources.de.Designer.cs + + + Designer + PublicResXFileCodeGenerator + Resources.sv.Designer.cs + + + Designer + PublicResXFileCodeGenerator + Resources.zh-Hans.Designer.cs + + + PublicResXFileCodeGenerator + Resources.ro.Designer.cs + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj index ff574bf83..ad90d3328 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj @@ -246,6 +246,11 @@ True Resources.it.resx + + True + True + Resources.nl-BE.resx + True True @@ -294,6 +299,10 @@ Resources.hu.Designer.cs Designer + + PublicResXFileCodeGenerator + Resources.nl-BE.Designer.cs + PublicResXFileCodeGenerator Resources.Designer.cs diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml index 1ff8b9cc3..6790bc50d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs index b01a85628..19fbc3a64 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; using System.Windows; namespace Xceed.Wpf.Toolkit.LiveExplorer diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs index 572e5fcac..25595c999 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -20,7 +20,6 @@ using System.Windows; using System.Windows.Media; using System.Windows.Resources; -using Xceed.Wpf.Toolkit.LiveExplorer.Core; namespace Xceed.Wpf.Toolkit.LiveExplorer { @@ -62,11 +61,17 @@ private string GetDataFromResource( string uriString ) public class XamlBox : CodeBox { - public XamlBox() { this.TextFormatter = new Core.XamlFormatter(); } + public XamlBox() + { + this.TextFormatter = new Core.XamlFormatter(); + } } public class CSharpBox : CodeBox { - public CSharpBox() { this.TextFormatter = new Core.CSharpFormatter(); } + public CSharpBox() + { + this.TextFormatter = new Core.CSharpFormatter(); + } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt index 4e0aa0c4a..3f81fdddd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt index c544a40e3..7443dd274 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.cs.txt index 7c736fd7c..8a10b2a08 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.txt index 862f5841d..8dafee6d9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.cs.txt index ebe6e4338..f248e64cd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.txt index 6b82d0ca0..e6587e1e5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt index da375176c..da24fa46e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,9 @@ ************************************************************************************/ +using System.IO; using System.Windows; using Xceed.Wpf.AvalonDock.Layout.Serialization; -using System.IO; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt index 62367e188..842d24a60 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt index 47fa3623e..87ad8f734 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt index 448f12037..a69553bfa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt index 62f53c891..e8dee1f04 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt index 4addac8fa..f4ec69a68 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt index 5c7f182a0..92217edde 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -20,7 +20,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views /// /// Interaction logic for BusyIndicatorView.xaml /// - public partial class BusyIndicatorView: DemoView + public partial class BusyIndicatorView : DemoView { public BusyIndicatorView() { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt index cab14c130..a8360590f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt index a6df36588..55aeee37f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,7 +17,6 @@ using System; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views { @@ -33,7 +32,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views private void ButtonSpinner_Spin( object sender, SpinEventArgs e ) { - String[] names = (String[])this.Resources[ "names" ]; + String[] names = ( String[] )this.Resources[ "names" ]; ButtonSpinner spinner = ( ButtonSpinner )sender; TextBox txtBox = ( TextBox )spinner.Content; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt index 39df43890..5abd12e96 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt index fd61804d9..161fa9233 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt index a660323bb..ec9bb2120 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt index a81861c47..79f0ad6f4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,7 @@ ************************************************************************************/ -using System.Windows.Media; using System.Windows.Controls; -using System; -using System.Diagnostics; using System.Windows; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views { @@ -51,9 +48,12 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views + + #region Implementation #endregion + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt index 0c42b972f..3d2149099 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt index 6518b6525..38ecbafa3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,6 @@ **************************************************************************************/ -using System.Windows.Media; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt index 55ae2f556..79dd07a23 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt index 7c9bc0a86..6842dc011 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,9 +17,6 @@ using System.Windows.Media; using System.Windows; -using Xceed.Wpf.Toolkit.Panels; -using System; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt index 08308b989..aa2ce4aef 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt index 722cf8304..fe170bada 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ ************************************************************************************/ -using System.Windows.Media; -using System; -using System.Collections.ObjectModel; -using System.Collections.Generic; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt index 5b20a7896..ab366150a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt index be607a637..e0ac38e13 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ ************************************************************************************/ -using System.Windows.Media; -using System.Windows.Controls; -using System; -using System.Windows; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt index 30fe5437a..964875d58 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt index 5811dd255..4131e26d1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ *************************************************************************************/ -using System.Windows.Media; -using System.Windows.Controls; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt index 680a88cbc..5f3ec26ab 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt index d40e21352..921fb3b4b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,8 @@ *************************************************************************************/ -using System.Windows.Media; -using System.Windows.Controls; using System.Windows; using System; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt index 348429339..bb74e1646 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt index e11f83320..cc1d309e0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,6 @@ *************************************************************************************/ -using System.Windows.Media; -using System.Windows.Controls; -using System; -using System.Windows.Media.Imaging; -using System.Windows; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt index 028908dd1..3839e1a8c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt index 7536f13c3..632439557 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ *************************************************************************************/ using System.Collections.Generic; -using System.Collections.ObjectModel; using System.ComponentModel; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views @@ -108,7 +107,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views { get { - string completeName = string.Format("{0} {1}", FirstName, LastName).PadRight(20); + string completeName = string.Format( "{0} {1}", FirstName, LastName ).PadRight( 20 ); return string.Format( "ID={0}: Name= {1}, IsSelected= {2}", ID, diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt index 418688e24..035c0de1d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt index 004d3caf0..248baf3f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ *************************************************************************************/ -using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System.Diagnostics; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt index e49be00e8..4edb90b74 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt index 105a0b6ce..e2f915a88 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ ***********************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Color.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt index f1bbf7ee0..793d6e3fe 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt index 11e347782..ea8736f6d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt index 838c97825..4fbdb11dd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt index 1bf2ddfeb..dd0df0446 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -24,7 +24,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views { public DateTimeView() { - InitializeComponent(); + InitializeComponent(); } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt index 0db5e030a..eb8dc98a1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,191 +16,433 @@ ***********************************************************************************--> - - - The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" + xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer" + xmlns:sys="clr-namespace:System;assembly=mscorlib" + xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters" + Title="DateTime"> + + + The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt index 4eab1944d..87f6aa7c4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt index 69887d7e6..2e364859d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.cs.txt index 159d39f04..1fa36388e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -38,5 +38,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ExtendedTabControl.Views - } } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.txt index 82ed38929..0efc30d12 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -22,10 +22,10 @@ xmlns:sys="clr-namespace:System;assembly=mscorlib" Title="ExtendedTabControl"> - - - The ExtendedTabControl is a TabControl that offers a different navigation style. Instead of displaying the tabs on multiple lines when there are too many to fit in the view, the ExtendedTabContol offers the ability for the user to navigate left/right, and/or use a drop down list. + + + The ExtendedTabControl is a TabControl that offers a different navigation style. Instead of displaying the tabs on multiple lines when there are too many to fit in the view, the ExtendedTabContol offers the ability for the user to navigate left/right, and/or use a drop down list. This feature is only available in the "Plus" version. @@ -34,7 +34,9 @@ Click here for more details about Xceed Toolkit Plus for WPF. - + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt index de0fd61b4..db34ca51e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,7 @@ ************************************************************************************/ -using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.Windows; -using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt index 0b564ae2e..bde179ef8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt index 3615e0511..56b2c82ec 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt index 4d7b69872..6aa668ae8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt index 7b8591df2..91d73b7f6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,8 @@ ************************************************************************************/ -using System; -using System.IO; -using System.Windows; -using System.Windows.Resources; -using Xceed.Wpf.Samples.SampleData; using System.ComponentModel; +using Xceed.Wpf.Samples.SampleData; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt index c3999de20..983f9d75d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt index 258620994..1d9ab48ba 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -33,7 +33,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Views // Load and display the RTF file. Uri uri = new Uri( "pack://application:,,,/" + - "Xceed.Wpf.Toolkit.LiveExplorer" + +#if NETCORE + "Xceed.Wpf.Toolkit.LiveExplorer.NETCore" +#elif NET5 + "Xceed.Wpf.Toolkit.LiveExplorer.NET5" +#else + "Xceed.Wpf.Toolkit.LiveExplorer" +#endif + + ";component/Samples/Magnifier/Resources/SampleText.rtf" ); StreamResourceInfo info = Application.GetResourceStream( uri ); using( StreamReader txtReader = new StreamReader( info.Stream ) ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt index fffb13d29..1608c3bb1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt index baa7a3b82..f8f20deeb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt index 6810507d9..2de3941ea 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt index f01543b9a..b10ec52bd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ **************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Windows; using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt index 566baccb8..87c9ed34b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt index 542a2d662..fda03bec7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt index 4061627a8..a2b950793 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt index e0f571b4b..9f08f6847 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt index 6b05ee3a4..6b6f551f9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt index b7263effd..2cb25c2b0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt index 0b355db57..f542069de 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt index c25d147aa..9938c9e1c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Media; namespace Xceed.Wpf.Toolkit.LiveExplorer diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt index fb17a2be0..d713e355f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt index b860e0456..79639dd11 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt index e8c20bd80..0581e5164 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt index b8fd55740..7019d573a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt index b19bf711b..9f6288e51 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt index 769b1dbf8..44a723225 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt index 7747a90cd..a94f20102 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt index dc0f989a7..d0c975468 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt index 087292d18..9cb3101df 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ **************************************************************************************/ -using System; -using System.Collections.Generic; using System.Windows; -using System.Windows.Controls; using System.Windows.Media.Animation; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt index b09c8355b..77c2a8819 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt index df9e81520..4178d498d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ **************************************************************************************/ -using System; -using System.Collections.Generic; using System.Windows; -using System.Windows.Controls; using System.Windows.Media.Animation; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt index c7e1fe915..d7fc7fdc7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt index 548bfc7bc..d983f7c67 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt index be2b59985..8d2a77d3f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt index 7b577a81c..e37bd6f57 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,14 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using Xceed.Wpf.Toolkit.Panels; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt index d2f8e3161..9b3b14d46 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt index 3464e945e..a405f5511 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt index dfc8b1a5a..6f4c46dec 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt index 57c26a725..2e4b3b4bb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt index b3d356f54..2b95642f9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt index e5cb2d789..c3e6ccb7e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt index ba95e5a7c..895f4f04b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt index b06f5c72e..d9ab291c3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt index 7d5ff8dc1..12f4146f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt index e7f113567..d83b27f76 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt index 4f4a54e79..8aaa6e54c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt index 9816a35fc..1e05665cc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,10 @@ ***********************************************************************************/ -using System.Windows.Controls; using System; -using System.Windows.Media; using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views { @@ -43,5 +43,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views - } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt index af4361cc0..94b96691e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt index 883a275a0..5f5e3103c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,6 @@ *************************************************************************************/ -using System.Data; -using System.Diagnostics; using System.Windows.Controls; using System.Windows.Data; using Xceed.Wpf.Samples.SampleData; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt index e3de1ca48..eea49bb46 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt index 907488892..223ec24f5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt index 518398ec9..483b245e4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt index 7cf2ab991..5b72a51fe 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,7 +17,6 @@ using System.Collections.Generic; using System.Globalization; -using System; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt index 6c576e2c9..a11713e5b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt index ff36906bc..c0ee5ae8e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ ************************************************************************************/ -using System.Windows.Data; -using Xceed.Wpf.Toolkit.LiveExplorer; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views { /// @@ -29,5 +26,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views { InitializeComponent(); } - } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt index dd23dc497..a952ec92f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt index 6c041310c..b3c2ec22c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,6 @@ ************************************************************************************/ -using System.Windows.Data; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt index 03492d51b..c210046e5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt index f09328af2..79c018795 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,14 +15,7 @@ **************************************************************************************/ -using System.Windows.Data; -using System.Windows.Media; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reflection; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt index 8df6b348e..b6ceb68a8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt index 5e2be3719..6b221b734 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,17 +15,14 @@ *************************************************************************************/ -using System.Windows.Media; -using System.Windows.Controls; using System; -using System.Diagnostics; -using System.Windows; -using Xceed.Wpf.Toolkit; +using System.Collections.ObjectModel; using System.IO; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; using System.Windows.Media.Imaging; using Xceed.Wpf.Samples.SampleData; -using System.Collections.ObjectModel; -using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt index 6fdc00e47..376dc0703 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAdvancedContextMenuView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAdvancedContextMenuView.xaml.cs.txt index 391d6e3a0..7969e2d31 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAdvancedContextMenuView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAdvancedContextMenuView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,21 +15,9 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; using Xceed.Wpf.Toolkit.PropertyGrid; -using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt index a5e85d933..d43fc71f7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,7 +15,6 @@ *************************************************************************************/ -using System; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; @@ -53,7 +52,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views } } - [CategoryOrder("Information", 0)] + [CategoryOrder( "Information", 0 )] [CategoryOrder( "Conections", 1 )] [CategoryOrder( "Other", 2 )] public abstract class Person : INotifyPropertyChanged @@ -64,60 +63,95 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views [Category( "Information" )] [Description( "This property uses the [DisplayName(\"Is a Men\")] attribute to customize the name of this property." )] [DisplayName( "Is male" )] - public bool IsMale { get; set; } + public bool IsMale + { + get; set; + } [Category( "Information" )] [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class. In the Plus version, it also depends on the IsMale property to change its foreground and source." )] [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )] public string FirstName { - get{ return _firstName; } - set{ _firstName = value; OnPropertyChanged( "FirstName" );} + get + { + return _firstName; + } + set + { + _firstName = value; + OnPropertyChanged( "FirstName" ); + } } private string _firstName; [Category( "Information" )] [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'LastNameUserControlEditor' user control." )] [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )] - [DefaultValue("Friend")] + [DefaultValue( "Friend" )] public string LastName { - get{ return _lastName; } - set{ _lastName = value; OnPropertyChanged( "LastName" );} + get + { + return _lastName; + } + set + { + _lastName = value; + OnPropertyChanged( "LastName" ); + } } private string _lastName; [Category( "Conections" )] [Description( "This property uses the [NewItemTypes(...)] attribute to provide the underlying CollectionEditor with class types (eg. Man, Woman) that can be inserted in the collection." )] [NewItemTypes( typeof( Man ), typeof( Woman ) )] - public List Friends { get; set; } + public List Friends + { + get; set; + } [Category( "Information" )] [DisplayName( "Writing Font Size" )] [Description( "This property defines the [ItemsSource(..)] attribute that allows you to specify a ComboBox editor and control its items." )] [ItemsSource( typeof( FontSizeItemsSource ) )] [RefreshProperties( RefreshProperties.All )] //This will reload the PropertyGrid - public double WritingFontSize { get; set; } + public double WritingFontSize + { + get; set; + } [Category( "Conections" )] [Description( "This property defines the [ExpandableObject()] attribute. This allows you to expand this property and drill down through its values." )] [ExpandableObject()] - public Person Spouse { get; set; } + public Person Spouse + { + get; set; + } [Category( "Other" )] [Description( "This property uses the [PropertyOrder(1)] attribute to control its position in the categorized and non-categorized views. Otherwise, alphabetical order is used." )] [PropertyOrder( 1 )] - public string A_SecondProperty { get; set; } + public string A_SecondProperty + { + get; set; + } [Category( "Other" )] [Description( "This property uses the [PropertyOrder(0)] attribute to control its position in the categorized and non-categorized view. Otherwise, alphabetical order is used." )] [PropertyOrder( 0 )] - public string B_FirstProperty { get; set; } + public string B_FirstProperty + { + get; set; + } [Category( "Other" )] [Description( "This property uses the [ParenthesizePropertyName()] attribute to force the name to be displayed within round brackets." )] - [ParenthesizePropertyNameAttribute(true)] - public string NameInParentheses { get; set; } + [ParenthesizePropertyNameAttribute( true )] + public string NameInParentheses + { + get; set; + } [Category( "Other" )] [Description( "This property uses the [Browsable(false)] attribute to not display the property" )] @@ -128,9 +162,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views set; } - [Range(0d, 10d)] + [Range( 0d, 10d )] [Category( "Other" )] - [DefaultValue(5d)] + [DefaultValue( 5d )] [Description( "This property uses the [Range(0,10)] and DefaultValue attributes to set the Minimum, Maximum and default properties." )] public double RangeDouble { @@ -166,15 +200,27 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views , GroupName = "Information" , AutoGenerateField = true , AutoGenerateFilter = false )] - public string FavoriteSport { get; set; } - public Man() { this.IsMale = true; } + public string FavoriteSport + { + get; set; + } + public Man() + { + this.IsMale = true; + } } public class Woman : Person { [Category( "Information" )] [Description( "This property has no special attribute besides [Categroy(\"Information\")] and [Description(...)]" )] - public string FavoriteRestaurant { get; set; } - public Woman() { this.IsMale = false; } + public string FavoriteRestaurant + { + get; set; + } + public Woman() + { + this.IsMale = false; + } } // This is the custom editor referenced by the "EditorAttribute" diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt index 903eac74e..adfaa68e9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt index 63ccdb011..46aca0d5f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,7 @@ ************************************************************************************/ -using System; using System.ComponentModel; -using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt index 31305ffb7..93af39e66 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt index c51fee6eb..2b34ff749 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,13 +15,8 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Windows; -using System.Windows.Media; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { @@ -40,35 +35,63 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views [CategoryOrder( "Information", 1 )] [CategoryOrder( "Hobbies", 2 )] [CategoryOrder( "Connections", 3 )] - public class PersonOrdered : PersonBase { } + public class PersonOrdered : PersonBase + { + } - public class PersonNonOrdered : PersonBase { } + public class PersonNonOrdered : PersonBase + { + } public abstract class PersonBase { [Category( "Information" )] - public string FirstName { get; set; } + public string FirstName + { + get; set; + } [Category( "Information" )] - public string LastName { get; set; } + public string LastName + { + get; set; + } [Category( "Hobbies" )] - public bool Baseball { get; set; } + public bool Baseball + { + get; set; + } [Category( "Hobbies" )] - public bool Football { get; set; } + public bool Football + { + get; set; + } [Category( "Hobbies" )] - public bool Basketball { get; set; } + public bool Basketball + { + get; set; + } [Category( "Connections" )] - public string Father { get; set; } + public string Father + { + get; set; + } [Category( "Connections" )] - public string Mother { get; set; } + public string Mother + { + get; set; + } [Category( "Connections" )] - public bool HasChildren { get; set; } + public bool HasChildren + { + get; set; + } public static PersonBase InitPerson( PersonBase person ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt index 8d999818a..3eb017695 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt index d9a8a0955..7d8f62d6b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,15 +15,10 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; using System.Windows.Media; -using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { @@ -121,7 +116,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views } [Category( "Information" )] - [Browsable(false)] + [Browsable( false )] [Description( "This property is not displayed in the PropertyGrid, but its used as the selectedItem of the ComboBox for the 'Friends' property Editor." )] public Friend BestFriend { @@ -151,7 +146,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { get; set; - } + } } public class Friend diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt index 9b45018f2..bc1436afb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt index 312254281..0279b2570 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,14 +15,6 @@ ************************************************************************************/ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Windows; -using System.Windows.Media; -using System.Linq; -using System.Collections.ObjectModel; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt index 5ea650f7b..2aef7fc6e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt index f43e281f8..bfad53bff 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ************************************************************************************/ using System; -using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; @@ -41,7 +40,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views selectedObject.Color = Colors.Blue; selectedObject.DateTime = System.DateTime.Now; selectedObject.Decimal = ( decimal )2; - selectedObject.Double = (double)3; + selectedObject.Double = ( double )3; selectedObject.Enum = HorizontalAlignment.Center; selectedObject.FontFamily = new FontFamily( "Arial" ); selectedObject.FontStretch = FontStretches.Normal; @@ -51,21 +50,21 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views selectedObject.Char = 'T'; selectedObject.Password = "This is my password"; selectedObject.Int16 = ( short )4; - selectedObject.Int32 = (int)5; - selectedObject.Int64 = (long)6; + selectedObject.Int32 = ( int )5; + selectedObject.Int64 = ( long )6; selectedObject.ListOfInt32 = new List() { 1, 2, 3 }; selectedObject.ListOfPerson = new List() { new Person() { Name = "John Smith" }, new Person() { Name = "Robert King" } }; selectedObject.ListOfStrings = new List() { "string1", "string2", "string3" }; selectedObject.Dictionary = new Dictionary() { { 22, System.Windows.Media.Color.FromRgb( 255, 0, 0 ) }, { 33, System.Windows.Media.Color.FromRgb( 0, 255, 0 ) } }; selectedObject.CollectionOfPerson = new Collection() { new Person() { Name = "Tom McNeil" }, new Person() { Name = "Mike Campbell" } }; selectedObject.Person = new Person() { Name = "John Smith" }; - selectedObject.SByte = (sbyte) 7; - selectedObject.Single = (float)8; + selectedObject.SByte = ( sbyte )7; + selectedObject.Single = ( float )8; selectedObject.String = "this is a string"; - selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 ); - selectedObject.UInt16 = (ushort)9; - selectedObject.UInt32 = (uint)10; - selectedObject.UInt64 = (ulong)11; + selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 ); + selectedObject.UInt16 = ( ushort )9; + selectedObject.UInt32 = ( uint )10; + selectedObject.UInt64 = ( ulong )11; this.DataContext = selectedObject; } @@ -74,25 +73,46 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { [Category( "Non-Numeric Editors" )] [Description( "(C# string type) This property uses a TextBox as the default editor." )] - public string String { get; set; } + public string String + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# bool type) This property uses a CheckBox as the default editor." )] - public bool Boolean { get; set; } + public bool Boolean + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# int type) This property uses an IntegerUpDown as the default editor." )] - public int Int32 { get; set; } + public int Int32 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# double type) This property uses a DoubleUpDown as the default editor." )] - public double Double { get; set; } + public double Double + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# short type) This property uses a ShortUpDown as the default editor." )] - public short Int16 { get; set; } + public short Int16 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# long type) This property uses a LongUpDown as the default editor." )] - public long Int64 { get; set; } + public long Int64 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# float type) This property uses a SingleUpDown as the default editor." )] - public float Single { get; set; } + public float Single + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# decimal type) This property uses a Decimal as the default editor." )] public decimal Decimal @@ -102,64 +122,124 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views } [Category( "Numeric Editors" )] [Description( "(C# byte type) This property uses a ByteUpDown as the default editor." )] - public byte Byte { get; set; } + public byte Byte + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# sbyte type) This property uses a SByteUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )] - public sbyte SByte { get; set; } + public sbyte SByte + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# uint type) This property uses a UInteger as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )] - public uint UInt32 { get; set; } + public uint UInt32 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# ulong type) This property uses a ULongUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )] - public ulong UInt64 { get; set; } + public ulong UInt64 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# ushort type) This property uses a UShortUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )] - public ushort UInt16 { get; set; } + public ushort UInt16 + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a DateTimeUpDown as the default editor." )] - public System.DateTime DateTime { get; set; } + public System.DateTime DateTime + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a TimeSpanUpDown as the default editor." )] - public System.TimeSpan TimeSpan { get; set; } + public System.TimeSpan TimeSpan + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ColorPicker as the default editor." )] - public System.Windows.Media.Color? Color { get; set; } + public System.Windows.Media.Color? Color + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# enum type) This property uses a ComboBox as the default editor. The ComboBox is auto-populated with the enum values." )] - public HorizontalAlignment Enum { get; set; } + public HorizontalAlignment Enum + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ComboBox as the default editor." )] - public FontFamily FontFamily { get; set; } + public FontFamily FontFamily + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ComboBox as the default editor." )] - public FontWeight FontWeight { get; set; } + public FontWeight FontWeight + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ComboBox as the default editor." )] - public FontStyle FontStyle { get; set; } + public FontStyle FontStyle + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ComboBox as the default editor." )] - public FontStretch FontStretch { get; set; } + public FontStretch FontStretch + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a Guid as the default editor." )] - public Guid Guid { get; set; } + public Guid Guid + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a Char as the default editor." )] - public Char Char { get; set; } + public Char Char + { + get; set; + } [Category( "Non-Numeric Editors" )] - [PasswordPropertyText(true)] - public string Password { get; set; } + [PasswordPropertyText( true )] + public string Password + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )] - public List ListOfStrings { get; set; } + public List ListOfStrings + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )] - public List ListOfInt32 { get; set; } + public List ListOfInt32 + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# IList type) This property uses a CollectionEditor as the default editor." )] - public List ListOfPerson { get; set; } + public List ListOfPerson + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# IDictionary type) This property uses a CollectionEditor as the default editor." )] - public Dictionary Dictionary { get; set; } + public Dictionary Dictionary + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# ICollection type) This property uses a CollectionEditor as the default editor." )] public Collection CollectionOfPerson @@ -168,12 +248,18 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views } [Category( "Non-Numeric Editors" )] [Description( "This property is a complex property and has no default editor." )] - public Person Person { get; set; } + public Person Person + { + get; set; + } } public class Person { - public string Name { get; set; } + public string Name + { + get; set; + } } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt index a3fcdfccd..8b0aafe39 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt index 37d2aa84e..00fe83303 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,7 @@ *************************************************************************************/ -using System; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; -using Xceed.Wpf.Toolkit.PropertyGrid; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt index d270544f8..b4655a28b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt index ab636d35f..485816f5c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,18 +15,11 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Windows; -using System.Windows.Media; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; using Xceed.Wpf.Toolkit.Core; using System.Windows.Controls; using System.Globalization; -using System.Threading; -using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt index 898aed3f6..beb1b2b59 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt index d51850362..c6929d86b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,20 +15,8 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt index 6a8a7e9db..53246df5e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt index 8cb06e2b0..8030ad9bc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,7 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.ComponentModel; using System.IO; -using System.Windows; using System.Windows.Media; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt index 78eb8dc98..aebc4396b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt index be70ae8ce..13d8a7c8d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt index f71b6b24e..60503663a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt index 04fe90bdd..30db9605c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,20 +15,7 @@ *************************************************************************************/ -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt index a0e529025..73cd4209b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt index 2a9b711a0..9bf0e254a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,13 +15,11 @@ *************************************************************************************/ -using System; using System.Collections.Generic; -using System.ComponentModel; +using System.Collections.ObjectModel; +using System.Linq; using System.Windows; using System.Windows.Media; -using System.Linq; -using System.Collections.ObjectModel; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt index 9796c6896..28d6c541b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt index 3b3e67bc1..47a4bbaa9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,14 +15,6 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Windows; -using System.Windows.Media; -using System.Linq; -using System.Collections.ObjectModel; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt index 283305a8b..1ed17f250 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt index ecba244a6..6b760fdbe 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,8 @@ ************************************************************************************/ -using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; using Xceed.Wpf.Toolkit.PropertyGrid; +using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { @@ -39,7 +39,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { var propertyItem = e.PropertyItem as PropertyItem; // Parent of top-level properties is the PropertyGrid itself. - bool isTopLevelProperty = + bool isTopLevelProperty = ( propertyItem.ParentElement is Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid ); if( isTopLevelProperty && propertyItem.PropertyDescriptor.Name == "Friend" ) @@ -50,10 +50,19 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views private class Person { - public string FirstName { get; set; } - public string LastName { get; set; } + public string FirstName + { + get; set; + } + public string LastName + { + get; set; + } [ExpandableObject()] - public Person Friend { get; set; } + public Person Friend + { + get; set; + } } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt index ba1fb271c..8fb2e83d1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -23,30 +23,30 @@ xmlns:s="clr-namespace:System;assembly=mscorlib" VerticalScrollBarVisibility="Disabled" Title="Customizing PropertyItems display"> - - - This sample demonstrates the usage of the PropertyGrid's - PropertyContainerStyle property and - PreparePropertyItem event to customize the display of the PropertyGrid content. - - - - - - - - - - + + This sample demonstrates the usage of the PropertyGrid's + PropertyContainerStyle property and + PreparePropertyItem event to customize the display of the PropertyGrid content. + + + + + + + + + + - - + - + @@ -29,7 +27,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views InitializeComponent(); } - private void OnControlGetFocus(object sender, System.Windows.RoutedEventArgs e) + private void OnControlGetFocus( object sender, System.Windows.RoutedEventArgs e ) { _propertyGrid.SelectedObject = e.Source; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt index 052462a7d..ab668c39b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt index 9ed6f4472..e15b28cba 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt index e4f999194..ec0eddea3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt index 60e63a1ea..1436775a7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,6 @@ ************************************************************************************/ -using System; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt index 9483ac826..5bac68763 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt index 61a7de605..31427e80a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ ***********************************************************************************/ using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; using System.Windows; -using Xceed.Wpf.Toolkit; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt index ce8ed6b3a..afd1e8518 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt index b4bdba203..7a4767c26 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ ***********************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; using System.Windows.Controls; using System.Windows.Media; @@ -35,14 +32,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views private void RangeStyleComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e ) { - if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem) + if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem ) { ComboBoxItem item = e.AddedItems[ 0 ] as ComboBoxItem; //A style different from null is chosen if( item.Tag != null ) { //LowerRangeBackground is Transparent, force a color - if( object.Equals( sender, lowerRangeStyleComboBox ) && ((SolidColorBrush)_rangeSlider.LowerRangeBackground).Color.Equals( Colors.Transparent) ) + if( object.Equals( sender, lowerRangeStyleComboBox ) && ( ( SolidColorBrush )_rangeSlider.LowerRangeBackground ).Color.Equals( Colors.Transparent ) ) { _rangeSlider.LowerRangeBackground = new SolidColorBrush( Colors.Green ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt index 8c30acf22..5def958c3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt index 4939998b4..931d252d6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,6 @@ ***********************************************************************************/ using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt index 67f07fdc1..9b8271886 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt index 98121225d..a133f4731 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,6 @@ *************************************************************************************/ using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System; -using System.Windows.Resources; -using System.Windows; -using System.IO; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt index 911d86409..25da7bcad 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt index 6dca4841a..4ab24bb2b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,32 +15,24 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; using System.Collections.ObjectModel; -using System.ComponentModel; -using Xceed.Wpf.Samples.SampleData; -using System.Windows.Media.Imaging; -using System.IO; +using System.Windows.Controls; using System.Windows.Media; +using System.Windows.Media.Imaging; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views { - /// - /// Interaction logic for SlideShow.xaml - /// - public partial class SlideShowView : DemoView + /// + /// Interaction logic for SlideShow.xaml + /// + public partial class SlideShowView : DemoView + { + public SlideShowView() { - public SlideShowView() - { - InitializeComponent(); - + InitializeComponent(); - } } + + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt index 7a38544a4..a170964a1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt index 379ab694e..12091dda2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,22 +15,9 @@ *************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Xceed.Wpf.Toolkit; -using System.ComponentModel; -using System.Diagnostics; -using Xceed.Wpf.Toolkit.Primitives; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views { @@ -53,7 +40,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public StyleableWindowView() { InitializeComponent(); - this.UpdateWindowsStyles(null,null); + this.UpdateWindowsStyles( null, null ); } @@ -81,7 +68,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views msgBox.DataContext = this.DataContext; msgBox.Text = StyledMsgBoxMessage; msgBox.Caption = StyledMsgBoxTitle; - if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) + if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) { msgBox.Style = ( Style )this.Resources[ MessageBoxStyleKey ]; } @@ -117,8 +104,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Brush WindowBackground { - get { return ( Brush )GetValue( WindowBackgroundProperty ); } - set { SetValue( WindowBackgroundProperty, value ); } + get + { + return ( Brush )GetValue( WindowBackgroundProperty ); + } + set + { + SetValue( WindowBackgroundProperty, value ); + } } #endregion //WindowBackground @@ -149,12 +142,21 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Brush WindowBorderBrush { - get { return ( Brush )GetValue( WindowBorderBrushProperty ); } - set { SetValue( WindowBorderBrushProperty, value ); } + get + { + return ( Brush )GetValue( WindowBorderBrushProperty ); + } + set + { + SetValue( WindowBorderBrushProperty, value ); + } } #endregion //WindowBorderBrush + + + #region TitleFontSize public static readonly DependencyProperty TitleFontSizeProperty = @@ -164,7 +166,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views { get { - return (double)GetValue( TitleFontSizeProperty ); + return ( double )GetValue( TitleFontSizeProperty ); } set { @@ -181,8 +183,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Brush TitleForeground { - get { return ( Brush )GetValue( TitleForegroundProperty ); } - set { SetValue( TitleForegroundProperty, value ); } + get + { + return ( Brush )GetValue( TitleForegroundProperty ); + } + set + { + SetValue( TitleForegroundProperty, value ); + } } #endregion //TitleForeground @@ -213,8 +221,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Thickness WindowBorderThickness { - get { return ( Thickness )GetValue( WindowBorderThicknessProperty ); } - set { SetValue( WindowBorderThicknessProperty, value ); } + get + { + return ( Thickness )GetValue( WindowBorderThicknessProperty ); + } + set + { + SetValue( WindowBorderThicknessProperty, value ); + } } #endregion //WindowBorderThickness @@ -226,8 +240,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public double WindowOpacity { - get { return ( double )GetValue( WindowOpacityProperty ); } - set { SetValue( WindowOpacityProperty, value ); } + get + { + return ( double )GetValue( WindowOpacityProperty ); + } + set + { + SetValue( WindowOpacityProperty, value ); + } } #endregion //WindowOpacity @@ -239,8 +259,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public WindowStyle WindowStyle { - get { return ( WindowStyle )GetValue( WindowStyleProperty ); } - set { SetValue( WindowStyleProperty, value ); } + get + { + return ( WindowStyle )GetValue( WindowStyleProperty ); + } + set + { + SetValue( WindowStyleProperty, value ); + } } #endregion //WindowStyle @@ -252,8 +278,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public ResizeMode ResizeMode { - get { return ( ResizeMode )GetValue( ResizeModeProperty ); } - set { SetValue( ResizeModeProperty, value ); } + get + { + return ( ResizeMode )GetValue( ResizeModeProperty ); + } + set + { + SetValue( ResizeModeProperty, value ); + } } #endregion //ResizeMode @@ -264,8 +296,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Visibility CloseButtonVisibility { - get { return ( Visibility )GetValue( CloseButtonVisibilityProperty ); } - set { SetValue( CloseButtonVisibilityProperty, value ); } + get + { + return ( Visibility )GetValue( CloseButtonVisibilityProperty ); + } + set + { + SetValue( CloseButtonVisibilityProperty, value ); + } } #endregion //CloseButtonVisibility @@ -275,8 +313,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Style CloseButtonStyle { - get { return ( Style )GetValue( CloseButtonStyleProperty ); } - set { SetValue( CloseButtonStyleProperty, value ); } + get + { + return ( Style )GetValue( CloseButtonStyleProperty ); + } + set + { + SetValue( CloseButtonStyleProperty, value ); + } } #endregion //CloseButtonStyle @@ -286,8 +330,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Style MinimizeButtonStyle { - get { return ( Style )GetValue( MinimizeButtonStyleProperty ); } - set { SetValue( MinimizeButtonStyleProperty, value ); } + get + { + return ( Style )GetValue( MinimizeButtonStyleProperty ); + } + set + { + SetValue( MinimizeButtonStyleProperty, value ); + } } #endregion //MinimizeButtonStyle @@ -297,8 +347,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Style MaximizeButtonStyle { - get { return ( Style )GetValue( MaximizeButtonStyleProperty ); } - set { SetValue( MaximizeButtonStyleProperty, value ); } + get + { + return ( Style )GetValue( MaximizeButtonStyleProperty ); + } + set + { + SetValue( MaximizeButtonStyleProperty, value ); + } } #endregion //MaximizeButtonStyle @@ -308,8 +364,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views public Style RestoreButtonStyle { - get { return ( Style )GetValue( RestoreButtonStyleProperty ); } - set { SetValue( RestoreButtonStyleProperty, value ); } + get + { + return ( Style )GetValue( RestoreButtonStyleProperty ); + } + set + { + SetValue( RestoreButtonStyleProperty, value ); + } } #endregion //RestoreButtonStyle diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt index 047dbe331..5aea3ece5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,126 +15,175 @@ **************************************************************************************--> - - - It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled. - - - The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox. + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer" + xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views" + xmlns:res="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources" + xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters" + xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" + Title="StyleableWindows"> + + + It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled. + + + The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox. Click here for more details about Xceed Toolkit Plus for WPF. - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + This is the content of the child window. - - - - - - - - + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt index f93650991..ba234ff4c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,16 +15,11 @@ ************************************************************************************/ -using System.Windows.Controls; -using System.Windows.Controls.Primitives; using System; +using System.IO; using System.Windows; +using System.Windows.Controls; using Xceed.Wpf.Toolkit.Panels; -using System.Collections.Generic; -using Xceed.Wpf.Toolkit; -using System.Text.RegularExpressions; -using System.IO; -using System.Diagnostics; using System.Windows.Media.Imaging; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views @@ -151,7 +146,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views - #endregion + #endregion #region Methods (Private) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt index ce06f11f5..83cbc804d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt index 09901d517..042efa369 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,19 +15,11 @@ ************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using System.IO; +using System.Windows.Media.Imaging; // For Open Source Version +using System.IO; // For Open Source Version namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt index cb3cc22fa..4a0060c61 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt index a4c88df38..7131e31fa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,18 +15,12 @@ ************************************************************************************/ -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.ComponentModel; using System.Windows; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System.Windows.Controls.Primitives; using System; -using System.Data; using System.Windows.Media; using System.Windows.Media.Animation; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt index dbcbe26fb..f2eb24ac5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt index b5dddb432..65b18290c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,17 +15,9 @@ *************************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; using System.Windows; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System.Windows.Controls.Primitives; -using System; using Xceed.Wpf.Samples.SampleData; -using System.Data; -using System.Diagnostics; using System.Windows.Media; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt index de9b041c7..ca281801c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt index 1fbade0ef..28f0c915a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,13 +15,11 @@ *************************************************************************************/ -using System.Diagnostics; using System.Windows; using System; using System.Windows.Controls; using System.Windows.Media; using System.Windows.Documents; -using Microsoft.Win32; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt index 51db4e833..f18668c40 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt index cc0e3a868..340ece9d5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,17 +15,11 @@ *************************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; using System.ComponentModel; using System.Windows; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System.Windows.Controls.Primitives; using System; using Xceed.Wpf.Samples.SampleData; -using System.Data; -using System.Diagnostics; using System.Windows.Media; using System.Windows.Threading; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt index 69146161b..dace699a5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt index 1eff0712e..19e866d58 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -14,19 +14,6 @@ Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimeSpan.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt index 2e681ba15..418461d13 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -29,6 +29,45 @@ + + + + + + @@ -45,6 +84,7 @@ + @@ -81,38 +121,54 @@ IsChecked="{Binding ShowDays, ElementName=_timeSpanUpDown}" HorizontalAlignment="Left" VerticalAlignment="Center" - Margin="5,5,25,5" /> + ClickMode="Press" + Margin="5,5,25,5" + Style="{StaticResource ShowDaysAndShowSecondsStyle}" /> + + - + - + ToolTip="Must match a DateTimePart of the TimeSpanUpDown"> - /// Interaction logic for ToggleSwitchView.xaml - /// - public partial class ToggleSwitchView : DemoView + /// + /// Interaction logic for ToggleSwitchView.xaml + /// + public partial class ToggleSwitchView : DemoView + { + public ToggleSwitchView() { - public ToggleSwitchView() - { - InitializeComponent(); - } + InitializeComponent(); } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt index d753d8c83..21983fdef 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt index 1ef04263a..2b5609a4c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,21 +15,8 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; using System.ComponentModel; -using System.Data; using System.Collections.ObjectModel; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt index a122ab8a8..b161a10cc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt index 99bdf9dc5..c2de9dc59 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,15 +15,6 @@ ***********************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Windows.Controls; -using System; -using System.Windows; -using System.Windows.Media; -using System.Windows.Documents; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt index b0b8f46fa..e04f7f48e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -22,70 +22,72 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" Title="WatermarkComboBox"> - - + - The WatermarkComboBox is a ComboBox with a fully customizable watermark. - - - - - - - - - The WatermarkComboBox is a ComboBox with a fully customizable watermark. + + + + + + + + + - - - + + + - - + - - - - + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt index 7ba5f73b4..0dd8980da 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt index 501f8da7b..fe758dfb3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt index 741f23787..0293053e4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt index 2fe637c8a..6c42fef19 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt index 2f05ab47d..f3bca0c8b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,19 +16,14 @@ ************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using Xceed.Wpf.Toolkit; using System.Collections.ObjectModel; +using System.Windows; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views { public enum GenderData { - Male = 0, + Male = 0, Female } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt index 5edab9fe0..d9b33db33 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,146 +15,223 @@ ************************************************************************************--> - - - WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up. - - - ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set. - - - In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up. + + + ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set. + + + In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt index a24cfab5d..1671ae31e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,7 +15,6 @@ *************************************************************************************/ -using System.Windows; using System; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt index 28ec6a481..7b79049af 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt index c59b2fc66..aeefc099e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,8 @@ *************************************************************************************/ -using System.Windows.Controls; -using System.Windows.Data; -using System; using System.Windows; +using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt index 6bfbbc554..a2cb6828b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs index b6361e326..d1ce37fa8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,7 +17,6 @@ using System.Windows.Documents; using Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting; -using Xceed.Wpf.Toolkit; namespace Xceed.Wpf.Toolkit.LiveExplorer.Core { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs index 5b1835328..b8a08e58d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs @@ -149,12 +149,12 @@ private XmlToken TokenizeInsideElement() return TokenizeElementWhitespace(); else if( StartsWith( "/>" ) ) - return TokenizeSimple( "/>", XmlTokenKind.SelfClose, XmlTokenizerMode.OutsideElement ); - else + return TokenizeSimple( "/>", XmlTokenKind.SelfClose, XmlTokenizerMode.OutsideElement ); + else if( StartsWith( ">" ) ) - return TokenizeSimple( ">", XmlTokenKind.Close, XmlTokenizerMode.OutsideElement ); - else - return TokenizeName( XmlTokenKind.AttributeName, XmlTokenizerMode.AfterAttributeName ); + return TokenizeSimple( ">", XmlTokenKind.Close, XmlTokenizerMode.OutsideElement ); + else + return TokenizeName( XmlTokenKind.AttributeName, XmlTokenizerMode.AfterAttributeName ); } private XmlToken TokenizeText() { @@ -198,15 +198,15 @@ private XmlToken TokenizeOpen() return TokenizeSimple( " - - - The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" + xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer" + xmlns:sys="clr-namespace:System;assembly=mscorlib" + xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters" + Title="DateTime"> + + + The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs index 1bf2ddfeb..dd0df0446 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -24,7 +24,7 @@ public partial class DateTimeView : DemoView { public DateTimeView() { - InitializeComponent(); + InitializeComponent(); } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml index 82ed38929..0efc30d12 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -22,10 +22,10 @@ xmlns:sys="clr-namespace:System;assembly=mscorlib" Title="ExtendedTabControl"> - - - The ExtendedTabControl is a TabControl that offers a different navigation style. Instead of displaying the tabs on multiple lines when there are too many to fit in the view, the ExtendedTabContol offers the ability for the user to navigate left/right, and/or use a drop down list. + + + The ExtendedTabControl is a TabControl that offers a different navigation style. Instead of displaying the tabs on multiple lines when there are too many to fit in the view, the ExtendedTabContol offers the ability for the user to navigate left/right, and/or use a drop down list. This feature is only available in the "Plus" version. @@ -34,7 +34,9 @@ Click here for more details about Xceed Toolkit Plus for WPF. - + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml.cs index 159d39f04..1fa36388e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -38,5 +38,5 @@ public ExtTabControlView() - } } +} diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml index 0b564ae2e..bde179ef8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs index de0fd61b4..db34ca51e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,7 @@ ************************************************************************************/ -using System.Collections.ObjectModel; using System.Collections.Specialized; -using System.Windows; -using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml index ce8ed6b3a..afd1e8518 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs index 61a7de605..31427e80a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ ***********************************************************************************/ using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; using System.Windows; -using Xceed.Wpf.Toolkit; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs index e5446788d..531eb4295 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml index c3999de20..983f9d75d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs index 7b8591df2..91d73b7f6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,8 @@ ************************************************************************************/ -using System; -using System.IO; -using System.Windows; -using System.Windows.Resources; -using Xceed.Wpf.Samples.SampleData; using System.ComponentModel; +using Xceed.Wpf.Samples.SampleData; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs index 58f3242dd..e1c74684a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Data; using System.Windows.Media; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs index 3f7176b1b..9c65e703b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,13 +16,8 @@ ************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; -using System.Windows.Media; -using Xceed.Wpf.Toolkit; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters { @@ -34,8 +29,8 @@ public object Convert( object value, Type targetType, object parameter, System.G { if( value is FrameType ) { - FrameType frameType = (FrameType)value; - int param = int.Parse((string)parameter); + FrameType frameType = ( FrameType )value; + int param = int.Parse( ( string )parameter ); switch( frameType ) { case FrameType.Circle: diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml index fffb13d29..1608c3bb1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs index 258620994..1d9ab48ba 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -33,7 +33,15 @@ public MagnifierView() // Load and display the RTF file. Uri uri = new Uri( "pack://application:,,,/" + - "Xceed.Wpf.Toolkit.LiveExplorer" + +#if NETCORE + "Xceed.Wpf.Toolkit.LiveExplorer.NETCore" +#elif NET5 + "Xceed.Wpf.Toolkit.LiveExplorer.NET5" +#else + "Xceed.Wpf.Toolkit.LiveExplorer" +#endif + + ";component/Samples/Magnifier/Resources/SampleText.rtf" ); StreamResourceInfo info = Application.GetResourceStream( uri ); using( StreamReader txtReader = new StreamReader( info.Stream ) ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs index 2df496aa5..e9f312139 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,7 @@ ************************************************************************************/ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Converters diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs index beee333e6..3da009112 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -14,11 +14,7 @@ Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids ************************************************************************************/ -using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml index 0bbec9431..f32c8b491 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml index 566baccb8..87c9ed34b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs index f01543b9a..b10ec52bd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ **************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Windows; using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml index 4061627a8..a2b950793 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs index 542a2d662..fda03bec7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml index 6b05ee3a4..6b6f551f9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs index e0f571b4b..9f08f6847 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml index 0b355db57..f542069de 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs index b7263effd..2cb25c2b0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs index c25d147aa..9938c9e1c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Media; namespace Xceed.Wpf.Toolkit.LiveExplorer diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml index b860e0456..79639dd11 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs index fb17a2be0..d713e355f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml index b8fd55740..7019d573a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs index e8c20bd80..0581e5164 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml index 769b1dbf8..44a723225 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs index b19bf711b..9f6288e51 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml index dc0f989a7..d0c975468 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs index 7747a90cd..a94f20102 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml index b09c8355b..77c2a8819 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs index 087292d18..9cb3101df 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ **************************************************************************************/ -using System; -using System.Collections.Generic; using System.Windows; -using System.Windows.Controls; using System.Windows.Media.Animation; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml index c7e1fe915..d7fc7fdc7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs index df9e81520..4178d498d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ **************************************************************************************/ -using System; -using System.Collections.Generic; using System.Windows; -using System.Windows.Controls; using System.Windows.Media.Animation; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml index be2b59985..8d2a77d3f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs index 548bfc7bc..d983f7c67 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml index d2f8e3161..9b3b14d46 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs index 7b577a81c..e37bd6f57 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,14 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using Xceed.Wpf.Toolkit.Panels; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml index dfc8b1a5a..6f4c46dec 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs index 3464e945e..a405f5511 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml index b3d356f54..2b95642f9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs index 57c26a725..2e4b3b4bb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml index ba95e5a7c..895f4f04b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs index e5cb2d789..c3e6ccb7e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml index 7d5ff8dc1..12f4146f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs index b06f5c72e..d9ab291c3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml index 4f4a54e79..8aaa6e54c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs index e7f113567..d83b27f76 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ **************************************************************************************/ - -using System; -using System.Collections.Generic; -using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml index af4361cc0..94b96691e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs index 9816a35fc..1e05665cc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,10 @@ ***********************************************************************************/ -using System.Windows.Controls; using System; -using System.Windows.Media; using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views { @@ -43,5 +43,5 @@ public MultiCalendarView() - } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml index 6c576e2c9..a11713e5b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs index 7cf2ab991..5b72a51fe 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,7 +17,6 @@ using System.Collections.Generic; using System.Globalization; -using System; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs index 1ea8ba0d2..dfafb4c7c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,9 @@ *************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Globalization; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml index ce06f11f5..83cbc804d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs index f93650991..ba234ff4c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,16 +15,11 @@ ************************************************************************************/ -using System.Windows.Controls; -using System.Windows.Controls.Primitives; using System; +using System.IO; using System.Windows; +using System.Windows.Controls; using Xceed.Wpf.Toolkit.Panels; -using System.Collections.Generic; -using Xceed.Wpf.Toolkit; -using System.Text.RegularExpressions; -using System.IO; -using System.Diagnostics; using System.Windows.Media.Imaging; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views @@ -151,7 +146,7 @@ private void OnSwitchPanelLayoutChanged( object sender, RoutedEventArgs e ) - #endregion + #endregion #region Methods (Private) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs index 0ed7dddf2..7c8c7d853 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -14,10 +14,6 @@ Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids ************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Converters diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml index dd23dc497..a952ec92f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs index ff36906bc..c0ee5ae8e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ ************************************************************************************/ -using System.Windows.Data; -using Xceed.Wpf.Toolkit.LiveExplorer; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views { /// @@ -29,5 +26,5 @@ public PieChartView() { InitializeComponent(); } - } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml index 03492d51b..c210046e5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs index 6c041310c..b3c2ec22c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,6 @@ ************************************************************************************/ -using System.Windows.Data; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml index 8df6b348e..b6ceb68a8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs index f09328af2..79c018795 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,14 +15,7 @@ **************************************************************************************/ -using System.Windows.Data; -using System.Windows.Media; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reflection; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs index 68618094d..a677d35ba 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,9 @@ *************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Globalization; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml index 6fdc00e47..376dc0703 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs index 5e2be3719..6b221b734 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,17 +15,14 @@ *************************************************************************************/ -using System.Windows.Media; -using System.Windows.Controls; using System; -using System.Diagnostics; -using System.Windows; -using Xceed.Wpf.Toolkit; +using System.Collections.ObjectModel; using System.IO; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; using System.Windows.Media.Imaging; using Xceed.Wpf.Samples.SampleData; -using System.Collections.ObjectModel; -using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs index 89170803d..1414b605c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ ************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Data; using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml index 0af244a16..4c3a95526 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs index b8b9d0967..15316dcc4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAdvancedContextMenuView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAdvancedContextMenuView.xaml.cs index 391d6e3a0..7969e2d31 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAdvancedContextMenuView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAdvancedContextMenuView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,21 +15,9 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; using Xceed.Wpf.Toolkit.PropertyGrid; -using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml index 903eac74e..adfaa68e9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs index a5e85d933..d43fc71f7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,7 +15,6 @@ *************************************************************************************/ -using System; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; @@ -53,7 +52,7 @@ public PropertyGridAttributesView() } } - [CategoryOrder("Information", 0)] + [CategoryOrder( "Information", 0 )] [CategoryOrder( "Conections", 1 )] [CategoryOrder( "Other", 2 )] public abstract class Person : INotifyPropertyChanged @@ -64,60 +63,95 @@ public abstract class Person : INotifyPropertyChanged [Category( "Information" )] [Description( "This property uses the [DisplayName(\"Is a Men\")] attribute to customize the name of this property." )] [DisplayName( "Is male" )] - public bool IsMale { get; set; } + public bool IsMale + { + get; set; + } [Category( "Information" )] [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class. In the Plus version, it also depends on the IsMale property to change its foreground and source." )] [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )] public string FirstName { - get{ return _firstName; } - set{ _firstName = value; OnPropertyChanged( "FirstName" );} + get + { + return _firstName; + } + set + { + _firstName = value; + OnPropertyChanged( "FirstName" ); + } } private string _firstName; [Category( "Information" )] [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'LastNameUserControlEditor' user control." )] [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )] - [DefaultValue("Friend")] + [DefaultValue( "Friend" )] public string LastName { - get{ return _lastName; } - set{ _lastName = value; OnPropertyChanged( "LastName" );} + get + { + return _lastName; + } + set + { + _lastName = value; + OnPropertyChanged( "LastName" ); + } } private string _lastName; [Category( "Conections" )] [Description( "This property uses the [NewItemTypes(...)] attribute to provide the underlying CollectionEditor with class types (eg. Man, Woman) that can be inserted in the collection." )] [NewItemTypes( typeof( Man ), typeof( Woman ) )] - public List Friends { get; set; } + public List Friends + { + get; set; + } [Category( "Information" )] [DisplayName( "Writing Font Size" )] [Description( "This property defines the [ItemsSource(..)] attribute that allows you to specify a ComboBox editor and control its items." )] [ItemsSource( typeof( FontSizeItemsSource ) )] [RefreshProperties( RefreshProperties.All )] //This will reload the PropertyGrid - public double WritingFontSize { get; set; } + public double WritingFontSize + { + get; set; + } [Category( "Conections" )] [Description( "This property defines the [ExpandableObject()] attribute. This allows you to expand this property and drill down through its values." )] [ExpandableObject()] - public Person Spouse { get; set; } + public Person Spouse + { + get; set; + } [Category( "Other" )] [Description( "This property uses the [PropertyOrder(1)] attribute to control its position in the categorized and non-categorized views. Otherwise, alphabetical order is used." )] [PropertyOrder( 1 )] - public string A_SecondProperty { get; set; } + public string A_SecondProperty + { + get; set; + } [Category( "Other" )] [Description( "This property uses the [PropertyOrder(0)] attribute to control its position in the categorized and non-categorized view. Otherwise, alphabetical order is used." )] [PropertyOrder( 0 )] - public string B_FirstProperty { get; set; } + public string B_FirstProperty + { + get; set; + } [Category( "Other" )] [Description( "This property uses the [ParenthesizePropertyName()] attribute to force the name to be displayed within round brackets." )] - [ParenthesizePropertyNameAttribute(true)] - public string NameInParentheses { get; set; } + [ParenthesizePropertyNameAttribute( true )] + public string NameInParentheses + { + get; set; + } [Category( "Other" )] [Description( "This property uses the [Browsable(false)] attribute to not display the property" )] @@ -128,9 +162,9 @@ public string InvisibleProperty set; } - [Range(0d, 10d)] + [Range( 0d, 10d )] [Category( "Other" )] - [DefaultValue(5d)] + [DefaultValue( 5d )] [Description( "This property uses the [Range(0,10)] and DefaultValue attributes to set the Minimum, Maximum and default properties." )] public double RangeDouble { @@ -166,15 +200,27 @@ public class Man : Person , GroupName = "Information" , AutoGenerateField = true , AutoGenerateFilter = false )] - public string FavoriteSport { get; set; } - public Man() { this.IsMale = true; } + public string FavoriteSport + { + get; set; + } + public Man() + { + this.IsMale = true; + } } public class Woman : Person { [Category( "Information" )] [Description( "This property has no special attribute besides [Categroy(\"Information\")] and [Description(...)]" )] - public string FavoriteRestaurant { get; set; } - public Woman() { this.IsMale = false; } + public string FavoriteRestaurant + { + get; set; + } + public Woman() + { + this.IsMale = false; + } } // This is the custom editor referenced by the "EditorAttribute" diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml index 31305ffb7..93af39e66 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs index 63ccdb011..46aca0d5f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,7 @@ ************************************************************************************/ -using System; using System.ComponentModel; -using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml index 8d999818a..3eb017695 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs index c51fee6eb..2b34ff749 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,13 +15,8 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Windows; -using System.Windows.Media; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { @@ -40,35 +35,63 @@ public PropertyGridCategoryOrderView() [CategoryOrder( "Information", 1 )] [CategoryOrder( "Hobbies", 2 )] [CategoryOrder( "Connections", 3 )] - public class PersonOrdered : PersonBase { } + public class PersonOrdered : PersonBase + { + } - public class PersonNonOrdered : PersonBase { } + public class PersonNonOrdered : PersonBase + { + } public abstract class PersonBase { [Category( "Information" )] - public string FirstName { get; set; } + public string FirstName + { + get; set; + } [Category( "Information" )] - public string LastName { get; set; } + public string LastName + { + get; set; + } [Category( "Hobbies" )] - public bool Baseball { get; set; } + public bool Baseball + { + get; set; + } [Category( "Hobbies" )] - public bool Football { get; set; } + public bool Football + { + get; set; + } [Category( "Hobbies" )] - public bool Basketball { get; set; } + public bool Basketball + { + get; set; + } [Category( "Connections" )] - public string Father { get; set; } + public string Father + { + get; set; + } [Category( "Connections" )] - public string Mother { get; set; } + public string Mother + { + get; set; + } [Category( "Connections" )] - public bool HasChildren { get; set; } + public bool HasChildren + { + get; set; + } public static PersonBase InitPerson( PersonBase person ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml index 9b45018f2..bc1436afb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs index d9a8a0955..7d8f62d6b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,15 +15,10 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; using System.Windows.Media; -using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { @@ -121,7 +116,7 @@ public ObservableCollection Friends } [Category( "Information" )] - [Browsable(false)] + [Browsable( false )] [Description( "This property is not displayed in the PropertyGrid, but its used as the selectedItem of the ComboBox for the 'Friends' property Editor." )] public Friend BestFriend { @@ -151,7 +146,7 @@ public double WritingFontSize { get; set; - } + } } public class Friend diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml index 5ea650f7b..2aef7fc6e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs index 312254281..0279b2570 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,14 +15,6 @@ ************************************************************************************/ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Windows; -using System.Windows.Media; -using System.Linq; -using System.Collections.ObjectModel; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml index a3fcdfccd..8b0aafe39 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs index f43e281f8..bfad53bff 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ************************************************************************************/ using System; -using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; @@ -41,7 +40,7 @@ public PropertyGridDefaultEditorsView() selectedObject.Color = Colors.Blue; selectedObject.DateTime = System.DateTime.Now; selectedObject.Decimal = ( decimal )2; - selectedObject.Double = (double)3; + selectedObject.Double = ( double )3; selectedObject.Enum = HorizontalAlignment.Center; selectedObject.FontFamily = new FontFamily( "Arial" ); selectedObject.FontStretch = FontStretches.Normal; @@ -51,21 +50,21 @@ public PropertyGridDefaultEditorsView() selectedObject.Char = 'T'; selectedObject.Password = "This is my password"; selectedObject.Int16 = ( short )4; - selectedObject.Int32 = (int)5; - selectedObject.Int64 = (long)6; + selectedObject.Int32 = ( int )5; + selectedObject.Int64 = ( long )6; selectedObject.ListOfInt32 = new List() { 1, 2, 3 }; selectedObject.ListOfPerson = new List() { new Person() { Name = "John Smith" }, new Person() { Name = "Robert King" } }; selectedObject.ListOfStrings = new List() { "string1", "string2", "string3" }; selectedObject.Dictionary = new Dictionary() { { 22, System.Windows.Media.Color.FromRgb( 255, 0, 0 ) }, { 33, System.Windows.Media.Color.FromRgb( 0, 255, 0 ) } }; selectedObject.CollectionOfPerson = new Collection() { new Person() { Name = "Tom McNeil" }, new Person() { Name = "Mike Campbell" } }; selectedObject.Person = new Person() { Name = "John Smith" }; - selectedObject.SByte = (sbyte) 7; - selectedObject.Single = (float)8; + selectedObject.SByte = ( sbyte )7; + selectedObject.Single = ( float )8; selectedObject.String = "this is a string"; - selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 ); - selectedObject.UInt16 = (ushort)9; - selectedObject.UInt32 = (uint)10; - selectedObject.UInt64 = (ulong)11; + selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 ); + selectedObject.UInt16 = ( ushort )9; + selectedObject.UInt32 = ( uint )10; + selectedObject.UInt64 = ( ulong )11; this.DataContext = selectedObject; } @@ -74,25 +73,46 @@ public class AllEditorTypes { [Category( "Non-Numeric Editors" )] [Description( "(C# string type) This property uses a TextBox as the default editor." )] - public string String { get; set; } + public string String + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# bool type) This property uses a CheckBox as the default editor." )] - public bool Boolean { get; set; } + public bool Boolean + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# int type) This property uses an IntegerUpDown as the default editor." )] - public int Int32 { get; set; } + public int Int32 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# double type) This property uses a DoubleUpDown as the default editor." )] - public double Double { get; set; } + public double Double + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# short type) This property uses a ShortUpDown as the default editor." )] - public short Int16 { get; set; } + public short Int16 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# long type) This property uses a LongUpDown as the default editor." )] - public long Int64 { get; set; } + public long Int64 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# float type) This property uses a SingleUpDown as the default editor." )] - public float Single { get; set; } + public float Single + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# decimal type) This property uses a Decimal as the default editor." )] public decimal Decimal @@ -102,64 +122,124 @@ public decimal Decimal } [Category( "Numeric Editors" )] [Description( "(C# byte type) This property uses a ByteUpDown as the default editor." )] - public byte Byte { get; set; } + public byte Byte + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# sbyte type) This property uses a SByteUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )] - public sbyte SByte { get; set; } + public sbyte SByte + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# uint type) This property uses a UInteger as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )] - public uint UInt32 { get; set; } + public uint UInt32 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# ulong type) This property uses a ULongUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )] - public ulong UInt64 { get; set; } + public ulong UInt64 + { + get; set; + } [Category( "Numeric Editors" )] [Description( "(C# ushort type) This property uses a UShortUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )] - public ushort UInt16 { get; set; } + public ushort UInt16 + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a DateTimeUpDown as the default editor." )] - public System.DateTime DateTime { get; set; } + public System.DateTime DateTime + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a TimeSpanUpDown as the default editor." )] - public System.TimeSpan TimeSpan { get; set; } + public System.TimeSpan TimeSpan + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ColorPicker as the default editor." )] - public System.Windows.Media.Color? Color { get; set; } + public System.Windows.Media.Color? Color + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# enum type) This property uses a ComboBox as the default editor. The ComboBox is auto-populated with the enum values." )] - public HorizontalAlignment Enum { get; set; } + public HorizontalAlignment Enum + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ComboBox as the default editor." )] - public FontFamily FontFamily { get; set; } + public FontFamily FontFamily + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ComboBox as the default editor." )] - public FontWeight FontWeight { get; set; } + public FontWeight FontWeight + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ComboBox as the default editor." )] - public FontStyle FontStyle { get; set; } + public FontStyle FontStyle + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a ComboBox as the default editor." )] - public FontStretch FontStretch { get; set; } + public FontStretch FontStretch + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a Guid as the default editor." )] - public Guid Guid { get; set; } + public Guid Guid + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a Char as the default editor." )] - public Char Char { get; set; } + public Char Char + { + get; set; + } [Category( "Non-Numeric Editors" )] - [PasswordPropertyText(true)] - public string Password { get; set; } + [PasswordPropertyText( true )] + public string Password + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )] - public List ListOfStrings { get; set; } + public List ListOfStrings + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )] - public List ListOfInt32 { get; set; } + public List ListOfInt32 + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# IList type) This property uses a CollectionEditor as the default editor." )] - public List ListOfPerson { get; set; } + public List ListOfPerson + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# IDictionary type) This property uses a CollectionEditor as the default editor." )] - public Dictionary Dictionary { get; set; } + public Dictionary Dictionary + { + get; set; + } [Category( "Non-Numeric Editors" )] [Description( "(C# ICollection type) This property uses a CollectionEditor as the default editor." )] public Collection CollectionOfPerson @@ -168,12 +248,18 @@ public Collection CollectionOfPerson } [Category( "Non-Numeric Editors" )] [Description( "This property is a complex property and has no default editor." )] - public Person Person { get; set; } + public Person Person + { + get; set; + } } public class Person { - public string Name { get; set; } + public string Name + { + get; set; + } } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml index d270544f8..b4655a28b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs index 37d2aa84e..00fe83303 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,7 @@ *************************************************************************************/ -using System; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; -using Xceed.Wpf.Toolkit.PropertyGrid; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml index 898aed3f6..beb1b2b59 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs index ab636d35f..485816f5c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,18 +15,11 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Windows; -using System.Windows.Media; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; using Xceed.Wpf.Toolkit.Core; using System.Windows.Controls; using System.Globalization; -using System.Threading; -using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml index 6a8a7e9db..53246df5e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs index d51850362..c6929d86b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,20 +15,8 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml index 78eb8dc98..aebc4396b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs index 8cb06e2b0..8030ad9bc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,7 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.ComponentModel; using System.IO; -using System.Windows; using System.Windows.Media; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml index f71b6b24e..60503663a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs index be70ae8ce..13d8a7c8d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml index a0e529025..73cd4209b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs index 04fe90bdd..30db9605c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,20 +15,7 @@ *************************************************************************************/ -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml index 9796c6896..28d6c541b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs index 2a9b711a0..9bf0e254a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,13 +15,11 @@ *************************************************************************************/ -using System; using System.Collections.Generic; -using System.ComponentModel; +using System.Collections.ObjectModel; +using System.Linq; using System.Windows; using System.Windows.Media; -using System.Linq; -using System.Collections.ObjectModel; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml index 283305a8b..1ed17f250 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs index 3b3e67bc1..47a4bbaa9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,14 +15,6 @@ *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Windows; -using System.Windows.Media; -using System.Linq; -using System.Collections.ObjectModel; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml index ba1fb271c..8fb2e83d1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -23,30 +23,30 @@ xmlns:s="clr-namespace:System;assembly=mscorlib" VerticalScrollBarVisibility="Disabled" Title="Customizing PropertyItems display"> - - - This sample demonstrates the usage of the PropertyGrid's - PropertyContainerStyle property and - PreparePropertyItem event to customize the display of the PropertyGrid content. - - - - - - - - - - + + This sample demonstrates the usage of the PropertyGrid's + PropertyContainerStyle property and + PreparePropertyItem event to customize the display of the PropertyGrid content. + + + + + + + + + + - - + - + @@ -29,7 +27,7 @@ public PropertyGridSelectedObjectView() InitializeComponent(); } - private void OnControlGetFocus(object sender, System.Windows.RoutedEventArgs e) + private void OnControlGetFocus( object sender, System.Windows.RoutedEventArgs e ) { _propertyGrid.SelectedObject = e.Source; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml index e4f999194..ec0eddea3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs index 9ed6f4472..e15b28cba 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml index 9483ac826..5bac68763 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs index 60e63a1ea..1436775a7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,8 +15,6 @@ ************************************************************************************/ -using System; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs index c6f185d24..eca51c729 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -25,10 +25,10 @@ public class AbsoluteAdditionConverter : IMultiValueConverter { public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture ) { - if( (values != null) && (values.Count() == 2) ) + if( ( values != null ) && ( values.Count() == 2 ) ) { - var min = (double)values[ 0 ]; - var max = (double)values[ 1 ]; + var min = ( double )values[ 0 ]; + var max = ( double )values[ 1 ]; return Math.Abs( min ) + Math.Abs( max ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs index dfd2e7619..560492871 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -27,8 +27,8 @@ public object Convert( object value, Type targetType, object parameter, CultureI { if( value != null ) { - var tickPlacement = (TickPlacement)value; - return (tickPlacement != TickPlacement.None); + var tickPlacement = ( TickPlacement )value; + return ( tickPlacement != TickPlacement.None ); } return false; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml index 8c30acf22..5def958c3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs index b4bdba203..7a4767c26 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ ***********************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; using System.Windows.Controls; using System.Windows.Media; @@ -35,14 +32,14 @@ public RangeSliderView() private void RangeStyleComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e ) { - if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem) + if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem ) { ComboBoxItem item = e.AddedItems[ 0 ] as ComboBoxItem; //A style different from null is chosen if( item.Tag != null ) { //LowerRangeBackground is Transparent, force a color - if( object.Equals( sender, lowerRangeStyleComboBox ) && ((SolidColorBrush)_rangeSlider.LowerRangeBackground).Color.Equals( Colors.Transparent) ) + if( object.Equals( sender, lowerRangeStyleComboBox ) && ( ( SolidColorBrush )_rangeSlider.LowerRangeBackground ).Color.Equals( Colors.Transparent ) ) { _rangeSlider.LowerRangeBackground = new SolidColorBrush( Colors.Green ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml index 67f07fdc1..9b8271886 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs index 4939998b4..931d252d6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,6 @@ ***********************************************************************************/ using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml index 7a38544a4..a170964a1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs index 6dca4841a..4ab24bb2b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,32 +15,24 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; using System.Collections.ObjectModel; -using System.ComponentModel; -using Xceed.Wpf.Samples.SampleData; -using System.Windows.Media.Imaging; -using System.IO; +using System.Windows.Controls; using System.Windows.Media; +using System.Windows.Media.Imaging; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views { - /// - /// Interaction logic for SlideShow.xaml - /// - public partial class SlideShowView : DemoView + /// + /// Interaction logic for SlideShow.xaml + /// + public partial class SlideShowView : DemoView + { + public SlideShowView() { - public SlideShowView() - { - InitializeComponent(); - + InitializeComponent(); - } } + + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml index c544a40e3..7443dd274 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs index 4e0aa0c4a..3f81fdddd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml index 6810507d9..2de3941ea 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs index baa7a3b82..f8f20deeb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml index 518398ec9..483b245e4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs index 907488892..223ec24f5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml index 911d86409..25da7bcad 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs index 98121225d..a133f4731 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,6 @@ *************************************************************************************/ using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System; -using System.Windows.Resources; -using System.Windows; -using System.IO; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml index a122ab8a8..b161a10cc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs index 1ef04263a..2b5609a4c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,21 +15,8 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; using System.ComponentModel; -using System.Data; using System.Collections.ObjectModel; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml index 501f8da7b..fe758dfb3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs index 7ba5f73b4..0dd8980da 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml index 2fe637c8a..6c42fef19 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs index 741f23787..0293053e4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs index 849fee319..d8a62073c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ *************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Data; using System.Globalization; using System.Windows; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml index d4b023e56..67eef4c39 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml index cb3cc22fa..4a0060c61 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs index 09901d517..042efa369 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,19 +15,11 @@ ************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using System.IO; +using System.Windows.Media.Imaging; // For Open Source Version +using System.IO; // For Open Source Version namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml index dbcbe26fb..f2eb24ac5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml.cs index a4c88df38..7131e31fa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,18 +15,12 @@ ************************************************************************************/ -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.ComponentModel; using System.Windows; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System.Windows.Controls.Primitives; using System; -using System.Data; using System.Windows.Media; using System.Windows.Media.Animation; -using System.Diagnostics; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml index de9b041c7..ca281801c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs index b5dddb432..65b18290c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,17 +15,9 @@ *************************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; using System.Windows; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System.Windows.Controls.Primitives; -using System; using Xceed.Wpf.Samples.SampleData; -using System.Data; -using System.Diagnostics; using System.Windows.Media; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml index 51db4e833..f18668c40 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs index 1fbade0ef..28f0c915a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,13 +15,11 @@ *************************************************************************************/ -using System.Diagnostics; using System.Windows; using System; using System.Windows.Controls; using System.Windows.Media; using System.Windows.Documents; -using Microsoft.Win32; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml index 69146161b..dace699a5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs index cc0e3a868..340ece9d5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,17 +15,11 @@ *************************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; using System.ComponentModel; using System.Windows; using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System.Windows.Controls.Primitives; using System; using Xceed.Wpf.Samples.SampleData; -using System.Data; -using System.Diagnostics; using System.Windows.Media; using System.Windows.Threading; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml index 2e681ba15..418461d13 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -29,6 +29,45 @@ + + + + + + @@ -45,6 +84,7 @@ + @@ -81,38 +121,54 @@ IsChecked="{Binding ShowDays, ElementName=_timeSpanUpDown}" HorizontalAlignment="Left" VerticalAlignment="Center" - Margin="5,5,25,5" /> + ClickMode="Press" + Margin="5,5,25,5" + Style="{StaticResource ShowDaysAndShowSecondsStyle}" /> + + - + - + ToolTip="Must match a DateTimePart of the TimeSpanUpDown"> - /// Interaction logic for ToggleSwitchView.xaml - /// - public partial class ToggleSwitchView : DemoView + /// + /// Interaction logic for ToggleSwitchView.xaml + /// + public partial class ToggleSwitchView : DemoView + { + public ToggleSwitchView() { - public ToggleSwitchView() - { - InitializeComponent(); - } + InitializeComponent(); } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml index b0b8f46fa..e04f7f48e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -22,70 +22,72 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" Title="WatermarkComboBox"> - - + - The WatermarkComboBox is a ComboBox with a fully customizable watermark. - - - - - - - - - The WatermarkComboBox is a ComboBox with a fully customizable watermark. + + + + + + + + + - - - + + + - - + - - - - + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs index 99bdf9dc5..c2de9dc59 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,15 +15,6 @@ ***********************************************************************************/ -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Windows.Controls; -using System; -using System.Windows; -using System.Windows.Media; -using System.Windows.Documents; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs index 41c30bbc9..71aeda962 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,8 @@ ************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Globalization; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters { @@ -27,7 +24,7 @@ class IntToBoolConverter : IValueConverter { public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) { - int intReceived = (int)value; + int intReceived = ( int )value; if( intReceived == 1 ) return false; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs index 5ef3960f0..087c996d8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,8 @@ *************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Globalization; -using Xceed.Wpf.Toolkit; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters { @@ -28,12 +24,12 @@ public class WindowStateToBoolConverter : IValueConverter { public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) { - return ((WindowState)value == WindowState.Open); + return ( ( WindowState )value == WindowState.Open ); } public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture ) { - return (bool)value ? WindowState.Open : WindowState.Closed; + return ( bool )value ? WindowState.Open : WindowState.Closed; } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml index 0bb93f20a..bf14541d8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml index 40ed0abfa..f4a1efb1b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,91 +17,140 @@ - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs index 0d3125559..6b0b676c1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,21 +15,9 @@ ************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.ObjectModel; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Xceed.Wpf.Toolkit; -using System.Collections.ObjectModel; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources { @@ -58,8 +46,14 @@ public WindowModelEditor() public bool IsStyleEnabled { - get { return ( bool )GetValue( IsStyleEnabledProperty ); } - set { SetValue( IsStyleEnabledProperty, value ); } + get + { + return ( bool )GetValue( IsStyleEnabledProperty ); + } + set + { + SetValue( IsStyleEnabledProperty, value ); + } } #endregion //IsStyleEnabled diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml index e49be00e8..4edb90b74 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs index 004d3caf0..248baf3f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ *************************************************************************************/ -using System.Windows.Controls; -using Xceed.Wpf.Toolkit; -using System.Diagnostics; - namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml index 047dbe331..5aea3ece5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,126 +15,175 @@ **************************************************************************************--> - - - It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled. - - - The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox. + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer" + xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views" + xmlns:res="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources" + xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters" + xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" + Title="StyleableWindows"> + + + It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled. + + + The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox. Click here for more details about Xceed Toolkit Plus for WPF. - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + This is the content of the child window. - - - - - - - - + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs index 379ab694e..12091dda2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,22 +15,9 @@ *************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Xceed.Wpf.Toolkit; -using System.ComponentModel; -using System.Diagnostics; -using Xceed.Wpf.Toolkit.Primitives; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views { @@ -53,7 +40,7 @@ public partial class StyleableWindowView : DemoView public StyleableWindowView() { InitializeComponent(); - this.UpdateWindowsStyles(null,null); + this.UpdateWindowsStyles( null, null ); } @@ -81,7 +68,7 @@ private void StyledMessageBoxButton_Click( object sender, RoutedEventArgs e ) msgBox.DataContext = this.DataContext; msgBox.Text = StyledMsgBoxMessage; msgBox.Caption = StyledMsgBoxTitle; - if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) + if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) { msgBox.Style = ( Style )this.Resources[ MessageBoxStyleKey ]; } @@ -117,8 +104,14 @@ public class WindowModel : DependencyObject public Brush WindowBackground { - get { return ( Brush )GetValue( WindowBackgroundProperty ); } - set { SetValue( WindowBackgroundProperty, value ); } + get + { + return ( Brush )GetValue( WindowBackgroundProperty ); + } + set + { + SetValue( WindowBackgroundProperty, value ); + } } #endregion //WindowBackground @@ -149,12 +142,21 @@ public Brush WindowInactiveBackground public Brush WindowBorderBrush { - get { return ( Brush )GetValue( WindowBorderBrushProperty ); } - set { SetValue( WindowBorderBrushProperty, value ); } + get + { + return ( Brush )GetValue( WindowBorderBrushProperty ); + } + set + { + SetValue( WindowBorderBrushProperty, value ); + } } #endregion //WindowBorderBrush + + + #region TitleFontSize public static readonly DependencyProperty TitleFontSizeProperty = @@ -164,7 +166,7 @@ public double TitleFontSize { get { - return (double)GetValue( TitleFontSizeProperty ); + return ( double )GetValue( TitleFontSizeProperty ); } set { @@ -181,8 +183,14 @@ public double TitleFontSize public Brush TitleForeground { - get { return ( Brush )GetValue( TitleForegroundProperty ); } - set { SetValue( TitleForegroundProperty, value ); } + get + { + return ( Brush )GetValue( TitleForegroundProperty ); + } + set + { + SetValue( TitleForegroundProperty, value ); + } } #endregion //TitleForeground @@ -213,8 +221,14 @@ public Brush TitleShadowBrush public Thickness WindowBorderThickness { - get { return ( Thickness )GetValue( WindowBorderThicknessProperty ); } - set { SetValue( WindowBorderThicknessProperty, value ); } + get + { + return ( Thickness )GetValue( WindowBorderThicknessProperty ); + } + set + { + SetValue( WindowBorderThicknessProperty, value ); + } } #endregion //WindowBorderThickness @@ -226,8 +240,14 @@ public Thickness WindowBorderThickness public double WindowOpacity { - get { return ( double )GetValue( WindowOpacityProperty ); } - set { SetValue( WindowOpacityProperty, value ); } + get + { + return ( double )GetValue( WindowOpacityProperty ); + } + set + { + SetValue( WindowOpacityProperty, value ); + } } #endregion //WindowOpacity @@ -239,8 +259,14 @@ public double WindowOpacity public WindowStyle WindowStyle { - get { return ( WindowStyle )GetValue( WindowStyleProperty ); } - set { SetValue( WindowStyleProperty, value ); } + get + { + return ( WindowStyle )GetValue( WindowStyleProperty ); + } + set + { + SetValue( WindowStyleProperty, value ); + } } #endregion //WindowStyle @@ -252,8 +278,14 @@ public WindowStyle WindowStyle public ResizeMode ResizeMode { - get { return ( ResizeMode )GetValue( ResizeModeProperty ); } - set { SetValue( ResizeModeProperty, value ); } + get + { + return ( ResizeMode )GetValue( ResizeModeProperty ); + } + set + { + SetValue( ResizeModeProperty, value ); + } } #endregion //ResizeMode @@ -264,8 +296,14 @@ public ResizeMode ResizeMode public Visibility CloseButtonVisibility { - get { return ( Visibility )GetValue( CloseButtonVisibilityProperty ); } - set { SetValue( CloseButtonVisibilityProperty, value ); } + get + { + return ( Visibility )GetValue( CloseButtonVisibilityProperty ); + } + set + { + SetValue( CloseButtonVisibilityProperty, value ); + } } #endregion //CloseButtonVisibility @@ -275,8 +313,14 @@ public Visibility CloseButtonVisibility public Style CloseButtonStyle { - get { return ( Style )GetValue( CloseButtonStyleProperty ); } - set { SetValue( CloseButtonStyleProperty, value ); } + get + { + return ( Style )GetValue( CloseButtonStyleProperty ); + } + set + { + SetValue( CloseButtonStyleProperty, value ); + } } #endregion //CloseButtonStyle @@ -286,8 +330,14 @@ public Style CloseButtonStyle public Style MinimizeButtonStyle { - get { return ( Style )GetValue( MinimizeButtonStyleProperty ); } - set { SetValue( MinimizeButtonStyleProperty, value ); } + get + { + return ( Style )GetValue( MinimizeButtonStyleProperty ); + } + set + { + SetValue( MinimizeButtonStyleProperty, value ); + } } #endregion //MinimizeButtonStyle @@ -297,8 +347,14 @@ public Style MinimizeButtonStyle public Style MaximizeButtonStyle { - get { return ( Style )GetValue( MaximizeButtonStyleProperty ); } - set { SetValue( MaximizeButtonStyleProperty, value ); } + get + { + return ( Style )GetValue( MaximizeButtonStyleProperty ); + } + set + { + SetValue( MaximizeButtonStyleProperty, value ); + } } #endregion //MaximizeButtonStyle @@ -308,8 +364,14 @@ public Style MaximizeButtonStyle public Style RestoreButtonStyle { - get { return ( Style )GetValue( RestoreButtonStyleProperty ); } - set { SetValue( RestoreButtonStyleProperty, value ); } + get + { + return ( Style )GetValue( RestoreButtonStyleProperty ); + } + set + { + SetValue( RestoreButtonStyleProperty, value ); + } } #endregion //RestoreButtonStyle diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml index 5edab9fe0..d9b33db33 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,146 +15,223 @@ ************************************************************************************--> - - - WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up. - - - ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set. - - - In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up. + + + ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set. + + + In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs index 2f05ab47d..f3bca0c8b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,19 +16,14 @@ ************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; -using System.Windows.Controls; -using Xceed.Wpf.Toolkit; using System.Collections.ObjectModel; +using System.Windows; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views { public enum GenderData { - Male = 0, + Male = 0, Female } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml index 28ec6a481..7b79049af 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs index a24cfab5d..1671ae31e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,7 +15,6 @@ *************************************************************************************/ -using System.Windows; using System; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs index 88f70d10e..fc86d1d34 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ *************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs index a131f82b0..ad808b432 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -14,10 +14,6 @@ Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs index 7a696bd40..a1f0663cf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ *************************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Data; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs index a86d551ec..46521c44d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -14,10 +14,6 @@ Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs index 951c780ef..d6c7fd094 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -14,10 +14,6 @@ Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids *************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs index a47be61b5..b82e53930 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -14,10 +14,6 @@ Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids ************************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters { @@ -27,5 +23,5 @@ protected override object Convert( object value ) { return ( ( int )value ) - 1; } - } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml index 6bfbbc554..a2cb6828b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs index c59b2fc66..aeefc099e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2021 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,8 @@ *************************************************************************************/ -using System.Windows.Controls; -using System.Windows.Data; -using System; using System.Windows; +using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj new file mode 100644 index 000000000..ff5b69184 --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj @@ -0,0 +1,1415 @@ + + + + obj\net5\ + false + + + + net5.0-windows + WinExe + Xceed.Wpf.Toolkit.LiveExplorer + Xceed.Wpf.Toolkit.LiveExplorer.NET5 + false + true + App.ico + Properties\app.manifest + + + TRACE;DEBUG;NET5 + full + True + + + TRACE;NET5 + none + False + + + + MSBuild:Compile + Designer + + + + + + + HomeView.xaml + + + + + + + + + + + + AvalonDockView.xaml + + + + BusyIndicatorCustomContentTemplateView.xaml + + + BusyIndicatorCustomContentView.xaml + + + BusyIndicatorView.xaml + + + IconButtonView.xaml + + + ButtonSpinnerView.xaml + + + DropDownSplitButtonView.xaml + + + CalculatorView.xaml + + + + ChartAxisView.xaml + + + ChartLegendView.xaml + + + ChartSeriesBasicTypesView.xaml + + + ChartSeriesDataPointsBindingView.xaml + + + ChartStylingAxesGridView.xaml + + + ChartStylingColumnSeriesView.xaml + + + ChartStylingLineSeriesView.xaml + + + ChartStylingPieSeriesView.xaml + + + CheckListsView.xaml + + + ColorView.xaml + + + + DataGridView.xaml + + + MultiColumnComboBoxView.xaml + + + + + DateTimeView.xaml + + + ExtTabControlView.xaml + + + FilePickerView.xaml + + + RadialGaugeView.xaml + + + + ListBoxView.xaml + + + + + MagnifierView.xaml + + + + + MaterialHamburgerView.xaml + + + MaterialComboBoxView.xaml + + + + MaterialListBoxView.xaml + + + MaterialToolTipView.xaml + + + MaterialDropDownView.xaml + + + MaterialSwitchView.xaml + + + MaterialFrameView.xaml + + + MaterialTabsView.xaml + + + MaterialProgressBarCircularView.xaml + + + MaterialProgressBarView.xaml + + + MaterialRadioButtonView.xaml + + + MaterialCheckBoxView.xaml + + + MaterialToastView.xaml + + + MaterialSliderView.xaml + + + MaterialTextFieldView.xaml + + + MaterialButtonView.xaml + + + MaterialControlsView.xaml + + + MultiCalendarView.xaml + + + NumericView.xaml + + + + SwitchPanelView.xaml + + + + PieChartView.xaml + + + PieProgressView.xaml + + + PieView.xaml + + + + PileFlowPanelView.xaml + + + + LastNameUserControlEditor.xaml + + + + + PropertyGridPropertyItemStyleView.xaml + + + PropertyGridDefinitionKeyView.xaml + + + PropertyGridEditorDefinitionsView.xaml + + + PropertyGridAttributesView.xaml + + + PropertyGridSelectedObjectView.xaml + + + PropertyGridCustomPropertyView.xaml + + + PropertyGridPropertiesView.xaml + + + PropertyGridPropertiesSourceView.xaml + + + DisplayLocalizationRes.resx + True + True + + + PropertyGridBindingToStructsView.xaml + + + PropertyGridCategoryOrderView.xaml + + + PropertyGridCustomEditorsView.xaml + + + PropertyGridDefaultEditorsView.xaml + + + PropertyGridDisplayLocalizationView.xaml + + + PropertyGridMultiSelectedObjectsView.xaml + + + PropertyGridSpecifyingPropertiesView.xaml + + + PropertyGridExpandingNonPrimitivesView.xaml + + + PropertyGridView.xaml + + + + + RangeSliderView.xaml + + + RatingView.xaml + + + SlideShowView.xaml + + + AutoSelectTextboxView.xaml + + + MaskedTextboxView.xaml + + + MultiLineTextEditorView.xaml + + + RichTextboxView.xaml + + + WatermarkPasswordBoxView.xaml + + + WatermarkTextboxView.xaml + + + + ThemingAvalonDockView.xaml + + + ThemingCoreWPFView.xaml + + + ThemingDataGridView.xaml + + + ThemingExtendedToolkitView.xaml + + + ThemingListBoxView.xaml + + + TimelinePanelView.xaml + + + TimeSpanView.xaml + + + ToggleSwitchView.xaml + + + TokenizedTextBoxView.xaml + + + WatermarkComboBoxView.xaml + + + + + WindowModelEditor.xaml + + + ChildWindowView.xaml + + + StyleableWindowView.xaml + + + WindowContainerView.xaml + + + WizardView.xaml + + + + + + + + + ZoomboxView.xaml + + + True + True + Reference.datasvcmap + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + + + + + MainWindow.xaml + Code + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + Designer + + + ResXFileCodeGenerator + DisplayLocalizationRes.Designer.cs + Designer + + + Designer + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + datasvcmap + + + + + DataServiceClientGenerator + Reference.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\Xceed.Wpf.AvalonDock.Themes.Aero\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.NET5.dll + + + ..\Xceed.Wpf.AvalonDock.Themes.Metro\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.NET5.dll + + + ..\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.dll + + + ..\Xceed.Wpf.AvalonDock\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.AvalonDock.NET5.dll + + + ..\Xceed.Wpf.Toolkit\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.Toolkit.NET5.dll + + + + + + + $(ReferencePath);$(AssemblySearchPaths) + echo Deleting old CodeFiles directory... +@if exist "$(ProjectDir)CodeFiles" rmdir /s /q "$(ProjectDir)CodeFiles" +echo Copying sample code files... +for /d /r "$(ProjectDir)Samples" %25%25a in (Views) do @if exist "%25%25a" xcopy "%25%25a" "$(ProjectDir)CodeFiles" /s /Y /I /q > NUL +echo Renaming sample code files... +for /f "tokens=*" %25%25f in ('dir "$(ProjectDir)CodeFiles\*.*" /b') do ( +move /y "$(ProjectDir)CodeFiles\%25%25f" "$(ProjectDir)CodeFiles\%25%25f.txt" > NUL +) + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs index 6081ec774..e544904e8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -22,9 +22,9 @@ internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string BaseVersion = "4.3"; + public const string BaseVersion = "4.4"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] - public const string Version = BaseVersion + + public const string Version = BaseVersion + ".0.0"; [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] public const string PublicKeyToken = "ba83ff368b7563c6"; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs index 187d94f9e..444032b78 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs index 18fb8ac9b..446d3140a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Text; - namespace Xceed.Wpf.Toolkit { public enum AutoSelectBehavior diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs index ba46040c1..e35c1568a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs index 2d493a85d..640125e29 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs index 0c326fe0e..a220d7bc9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs index f998f74e6..2e10c86e7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs index cf587a375..8937711dd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml index 1c98d00d4..212e050a2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml index 0f4ae898d..9054902d0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs index 6effc4950..0c9dd3c07 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs index 7d889198b..dcd2bda5d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs index 1d8ebdda1..151b01dd1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs index b7f1b6c09..e21338f77 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs index 65b51072c..474e7ab62 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml index d1a2a074e..1cc150b14 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml index 36705b9e1..fa46432e6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs index 0873a846c..d92542c10 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -102,7 +102,7 @@ public ControlTemplate CalculatorButtonPanelTemplate { get { - return (ControlTemplate)GetValue( CalculatorButtonPanelTemplateProperty ); + return ( ControlTemplate )GetValue( CalculatorButtonPanelTemplateProperty ); } set { @@ -309,7 +309,7 @@ void Timer_Tick( object sender, EventArgs e ) #region Methods - internal void InitializeToValue(decimal? value) + internal void InitializeToValue( decimal? value ) { _previousValue = 0; _lastOperation = Operation.None; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs index 8d6a967e6..4fbeb7a8b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml index 699b15ca7..8571ab49e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml index 99e4cfecb..e34d8b984 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs index 0c0d3328d..7669ec6f2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -64,7 +64,7 @@ public object DropDownButtonContent { get { - return (object)GetValue( DropDownButtonContentProperty ); + return ( object )GetValue( DropDownButtonContentProperty ); } set { @@ -81,7 +81,7 @@ public object DropDownButtonDisabledContent { get { - return (object)GetValue( DropDownButtonDisabledContentProperty ); + return ( object )GetValue( DropDownButtonDisabledContentProperty ); } set { @@ -98,7 +98,7 @@ public double DropDownButtonHeight { get { - return (double)GetValue( DropDownButtonHeightProperty ); + return ( double )GetValue( DropDownButtonHeightProperty ); } set { @@ -115,7 +115,7 @@ public double DropDownButtonWidth { get { - return (double)GetValue( DropDownButtonWidthProperty ); + return ( double )GetValue( DropDownButtonWidthProperty ); } set { @@ -314,7 +314,7 @@ private void OnKeyDown( object sender, KeyEventArgs e ) { if( this.UpdateValueOnEnterKey ) { - this.TextBox.Text = (_initialValue != null) ? _initialValue.Value.ToString( this.FormatString, this.CultureInfo ) : null; + this.TextBox.Text = ( _initialValue != null ) ? _initialValue.Value.ToString( this.FormatString, this.CultureInfo ) : null; } else { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml index 7531bda68..1bf630619 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml index 06966862c..745c68129 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs index 7a11a088e..ef7ea19f5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -68,7 +68,7 @@ public bool IsEditable { get { - return (bool)GetValue( IsEditableProperty ); + return ( bool )GetValue( IsEditableProperty ); } set { @@ -98,7 +98,7 @@ private static void OnTextChanged( DependencyObject o, DependencyPropertyChanged { var checkComboBox = o as CheckComboBox; if( checkComboBox != null ) - checkComboBox.OnTextChanged( (string)e.OldValue, (string)e.NewValue ); + checkComboBox.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue ); } protected virtual void OnTextChanged( string oldValue, string newValue ) @@ -264,8 +264,8 @@ private void OnKeyDown( object sender, KeyEventArgs e ) private void Popup_Opened( object sender, EventArgs e ) { UIElement item = ItemContainerGenerator.ContainerFromItem( SelectedItem ) as UIElement; - if( (item == null) && (Items.Count > 0) ) - item = ItemContainerGenerator.ContainerFromItem( Items[0] ) as UIElement; + if( ( item == null ) && ( Items.Count > 0 ) ) + item = ItemContainerGenerator.ContainerFromItem( Items[ 0 ] ) as UIElement; if( item != null ) item.Focus(); } @@ -310,6 +310,12 @@ private void Popup_Opened( object sender, EventArgs e ) protected virtual void UpdateText() { + if( Items.Count == SelectedItems.Count ) + { + SetCurrentValue( CheckComboBox.TextProperty, AllItemsSelectedContent ); + return; + } + #if VS2008 string newValue = String.Join( Delimiter, SelectedItems.Cast().Select( x => GetItemDisplayValue( x ).ToString() ).ToArray() ); #else @@ -398,6 +404,6 @@ private void CloseDropDown( bool isFocusOnComboBox ) Focus(); } -#endregion //Methods + #endregion //Methods } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml index 197e8cf57..a1c25151d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml index 336ff7515..9c0e5ea47 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs index f108f9c1e..9d0d622dd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml index f46cd19a0..e32d89046 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml index ac1f2e394..4b8d5b49c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs index 6d7f6bd5d..db7d65614 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -344,7 +344,10 @@ public ChildWindow() internal override bool AllowPublicIsActiveChange { - get { return false; } + get + { + return false; + } } public override void OnApplyTemplate() @@ -461,7 +464,7 @@ protected override void OnPreviewKeyDown( KeyEventArgs e ) e.Handled = true; } // Prevent Tab when no children - else if( (e.Key == Key.Tab) && !_hasChildren ) + else if( ( e.Key == Key.Tab ) && !_hasChildren ) { e.Handled = true; } @@ -633,7 +636,7 @@ private void ChildWindow_Unloaded( object sender, RoutedEventArgs e ) if( _parentContainer != null ) { _parentContainer.LayoutUpdated -= ParentContainer_LayoutUpdated; - _parentContainer.SizeChanged -= ParentContainer_SizeChanged; + _parentContainer.SizeChanged -= ParentContainer_SizeChanged; //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore //we need to handle the loaded event and reposition the window. @@ -661,7 +664,7 @@ void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e ) private void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e ) { - if( (bool)e.NewValue && this.IsModal ) + if( ( bool )e.NewValue && this.IsModal ) { this.Focus(); } @@ -683,7 +686,7 @@ private double GetRestrictedLeft() if( Left < 0 ) return 0; - if( ( _parentContainer != null ) && (_windowRoot != null) ) + if( ( _parentContainer != null ) && ( _windowRoot != null ) ) { if( Left + _windowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 ) { @@ -763,7 +766,7 @@ private void ExecuteOpen() if( !_hasWindowContainer ) if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center ) - CenterChildWindow(); + CenterChildWindow(); if( !_hasWindowContainer ) BringToFront(); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs index 4f563f561..c98d20a40 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs index 6ea7ed4e7..f070dc876 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml index cb190e53b..e45e52442 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml index 5349057d7..580b84a5f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs index dfc6abefd..4af9244ec 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml index 5789c9b1c..3bacba238 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml index bfd4d8ea5..b10fab79d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs index 5b453e7c0..2e0b3c0a6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -91,7 +91,7 @@ public IEnumerable ItemsSource { get { - return (IEnumerable)GetValue( ItemsSourceProperty ); + return ( IEnumerable )GetValue( ItemsSourceProperty ); } set { @@ -103,7 +103,7 @@ private static void OnItemsSourceChanged( DependencyObject d, DependencyProperty { var CollectionControl = ( CollectionControl )d; if( CollectionControl != null ) - CollectionControl.OnItemSourceChanged( (IEnumerable)e.OldValue, (IEnumerable)e.NewValue ); + CollectionControl.OnItemSourceChanged( ( IEnumerable )e.OldValue, ( IEnumerable )e.NewValue ); } public void OnItemSourceChanged( IEnumerable oldValue, IEnumerable newValue ) @@ -117,12 +117,12 @@ public void OnItemSourceChanged( IEnumerable oldValue, IEnumerable newValue ) // We need to Add EditableKeyValuePairs from DictionaryEntries. foreach( DictionaryEntry item in dict ) { - var keyType = (item.Key != null) + var keyType = ( item.Key != null ) ? item.Key.GetType() - : (dict.GetType().GetGenericArguments().Count() > 0) ? dict.GetType().GetGenericArguments()[0] : typeof( object ); - var valueType = (item.Value != null) + : ( dict.GetType().GetGenericArguments().Count() > 0 ) ? dict.GetType().GetGenericArguments()[ 0 ] : typeof( object ); + var valueType = ( item.Value != null ) ? item.Value.GetType() - : (dict.GetType().GetGenericArguments().Count() > 1) ? dict.GetType().GetGenericArguments()[ 1 ] : typeof( object ); + : ( dict.GetType().GetGenericArguments().Count() > 1 ) ? dict.GetType().GetGenericArguments()[ 1 ] : typeof( object ); var editableKeyValuePair = ListUtilities.CreateEditableKeyValuePair( item.Key , keyType , item.Value @@ -528,7 +528,7 @@ private void Duplicate( object sender, ExecutedRoutedEventArgs e ) private void CanDuplicate( object sender, CanExecuteRoutedEventArgs e ) { - var t = (e.Parameter != null) ? e.Parameter.GetType() : null; + var t = ( e.Parameter != null ) ? e.Parameter.GetType() : null; this.CanAddNewCore( t, e ); } @@ -617,7 +617,7 @@ internal void PersistChanges( IList sourceList ) if( collection is IDictionary ) { //For a Dictionary, we need to parse the list of EditableKeyValuePair and add KeyValuePair to the Dictionary. - var dict = (IDictionary)collection; + var dict = ( IDictionary )collection; //the easiest way to persist changes to the source is to just clear the source list and then add all items to it. dict.Clear(); @@ -625,7 +625,7 @@ internal void PersistChanges( IList sourceList ) { var propInfoKey = item.GetType().GetProperty( "Key" ); var propInfoValue = item.GetType().GetProperty( "Value" ); - if( (propInfoKey != null) && (propInfoValue != null) ) + if( ( propInfoKey != null ) && ( propInfoValue != null ) ) { dict.Add( propInfoKey.GetValue( item, null ), propInfoValue.GetValue( item, null ) ); } @@ -634,7 +634,7 @@ internal void PersistChanges( IList sourceList ) //IList else if( collection is IList ) { - var list = (IList)collection; + var list = ( IList )collection; //the easiest way to persist changes to the source is to just clear the source list and then add all items to it. list.Clear(); @@ -642,7 +642,7 @@ internal void PersistChanges( IList sourceList ) if( list.IsFixedSize ) { if( sourceList.Count > list.Count ) - throw new IndexOutOfRangeException("Exceeding array size."); + throw new IndexOutOfRangeException( "Exceeding array size." ); for( int i = 0; i < sourceList.Count; ++i ) list[ i ] = sourceList[ i ]; @@ -659,7 +659,7 @@ internal void PersistChanges( IList sourceList ) { //ICollection (or IList) var collectionType = collection.GetType(); - var iCollectionOfTInterface = collectionType.GetInterfaces().FirstOrDefault( x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof( ICollection<> )) ); + var iCollectionOfTInterface = collectionType.GetInterfaces().FirstOrDefault( x => x.IsGenericType && ( x.GetGenericTypeDefinition() == typeof( ICollection<> ) ) ); if( iCollectionOfTInterface != null ) { var argumentType = iCollectionOfTInterface.GetGenericArguments().FirstOrDefault(); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs index c2696db17..d674cdbab 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml index b426ff296..0c4736cdc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs index e52920fb3..b51c69f3f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -19,17 +19,15 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using System.Windows; -using System.Windows.Media; -using Xceed.Wpf.Toolkit.Core.Utilities; using System.Linq; +using System.Reflection; using System.Runtime.Serialization; using System.Security; -using System.IO; -using System.Runtime.Serialization.Formatters.Binary; -using Xceed.Wpf.Toolkit.PropertyGrid; +using System.Windows; using System.Windows.Controls; -using System.Reflection; +using System.Windows.Media; +using Xceed.Wpf.Toolkit.Core.Utilities; +using Xceed.Wpf.Toolkit.PropertyGrid; namespace Xceed.Wpf.Toolkit { @@ -204,7 +202,7 @@ private object Clone( object source ) if( source is Array ) { - result = (source as Array).Clone(); + result = ( source as Array ).Clone(); } // For IDictionary, we need to create EditableKeyValuePair to edit the Key-Value. else if( ( this.ItemsSource is IDictionary ) @@ -252,13 +250,13 @@ private object Clone( object source ) var propertyInfoValue = propertyInfo.GetValue( source, null ); this.GenerateValue( propertyInfo, propertyInfoValue, result ); } - else + else { var countPropertyInfo = sourceType.GetProperty( "Count" ); if( countPropertyInfo != null ) { var count = countPropertyInfo.GetValue( source, null ) as int?; - if( ( count != null) && count.HasValue ) + if( ( count != null ) && count.HasValue ) { for( int i = 0; i < count.Value; ++i ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs index 75b8ab499..f189737f3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,10 +17,9 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; -using System.Text; using System.Windows.Data; -using System.Globalization; using Xceed.Wpf.Toolkit.Core.Utilities; namespace Xceed.Wpf.Toolkit.Converters @@ -40,11 +39,11 @@ public object Convert( object[] values, Type targetType, object parameter, Cultu { if( values.Length != 2 ) - throw new ArgumentException("The 'values' argument should contain 2 objects."); + throw new ArgumentException( "The 'values' argument should contain 2 objects." ); if( values[ 1 ] != null ) { - if( !values[ 1 ].GetType().IsGenericType || !(values[ 1 ].GetType().GetGenericArguments().First().GetType() is Type) ) + if( !values[ 1 ].GetType().IsGenericType || !( values[ 1 ].GetType().GetGenericArguments().First().GetType() is Type ) ) throw new ArgumentException( "The 'value' argument is not of the correct type." ); return values[ 1 ]; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs index 825396545..68f76e294 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,8 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Xceed.Wpf.Toolkit.Core; using System.Windows; +using Xceed.Wpf.Toolkit.Core; namespace Xceed.Wpf.Toolkit { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs index 71cbcc809..70fef8ca5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,12 +15,8 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Xceed.Wpf.Toolkit.Core; using System.Windows; +using Xceed.Wpf.Toolkit.Core; namespace Xceed.Wpf.Toolkit { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs index 72f95b954..d8c109a9a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; namespace Xceed.Wpf.Toolkit diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs index 5fcca5fd4..a46072dc5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -110,8 +110,14 @@ protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue ) public bool IsReadOnly { - get { return ( bool )GetValue( IsReadOnlyProperty ); } - set { SetValue( IsReadOnlyProperty, value ); } + get + { + return ( bool )GetValue( IsReadOnlyProperty ); + } + set + { + SetValue( IsReadOnlyProperty, value ); + } } #endregion //IsReadOnly @@ -198,7 +204,7 @@ public PrimitiveTypeCollectionControl() #region Overrides -#endregion + #endregion #region Methods @@ -218,7 +224,7 @@ private void PersistChanges() { if( list is Array ) { - ( ( Array )list ).SetValue( item, counter++); + ( ( Array )list ).SetValue( item, counter++ ); } else { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml index 0c1f2372c..5b1ec9b60 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml index 44ba20320..3549c1f9f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs index bb5946174..b0da3a8f4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -242,7 +242,7 @@ protected virtual void OnHexadecimalStringChanged( string oldValue, string newVa Color? col = null; if( !string.IsNullOrEmpty( newColorString ) ) { - col = ( Color )ColorConverter.ConvertFromString( newColorString ); + col = ( Color )ColorConverter.ConvertFromString( newColorString ); } UpdateSelectedColor( col ); } @@ -453,7 +453,7 @@ void ColorShadingCanvas_SizeChanged( object sender, SizeChangedEventArgs e ) void SpectrumSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs e ) { - if( (_currentColorPosition != null) && (this.SelectedColor != null) ) + if( ( _currentColorPosition != null ) && ( this.SelectedColor != null ) ) { CalculateColor( ( Point )_currentColorPosition ); } @@ -493,8 +493,8 @@ private void UpdateSelectedColor() private void UpdateSelectedColor( Color? color ) { - SelectedColor = ( ( color != null ) && color.HasValue ) - ? (Color?)Color.FromArgb( color.Value.A, color.Value.R, color.Value.G, color.Value.B ) + SelectedColor = ( ( color != null ) && color.HasValue ) + ? ( Color? )Color.FromArgb( color.Value.A, color.Value.R, color.Value.G, color.Value.B ) : null; } @@ -515,10 +515,10 @@ private void UpdateRGBValues( Color? color ) private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool calculateColor ) { - if( (_colorShadingCanvas == null) || ( _colorShadeSelector == null) ) + if( ( _colorShadingCanvas == null ) || ( _colorShadeSelector == null ) ) return; - if( p.Y < 0 ) + if( p.Y < 0 ) p.Y = 0; if( p.X < 0 ) @@ -544,7 +544,7 @@ private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool ca private void UpdateColorShadeSelectorPosition( Color? color ) { - if( (_spectrumSlider == null) || (_colorShadingCanvas == null) || (color == null) || !color.HasValue) + if( ( _spectrumSlider == null ) || ( _colorShadingCanvas == null ) || ( color == null ) || !color.HasValue ) return; _currentColorPosition = null; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs index 95e0bdb55..2cf05b4e5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; using System.Windows; using System.Windows.Controls; using System.Windows.Media; @@ -95,7 +94,7 @@ private void CreateSpectrum() var colorsList = ColorUtilities.GenerateHsvSpectrum(); - double stopIncrement = ( double )1 / (colorsList.Count - 1); + double stopIncrement = ( double )1 / ( colorsList.Count - 1 ); int i; for( i = 0; i < colorsList.Count; i++ ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml index 8dfb9d92a..5094f6cff 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml index 16c5caec3..4d4db2eb5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs index a8f03c691..ab26a37a2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -38,11 +38,11 @@ public ColorItem( Color? color, string name ) Name = name; } - public override bool Equals(object obj) + public override bool Equals( object obj ) { var ci = obj as ColorItem; - if (ci == null) - return false; + if( ci == null ) + return false; return ( ci.Color.Equals( Color ) && ci.Name.Equals( Name ) ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs index b3f11102b..e194222c1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -227,7 +227,7 @@ public Brush DropDownBackground { get { - return (Brush)GetValue( DropDownBackgroundProperty ); + return ( Brush )GetValue( DropDownBackgroundProperty ); } set { @@ -278,7 +278,7 @@ public Brush HeaderBackground { get { - return (Brush)GetValue( HeaderBackgroundProperty ); + return ( Brush )GetValue( HeaderBackgroundProperty ); } set { @@ -295,7 +295,7 @@ public Brush HeaderForeground { get { - return (Brush)GetValue( HeaderForegroundProperty ); + return ( Brush )GetValue( HeaderForegroundProperty ); } set { @@ -322,9 +322,9 @@ public bool IsOpen private static void OnIsOpenChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) { - ColorPicker colorPicker = (ColorPicker)d; + ColorPicker colorPicker = ( ColorPicker )d; if( colorPicker != null ) - colorPicker.OnIsOpenChanged( (bool)e.OldValue, (bool)e.NewValue ); + colorPicker.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue ); } private void OnIsOpenChanged( bool oldValue, bool newValue ) @@ -596,7 +596,7 @@ public Brush TabBackground { get { - return (Brush)GetValue( TabBackgroundProperty ); + return ( Brush )GetValue( TabBackgroundProperty ); } set { @@ -613,7 +613,7 @@ public Brush TabForeground { get { - return (Brush)GetValue( TabForegroundProperty ); + return ( Brush )GetValue( TabForegroundProperty ); } set { @@ -726,7 +726,7 @@ protected override void OnMouseUp( MouseButtonEventArgs e ) } -#endregion //Base Class Overrides + #endregion //Base Class Overrides #region Event Handlers @@ -866,7 +866,7 @@ private void CloseColorPicker( bool isFocusOnColorPicker ) IsOpen = false; ReleaseMouseCapture(); - if( isFocusOnColorPicker && ( _toggleButton != null) ) + if( isFocusOnColorPicker && ( _toggleButton != null ) ) _toggleButton.Focus(); this.UpdateRecentColors( new ColorItem( SelectedColor, SelectedColorText ) ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs index c26b4cbc2..9003fc985 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs index f1d9d4cba..74f852332 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,10 +17,6 @@ using System; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Media; namespace Xceed.Wpf.Toolkit { @@ -34,8 +30,8 @@ public int Compare( object firstItem, object secondItem ) ColorItem colorItem1 = ( ColorItem )firstItem; ColorItem colorItem2 = ( ColorItem )secondItem; - if( (colorItem1.Color == null) || !colorItem1.Color.HasValue || - (colorItem2.Color == null) || !colorItem2.Color.HasValue ) + if( ( colorItem1.Color == null ) || !colorItem1.Color.HasValue || + ( colorItem2.Color == null ) || !colorItem2.Color.HasValue ) return -1; System.Drawing.Color drawingColor1 = System.Drawing.Color.FromArgb( colorItem1.Color.Value.A, colorItem1.Color.Value.R, colorItem1.Color.Value.G, colorItem1.Color.Value.B ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml index 0ec314ba1..3ba6021ea 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml index 505575704..4c9a8e4e3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs index 81ffd877f..246431dc6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Text; using System.Windows; namespace Xceed.Wpf.Toolkit.Core diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs index 054d26a28..89d1e9cea 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs index 05709be57..a6936fea3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs index 257599917..9e7cc4881 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs index 6377cd985..76f28e08d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,45 +16,41 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Globalization; using System.Windows; -using System.Windows.Media; using System.Windows.Controls; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Core.Converters { - public class CenterTitleConverter : IMultiValueConverter + public class CenterTitleConverter : IMultiValueConverter + { + public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture ) { - public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) - { - // Parameters: DesiredSize, WindowWidth, HeaderColumns - double titleTextWidth = ((Size)values[0]).Width; - double windowWidth = (double)values[1]; + // Parameters: DesiredSize, WindowWidth, HeaderColumns + double titleTextWidth = ( ( Size )values[ 0 ] ).Width; + double windowWidth = ( double )values[ 1 ]; - ColumnDefinitionCollection headerColumns = (ColumnDefinitionCollection)values[2]; - double titleColWidth = headerColumns[2].ActualWidth; - double buttonsColWidth = headerColumns[3].ActualWidth; + ColumnDefinitionCollection headerColumns = ( ColumnDefinitionCollection )values[ 2 ]; + double titleColWidth = headerColumns[ 2 ].ActualWidth; + double buttonsColWidth = headerColumns[ 3 ].ActualWidth; - // Result (1) Title is Centered across all HeaderColumns - if ((titleTextWidth + buttonsColWidth * 2) < windowWidth) - return 1; + // Result (1) Title is Centered across all HeaderColumns + if( ( titleTextWidth + buttonsColWidth * 2 ) < windowWidth ) + return 1; - // Result (2) Title is Centered in HeaderColumns[2] - if (titleTextWidth < titleColWidth) - return 2; + // Result (2) Title is Centered in HeaderColumns[2] + if( titleTextWidth < titleColWidth ) + return 2; - // Result (3) Title is Left-Aligned in HeaderColumns[2] - return 3; - } + // Result (3) Title is Left-Aligned in HeaderColumns[2] + return 3; + } - public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } + public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture ) + { + throw new NotImplementedException(); } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs index 68da0c87d..886131c21 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -33,7 +33,10 @@ public class ColorBlendConverter : IValueConverter /// public double BlendedColorRatio { - get { return _blendedColorRatio; } + get + { + return _blendedColorRatio; + } set { @@ -47,7 +50,10 @@ public double BlendedColorRatio /// /// The color to blend with the source color /// - public Color BlendedColor { get; set; } + public Color BlendedColor + { + get; set; + } public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs index feb15e2ff..5b34537d7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -26,7 +26,7 @@ public class ColorModeToTabItemSelectedConverter : IValueConverter public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) { var colorMode = ( ColorMode )value; - return (colorMode == ColorMode.ColorPalette) ? 0 : 1; + return ( colorMode == ColorMode.ColorPalette ) ? 0 : 1; } public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs index 3441a31ba..4fae92aab 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs index 5438d2fbb..9c8fc9976 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,34 +16,31 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Core.Converters { - public class CornerRadiusToDoubleConverter : IValueConverter + public class CornerRadiusToDoubleConverter : IValueConverter + { + public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) { - public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) - { - double radius = 0.0; + double radius = 0.0; - if (value != null) - radius = ((CornerRadius)value).TopLeft; + if( value != null ) + radius = ( ( CornerRadius )value ).TopLeft; - return radius; - } + return radius; + } - public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) - { - double radius = 0.0; + public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) + { + double radius = 0.0; - if (value != null) - radius = (double)value; + if( value != null ) + radius = ( double )value; - return new CornerRadius(radius); - } + return new CornerRadius( radius ); } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs index 0eafbdca1..53c557b6f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Core.Converters @@ -29,9 +26,9 @@ public class HalfConverter : IValueConverter public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) { double size = ( double )value; - double modifier = (parameter != null) ? double.Parse( ( string )parameter ) : 0d; + double modifier = ( parameter != null ) ? double.Parse( ( string )parameter ) : 0d; if( modifier != 0 ) - return Math.Max(0, size - modifier) / 2; + return Math.Max( 0, size - modifier ) / 2; return ( size / 2 ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs index 9ef126d2b..bcf97aa86 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,34 +16,31 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Core.Converters { - public class IntToThicknessConverter : IValueConverter + public class IntToThicknessConverter : IValueConverter + { + public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) + { + int thickValue = 0; + if( value != null ) + thickValue = ( int )value; + + if( parameter != null ) + { + if( parameter.ToString().ToUpper() == "LEFT" ) + return new Thickness( thickValue, 0, 0, 0 ); + } + + return new Thickness( thickValue ); + } + + public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) { - public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) - { - int thickValue = 0; - if (value != null) - thickValue = (int)value; - - if (parameter != null) - { - if (parameter.ToString().ToUpper() == "LEFT") - return new Thickness(thickValue, 0, 0, 0); - } - - return new Thickness(thickValue); - } - - public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) - { - throw new NotImplementedException(); - } + throw new NotImplementedException(); } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs index 2614d11f5..3950d6b0e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs index 07cdbeb0f..8a6c44c4a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -25,7 +25,20 @@ public class NullToBoolConverter : IValueConverter { public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) { - return (value == null); + return ( value == null ); + } + + public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture ) + { + throw new NotImplementedException(); + } + } + + public class NotNullToBoolConverter : IValueConverter + { + public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) + { + return ( value != null ); } public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs index cfaec0ce1..c5dc06da1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -43,7 +43,7 @@ public object Convert( object value, Type targetType, object parameter, System.G return ( displayNameAttribute != null ) ? displayNameAttribute.DisplayName : type.Name; } - return value; + return value; } return null; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/PrintableFontFamilyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/PrintableFontFamilyConverter.cs index 92c8cf153..dc3cb526b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/PrintableFontFamilyConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/PrintableFontFamilyConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs index 40ee04e6c..501ec6a32 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs index 8eec75fb9..7d4de77c3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs index 42bd41d15..006d8b1f8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -28,15 +28,24 @@ public class ThicknessSideRemovalConverter : IValueConverter public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) { - var thickness = (Thickness)value; - var sideToRemove = int.Parse( (string)parameter ); + var thickness = ( Thickness )value; + var sideToRemove = int.Parse( ( string )parameter ); switch( sideToRemove ) { - case 0: thickness.Left = 0d; break; - case 1: thickness.Top = 0d; break; - case 2: thickness.Right = 0d; break; - case 3: thickness.Bottom = 0d; break; - default: throw new InvalidContentException("parameter should be from 0 to 3 to specify the side to remove."); + case 0: + thickness.Left = 0d; + break; + case 1: + thickness.Top = 0d; + break; + case 2: + thickness.Right = 0d; + break; + case 3: + thickness.Bottom = 0d; + break; + default: + throw new InvalidContentException( "parameter should be from 0 to 3 to specify the side to remove." ); } return thickness; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs index c77e0a701..96c99d278 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,34 +16,31 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Core.Converters { - public class ThicknessToDoubleConverter : IValueConverter + public class ThicknessToDoubleConverter : IValueConverter + { + public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) { - public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) - { - double thickness = 1.0; + double thickness = 1.0; - if (value != null) - thickness = ((Thickness)value).Top; + if( value != null ) + thickness = ( ( Thickness )value ).Top; - return thickness; - } + return thickness; + } - public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) - { - double thickness = 1.0; + public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) + { + double thickness = 1.0; - if (value != null) - thickness = (double)value; + if( value != null ) + thickness = ( double )value; - return new Thickness(thickness); - } + return new Thickness( thickness ); } + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs index f434aea73..f6d963145 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -19,7 +19,6 @@ using System.Globalization; using System.Windows; using System.Windows.Data; -using Xceed.Wpf.Toolkit.Core; namespace Xceed.Wpf.Toolkit.Core.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs index 01a010135..4f7eda319 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,12 +16,9 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Globalization; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Core.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs index ff3dc883f..eb9868ee6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,8 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Globalization; +using System.Windows.Data; using System.Windows.Media; namespace Xceed.Wpf.Toolkit.Core.Converters diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs index 2fedb13ac..2b12e40c7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -28,11 +28,11 @@ public object Convert( object[] values, Type targetType, object parameter, Syste if( values == null || values.Length != 2 ) throw new ArgumentException( "Wrong number of arguments for WizardPageButtonVisibilityConverter." ); - Visibility wizardVisibility = ( (values[ 0 ] == null) || (values[ 0 ] == DependencyProperty.UnsetValue) ) + Visibility wizardVisibility = ( ( values[ 0 ] == null ) || ( values[ 0 ] == DependencyProperty.UnsetValue ) ) ? Visibility.Hidden : ( Visibility )values[ 0 ]; - WizardPageButtonVisibility wizardPageVisibility = ( (values[ 1 ] == null) || (values[ 1 ] == DependencyProperty.UnsetValue) ) + WizardPageButtonVisibility wizardPageVisibility = ( ( values[ 1 ] == null ) || ( values[ 1 ] == DependencyProperty.UnsetValue ) ) ? WizardPageButtonVisibility.Hidden : ( WizardPageButtonVisibility )values[ 1 ]; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs index 34f34c0c3..7ff4d49d3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs index 06c3ee4df..b4b420784 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/GenericTextBlock.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/GenericTextBlock.cs index 55fa3e9b7..46409b21e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/GenericTextBlock.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/GenericTextBlock.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -20,7 +20,7 @@ namespace Xceed.Wpf.Toolkit.Core { - public class GenericTextBlock: TextBlock + public class GenericTextBlock : TextBlock { } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ImageUriExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ImageUriExtension.cs index b5e275c4f..01ba3b6cd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ImageUriExtension.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ImageUriExtension.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -29,7 +29,7 @@ public class ImageUriExtension : PackUriExtension /// /// Generate an absolute uri by default public ImageUriExtension() - :base( UriKind.Absolute ) + : base( UriKind.Absolute ) { } @@ -37,7 +37,7 @@ public ImageUriExtension() public override object ProvideValue( IServiceProvider serviceProvider ) { // Call base class - Uri uri = ( Uri ) base.ProvideValue( serviceProvider ); + Uri uri = ( Uri )base.ProvideValue( serviceProvider ); // Create a bitmap image object using the generated uri as the source BitmapImage image = new BitmapImage( uri ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs index 208d59b97..cbdeb21d2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs index 885be561c..64a0d33d4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs index 694f8ca20..e9911916a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - namespace Xceed.Wpf.Toolkit.Core.Input { public interface IValidateInput diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs index 731b1fbd9..38fe43954 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.Toolkit.Core.Input { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs index 866dca0dc..f224ea8f1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs index a71166034..f2f89dd43 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs index daf05fbf0..ec69c2626 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs index 532cc2391..d374fb58d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs index 92c492da0..f949c07c5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs index 9b5b7fbd0..2fcee4fa0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs index 426ebe3d2..6555773b2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,8 +18,8 @@ using System; using System.ComponentModel; using System.Runtime.InteropServices; -using Xceed.Wpf.Toolkit.Core.Utilities; using Xceed.Wpf.Toolkit.Core; +using Xceed.Wpf.Toolkit.Core.Utilities; namespace Xceed.Wpf.Toolkit.Media.Animation { @@ -99,11 +99,11 @@ public TimeSpan Duration if( this.HasDuration ) return TimeSpan.FromTicks( _duration ); - throw new InvalidOperationException( + throw new InvalidOperationException( string.Format( ErrorMessages.GetMessage( ErrorMessages.InvalidRatePropertyAccessed ), - "Duration", - this, + "Duration", + this, "Speed" ) ); } } @@ -131,11 +131,11 @@ public double Speed if( this.HasSpeed ) return _speed; - throw new InvalidOperationException( + throw new InvalidOperationException( string.Format( ErrorMessages.GetMessage( ErrorMessages.InvalidRatePropertyAccessed ), - "Speed", - this, + "Speed", + this, "Duration" ) ); } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs index 1428e4bf9..d3d598d14 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs index 8a6cbab0c..ab824665b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs index 1fd9a29ec..4d07b6a28 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs index cb5a51bc7..55b1ce912 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -33,9 +33,9 @@ public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, return type == typeof( IterativeEquation ); } - public override object ConvertFrom( + public override object ConvertFrom( ITypeDescriptorContext typeDescriptorContext, - CultureInfo cultureInfo, + CultureInfo cultureInfo, object value ) { IterativeEquation result = null; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs index 701577000..3011fa4ee 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs index 5550ea58d..8c7b7c0da 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs index 7014808f3..603bfb11d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Media; namespace Xceed.Wpf.Toolkit.Core.Media @@ -53,7 +50,7 @@ public static Color ColorizationColor { // If for any reason (for example, a SecurityException for XBAP apps) // we cannot read the value in the registry, fall back on some color. - _colorizationMode = Color.FromArgb(255, 175, 175, 175); + _colorizationMode = Color.FromArgb( 255, 175, 175, 175 ); } return _colorizationMode.Value; @@ -103,21 +100,21 @@ private static int GetDWMIntValue( string keyName ) #else , Microsoft.Win32.RegistryOptions.None ); #endif - return (int)subKey.GetValue( keyName ); + return ( int )subKey.GetValue( keyName ); #pragma warning restore CA1416 } private static Color GetDWMColorValue( string keyName ) { int value = WindowColors.GetDWMIntValue( keyName ); - byte[] bytes = BitConverter.GetBytes( value ); - return new Color() - { - B = bytes[ 0 ], - G = bytes[ 1 ], - R = bytes[ 2 ], - A = 255 - }; + byte[] bytes = BitConverter.GetBytes( value ); + return new Color() + { + B = bytes[ 0 ], + G = bytes[ 1 ], + R = bytes[ 2 ], + A = 255 + }; } private static bool GetDWMBoolValue( string keyName ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs index 09e0ed010..1de57afaf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -25,7 +25,7 @@ public class PackUriExtension : MarkupExtension { #region Constructors public PackUriExtension() - :this( UriKind.Relative ) + : this( UriKind.Relative ) { } @@ -41,8 +41,14 @@ public PackUriExtension( UriKind uriKind ) public string AssemblyName { - get { return this.m_assemblyName; } - set { this.m_assemblyName = value; } + get + { + return this.m_assemblyName; + } + set + { + this.m_assemblyName = value; + } } #endregion // AssemblyName Property @@ -51,8 +57,14 @@ public string AssemblyName public string Path { - get { return this.m_path; } - set { this.m_path = value; } + get + { + return this.m_path; + } + set + { + this.m_path = value; + } } #endregion // Path Property @@ -61,8 +73,14 @@ public string Path public UriKind Kind { - get { return this.m_uriKind; } - set { this.m_uriKind = value; } + get + { + return this.m_uriKind; + } + set + { + this.m_uriKind = value; + } } #endregion // Kind Property @@ -110,8 +128,25 @@ internal static string BuildRelativePackUriString( string assemblyName, string v string platformSuffix = String.Empty; - - +#if NETCORE + // If the assembly name doesn't already end with .NETCore + if( !assemblyName.EndsWith( ".NETCore", StringComparison.OrdinalIgnoreCase ) ) + { + /* In the .NET core version, all assembly names end with .NETCore. */ + + // Setup a suffix + platformSuffix = ".NETCore"; + } +#elif NET5 + // If the assembly name doesn't already end with .NET5 + if( !assemblyName.EndsWith( ".NET5", StringComparison.OrdinalIgnoreCase ) ) + { + /* In the .NET version, all assembly names end with .NET5. */ + + // Setup a suffix + platformSuffix = ".NET5"; + } +#endif // NETCORE // If we have version information if( !String.IsNullOrEmpty( version ) ) @@ -136,8 +171,25 @@ internal static string BuildAbsolutePackUriString( string assemblyName, string v string platformSuffix = String.Empty; bool hasAssemblyName = !String.IsNullOrEmpty( assemblyName ); - - +#if NETCORE + // If the assembly name doesn't already end with .NETCore + if( hasAssemblyName && !assemblyName.EndsWith( ".NETCore", StringComparison.OrdinalIgnoreCase ) ) + { + /* In the .NET core version, all assembly names end with .NETCore. */ + + // Setup a suffix + platformSuffix = ".NETCore"; + } +#elif NET5 + // If the assembly name doesn't already end with .NET5 + if( hasAssemblyName && !assemblyName.EndsWith( ".NET5", StringComparison.OrdinalIgnoreCase ) ) + { + /* In the .NET version, all assembly names end with .NET5. */ + + // Setup a suffix + platformSuffix = ".NET5"; + } +#endif // NETCORE // If we have an assembly name and version information if( hasAssemblyName && !String.IsNullOrEmpty( version ) ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs index 464351f12..3284735a2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs index b700fec54..e833037c6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs index d5f1637cb..01247e0bb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Text; namespace Xceed.Wpf.Toolkit.Core { @@ -35,7 +33,10 @@ public QueryTextFromValueEventArgs( object value, string text ) public object Value { - get { return m_value; } + get + { + return m_value; + } } #endregion Value Property @@ -46,8 +47,14 @@ public object Value public string Text { - get { return m_text; } - set { m_text = value; } + get + { + return m_text; + } + set + { + m_text = value; + } } #endregion Text Property diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs index e11fbc5bc..854e4d522 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,8 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Text; namespace Xceed.Wpf.Toolkit.Core { @@ -35,7 +33,10 @@ public QueryValueFromTextEventArgs( string text, object value ) public string Text { - get { return m_text; } + get + { + return m_text; + } } #endregion Text Property @@ -46,8 +47,14 @@ public string Text public object Value { - get { return m_value; } - set { m_value = value; } + get + { + return m_value; + } + set + { + m_value = value; + } } #endregion Value Property @@ -58,8 +65,14 @@ public object Value public bool HasParsingError { - get { return m_hasParsingError; } - set { m_hasParsingError = value; } + get + { + return m_hasParsingError; + } + set + { + m_hasParsingError = value; + } } #endregion HasParsingError Property diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs index 5b781d56e..4f3a116ee 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -28,7 +28,9 @@ public class ResourceDictionary : System.Windows.ResourceDictionary, ISupportIni private string _sourcePath; - public ResourceDictionary() { } + public ResourceDictionary() + { + } public ResourceDictionary( string assemblyName, string sourcePath ) { @@ -40,8 +42,11 @@ public ResourceDictionary( string assemblyName, string sourcePath ) public string AssemblyName { - get { return _assemblyName; } - set + get + { + return _assemblyName; + } + set { this.EnsureInitialization(); _assemblyName = value; @@ -50,11 +55,14 @@ public string AssemblyName public string SourcePath { - get { return _sourcePath; } - set + get + { + return _sourcePath; + } + set { this.EnsureInitialization(); - _sourcePath = value; + _sourcePath = value; } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs index af8ece1c3..08f02575a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs index d6d11323d..e04e2cd60 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -238,9 +238,9 @@ public static bool IsMemory( Calculator.CalculatorButtonType buttonType ) public static decimal ParseDecimal( string text ) { - decimal result; + decimal result; var success = Decimal.TryParse( text, NumberStyles.Any, CultureInfo.CurrentCulture, out result ); - return success ? result : decimal.Zero; + return success ? result : decimal.Zero; } public static decimal Add( decimal firstNumber, decimal secondNumber ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs index ed9f8bbd9..8dc626025 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Linq; -using System.Text; namespace Xceed.Wpf.Toolkit.Core.Utilities { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs index 3a5274e92..f07dc3878 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -182,7 +182,7 @@ public static Color ConvertHsvToRgb( double h, double s, double v ) } - return Color.FromArgb( 255, ( byte )( Math.Round(r * 255) ), ( byte )( Math.Round(g * 255) ), ( byte )( Math.Round(b * 255) ) ); + return Color.FromArgb( 255, ( byte )( Math.Round( r * 255 ) ), ( byte )( Math.Round( g * 255 ) ), ( byte )( Math.Round( b * 255 ) ) ); } /// @@ -194,7 +194,7 @@ public static List GenerateHsvSpectrum() var colorsList = new List(); int hStep = 60; - for( int h = 0; h < 360; h+= hStep ) + for( int h = 0; h < 360; h += hStep ) { colorsList.Add( ColorUtilities.ConvertHsvToRgb( h, 1, 1 ) ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs index 60d1befb3..4171a013a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -52,7 +52,7 @@ public static void OpenOnMouseLeftButtonClickChanged( DependencyObject sender, D private static void Control_PreviewMouseLeftButtonDown( object sender, System.Windows.Input.MouseButtonEventArgs e ) { var control = sender as FrameworkElement; - if( (control != null) && (control.ContextMenu != null) ) + if( ( control != null ) && ( control.ContextMenu != null ) ) { // Get PropertyItemBase parent var parent = VisualTreeHelper.GetParent( control ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs index 5c25aeff4..510eefad5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.Toolkit.Core.Utilities { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs index 025bc9f28..ad305dd05 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs index 1794ad331..bc0878c6c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs index 88093d856..593346f59 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,9 +18,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Windows.Media; using System.Windows; +using System.Windows.Media; namespace Xceed.Wpf.Toolkit.Core.Utilities { @@ -40,8 +39,8 @@ internal static IEnumerable Families // In WPF 4, this will throw an exception. var throwAcess = font.FamilyNames; } - catch - { + catch + { // It throws. Go to the next font family. continue; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs index a43d2a3fc..6ad6aab99 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,20 +15,16 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; -using System.Windows.Controls; using System.Windows.Data; -using System.Windows.Media; namespace Xceed.Wpf.Toolkit.Core.Utilities { internal sealed class GeneralUtilities : DependencyObject { - private GeneralUtilities() { } + private GeneralUtilities() + { + } #region StubValue attached property diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs index b02e3a7aa..fb2baa49d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Input; namespace Xceed.Wpf.Toolkit.Core.Utilities diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs index 79ec23bdb..1bf650317 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,8 @@ ***********************************************************************************/ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Text; -using Xceed.Wpf.Toolkit.PropertyGrid.Editors; namespace Xceed.Wpf.Toolkit.Core.Utilities { @@ -28,7 +25,7 @@ internal class ListUtilities { internal static bool IsListOfItems( Type listType ) { - return (ListUtilities.GetListItemType( listType ) != null); + return ( ListUtilities.GetListItemType( listType ) != null ); } internal static Type GetListItemType( Type listType ) @@ -53,17 +50,17 @@ internal static bool IsCollectionOfItems( Type colType ) internal static Type GetCollectionItemType( Type colType ) { Type iCollectionOfT = null; - var isCollectionOfT = colType.IsGenericType && (colType.GetGenericTypeDefinition() == typeof( ICollection<> ) ); + var isCollectionOfT = colType.IsGenericType && ( colType.GetGenericTypeDefinition() == typeof( ICollection<> ) ); if( isCollectionOfT ) { iCollectionOfT = colType; } else { - iCollectionOfT = colType.GetInterfaces().FirstOrDefault(( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( ICollection<> ) ); + iCollectionOfT = colType.GetInterfaces().FirstOrDefault( ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( ICollection<> ) ); } - return (iCollectionOfT != null) + return ( iCollectionOfT != null ) ? iCollectionOfT.GetGenericArguments()[ 0 ] : null; } @@ -75,8 +72,8 @@ internal static bool IsDictionaryOfItems( Type dictType ) internal static Type[] GetDictionaryItemsType( Type dictType ) { - var isDict = dictType.IsGenericType - && ((dictType.GetGenericTypeDefinition() == typeof( Dictionary<,>) ) || (dictType.GetGenericTypeDefinition() == typeof( IDictionary<,>) )); + var isDict = dictType.IsGenericType + && ( ( dictType.GetGenericTypeDefinition() == typeof( Dictionary<,> ) ) || ( dictType.GetGenericTypeDefinition() == typeof( IDictionary<,> ) ) ); return isDict ? new Type[] { dictType.GetGenericArguments()[ 0 ], dictType.GetGenericArguments()[ 1 ] } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs index e169d3387..154ba3ffc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs index 12c277c90..fa1be6dda 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.ComponentModel; using System.Linq.Expressions; @@ -28,9 +25,9 @@ internal static class PropertyChangedExt { #region Notify Methods - public static void Notify( + public static void Notify( this INotifyPropertyChanged sender, - PropertyChangedEventHandler handler, + PropertyChangedEventHandler handler, Expression> expression ) { if( sender == null ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs index 3018acfed..11e80b3c4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs index faa6bd37e..27de9d4b2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs index 9b860a78c..9c54c7ae9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs index d6045245d..ad61bdea5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs index fd6f66384..ca99d1a77 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs index 8327d10e4..03711d5f1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,8 @@ using System; using System.Windows; -using System.Windows.Media; using System.Windows.Controls.Primitives; +using System.Windows.Media; namespace Xceed.Wpf.Toolkit.Core.Utilities { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs index 7cd387504..c4c6e3860 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,8 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; using System.Collections; +using System.Windows; using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Core.Utilities @@ -60,7 +57,7 @@ private static void OnValueChanged( DependencyObject sender, DependencyPropertyC #region Constructor - public ValueChangeHelper(Action changeCallback) + public ValueChangeHelper( Action changeCallback ) { if( changeCallback == null ) throw new ArgumentNullException( "changeCallback" ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs index 6d089dce8..4f9bcdced 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs index 82f18a43b..469b77dd3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,28 +16,25 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; namespace Xceed.Wpf.Toolkit.Core.Utilities { internal class WeakEventListener : IWeakEventListener where TArgs : EventArgs { - private Action _callback; + private Action _callback; - public WeakEventListener(Action callback) + public WeakEventListener( Action callback ) { if( callback == null ) - throw new ArgumentNullException( "callback" ); + throw new ArgumentNullException( "callback" ); _callback = callback; } public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e ) { - _callback(sender, (TArgs)e); + _callback( sender, ( TArgs )e ); return true; } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs index 58fd54f59..aef6f5cd1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; namespace Xceed.Wpf.Toolkit.Core.Utilities diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs index 12517efe1..eed41160b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -22,10 +22,12 @@ namespace Xceed.Wpf.Toolkit.Core { public class VersionResourceDictionary : ResourceDictionary { - public VersionResourceDictionary() { } + public VersionResourceDictionary() + { + } public VersionResourceDictionary( string assemblyName, string sourcePath ) - :base( assemblyName, sourcePath ) + : base( assemblyName, sourcePath ) { } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs index 011a6d2bd..780283b44 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Collections; using System.Collections.Specialized; using Xceed.Wpf.Toolkit.Core.Utilities; @@ -89,12 +86,18 @@ void IList.Insert( int index, object value ) bool IList.IsFixedSize { - get { return _innerList.IsFixedSize; } + get + { + return _innerList.IsFixedSize; + } } bool IList.IsReadOnly { - get { return _innerList.IsReadOnly; } + get + { + return _innerList.IsReadOnly; + } } void IList.Remove( object value ) @@ -109,8 +112,14 @@ void IList.RemoveAt( int index ) object IList.this[ int index ] { - get { return _innerList[ index ]; } - set { _innerList[ index ] = value; } + get + { + return _innerList[ index ]; + } + set + { + _innerList[ index ] = value; + } } #endregion @@ -123,17 +132,26 @@ void ICollection.CopyTo( Array array, int index ) int ICollection.Count { - get { return _innerList.Count; } + get + { + return _innerList.Count; + } } bool ICollection.IsSynchronized { - get { return _innerList.IsSynchronized; } + get + { + return _innerList.IsSynchronized; + } } object ICollection.SyncRoot { - get { return _innerList.SyncRoot; } + get + { + return _innerList.SyncRoot; + } } #endregion diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs index 8c95d95ef..c090e8789 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs index 1232b8b47..bab02c82e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,12 +18,13 @@ using System; using System.Windows; using System.Windows.Controls; -using System.Windows.Input; using System.Windows.Controls.Primitives; -using Xceed.Wpf.Toolkit.Core.Utilities; -using Xceed.Wpf.Toolkit.Primitives; -using System.Windows.Shapes; +using System.Windows.Input; using System.Windows.Markup; +using System.Windows.Shapes; +using Xceed.Wpf.Toolkit.Primitives; +using System.Diagnostics; +using System.Windows.Media; #if VS2008 using Microsoft.Windows.Controls; using Microsoft.Windows.Controls.Primitives; @@ -67,6 +68,23 @@ public bool AutoCloseCalendar #endregion //AutoCloseCalendar + #region AutoCloseCalendarOnTimeSelection + + public static readonly DependencyProperty AutoCloseCalendarOnTimeSelectionProperty = DependencyProperty.Register( "AutoCloseCalendarOnTimeSelection", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false ) ); + public bool AutoCloseCalendarOnTimeSelection + { + get + { + return ( bool )GetValue( AutoCloseCalendarOnTimeSelectionProperty ); + } + set + { + SetValue( AutoCloseCalendarOnTimeSelectionProperty, value ); + } + } + + #endregion //AutoCloseCalendarOnTimeSelection + #region CalendarDisplayMode public static readonly DependencyProperty CalendarDisplayModeProperty = DependencyProperty.Register( "CalendarDisplayMode", typeof( CalendarMode ) @@ -75,7 +93,7 @@ public CalendarMode CalendarDisplayMode { get { - return (CalendarMode)GetValue( CalendarDisplayModeProperty ); + return ( CalendarMode )GetValue( CalendarDisplayModeProperty ); } set { @@ -135,7 +153,7 @@ public string TimeFormatString } } - private static bool IsTimeFormatStringValid(object value) + private static bool IsTimeFormatStringValid( object value ) { return DateTimeUpDown.IsFormatStringValid( value ); } @@ -149,7 +167,7 @@ public bool TimePickerAllowSpin { get { - return (bool)GetValue( TimePickerAllowSpinProperty ); + return ( bool )GetValue( TimePickerAllowSpinProperty ); } set { @@ -159,6 +177,48 @@ public bool TimePickerAllowSpin #endregion //TimePickerAllowSpin + #region TimePickerTimeListItemsStyle + + /// + /// TimePickerTimeListItemsStyle Dependency Property + /// + public static readonly DependencyProperty TimePickerTimeListItemsStyleProperty = DependencyProperty.Register( "TimePickerTimeListItemsStyle", typeof( Style ), typeof( DateTimePicker ), + new FrameworkPropertyMetadata( ( Style )null, new PropertyChangedCallback( OnTimePickerTimeListItemsStyleChanged ) ) ); + + /// + /// Gets or sets the TimePickerTimeListItemsStyle property. + /// This dependency property indicates the style to apply to TimeListItems objects. + /// + public Style TimePickerTimeListItemsStyle + { + get + { + return ( Style )GetValue( TimePickerTimeListItemsStyleProperty ); + } + set + { + SetValue( TimePickerTimeListItemsStyleProperty, value ); + } + } + + /// + /// Handles changes to the TimePickerTimeListItemsStyle property. + /// + private static void OnTimePickerTimeListItemsStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) + { + ( ( DateTimePicker )d ).OnTimePickerTimeListItemsStyleChanged( e ); + } + + /// + /// Provides derived classes an opportunity to handle changes to the TimePickerTimeListItemsStyle property. + /// + protected virtual void OnTimePickerTimeListItemsStyleChanged( DependencyPropertyChangedEventArgs e ) + { + // TODO: Add your property changed side-effects. Descendants can override as well. + } + + #endregion + #region TimePickerShowButtonSpinner public static readonly DependencyProperty TimePickerShowButtonSpinnerProperty = DependencyProperty.Register( "TimePickerShowButtonSpinner", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( true ) ); @@ -166,7 +226,7 @@ public bool TimePickerShowButtonSpinner { get { - return (bool)GetValue( TimePickerShowButtonSpinnerProperty ); + return ( bool )GetValue( TimePickerShowButtonSpinnerProperty ); } set { @@ -227,6 +287,11 @@ public DataTemplate TimeWatermarkTemplate #endregion //TimeWatermarkTemplate + + + + + #endregion //Properties #region Constructors @@ -239,6 +304,7 @@ static DateTimePicker() public DateTimePicker() { + EventManager.RegisterClassHandler( typeof( ListBoxItem ), PreviewMouseUpEvent, new RoutedEventHandler( PreviewMouseUpEventHandler ) ); } #endregion //Constructors @@ -271,7 +337,9 @@ public override void OnApplyTemplate() { _timePicker.ValueChanged -= this.TimePicker_ValueChanged; } + _timePicker = GetTemplateChild( PART_TimeUpDown ) as TimePicker; + if( _timePicker != null ) { _timePicker.ValueChanged += this.TimePicker_ValueChanged; @@ -280,27 +348,28 @@ public override void OnApplyTemplate() protected override void OnPreviewMouseUp( MouseButtonEventArgs e ) { - if( Mouse.Captured is CalendarItem) + if( Mouse.Captured is CalendarItem ) { Mouse.Capture( null ); // Do not close calendar on Year/Month Selection. Close only on Day selection. - if( AutoCloseCalendar && (_calendar != null) && ( _calendar.DisplayMode == CalendarMode.Month ) ) + if( AutoCloseCalendar && ( _calendar != null ) && ( _calendar.DisplayMode == CalendarMode.Month ) ) { ClosePopup( true ); } } + base.OnPreviewMouseUp( e ); } protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue ) { //The calendar only select the Date part, not the time part. - DateTime? newValueDate = (newValue != null) - ? newValue.Value.Date - : (DateTime?)null; + DateTime? newValueDate = ( newValue != null ) + ? newValue.Value.Date + : ( DateTime? )null; - if( _calendar != null && _calendar.SelectedDate != newValueDate) + if( _calendar != null && _calendar.SelectedDate != newValueDate ) { _isModifyingCalendarInternally = true; _calendar.SelectedDate = newValueDate; @@ -311,7 +380,7 @@ protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue ) //If we change any part of the datetime without //using the calendar when the actual date is temporary, //clear the temporary value. - if( (_calendar != null) && (_calendarTemporaryDateTime != null) && (newValue != _calendarTemporaryDateTime )) + if( ( _calendar != null ) && ( _calendarTemporaryDateTime != null ) && ( newValue != _calendarTemporaryDateTime ) ) { _calendarTemporaryDateTime = null; _calendarIntendedDateTime = null; @@ -360,6 +429,33 @@ protected override void OnMinimumChanged( DateTime? oldValue, DateTime? newValue #endregion //Base Class Overrides + #region Command Hanlders + + + + #endregion // Command Handlers + + #region Events + + #region Today Event + + public static readonly RoutedEvent TodayEvent = EventManager.RegisterRoutedEvent( "Today", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( DateTimePicker ) ); + public event RoutedEventHandler Today + { + add + { + AddHandler( TodayEvent, value ); + } + remove + { + RemoveHandler( TodayEvent, value ); + } + } + + #endregion //Cancel Event + + #endregion // Events + #region Event Handlers protected override void HandleKeyDown( object sender, KeyEventArgs e ) @@ -369,7 +465,7 @@ protected override void HandleKeyDown( object sender, KeyEventArgs e ) // Do not close the Calendar if the call is handled // by the TimePicker inside the DateTimePicker template. if( IsOpen - && ( _timePicker != null) + && ( _timePicker != null ) && _timePicker.IsKeyboardFocusWithin && ( _timePicker.IsOpen || e.Handled ) ) return; @@ -455,10 +551,10 @@ private void Calendar_SelectedDatesChanged( object sender, SelectionChangedEvent //} //else //{ - if( !_isModifyingCalendarInternally && !object.Equals( newDate, Value ) ) - { - this.Value = newDate; - } + if( !_isModifyingCalendarInternally && !object.Equals( newDate, Value ) ) + { + this.Value = newDate; + } //} } } @@ -490,6 +586,22 @@ protected override void Popup_Opened( object sender, EventArgs e ) } } + private void PreviewMouseUpEventHandler( object sender, RoutedEventArgs e ) + { + var item = sender as ListBoxItem; + + if( ( item != null ) && ( item.Content is TimeItem ) ) + { + Mouse.Capture( null ); + + // Do not close calendar on Year/Month Selection. Close only on Day selection. + if( AutoCloseCalendarOnTimeSelection && ( _calendar != null ) && ( _calendar.DisplayMode == CalendarMode.Month ) ) + { + ClosePopup( true ); + } + } + } + #endregion //Event Handlers #region Methods @@ -500,12 +612,12 @@ private void SetBlackOutDates() { _calendar.BlackoutDates.Clear(); - if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value >= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.AddDays(1) ) ) + if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value >= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.AddDays( 1 ) ) ) { DateTime minDate = this.Minimum.Value; _calendar.BlackoutDates.Add( new CalendarDateRange( System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime, minDate.AddDays( -1 ) ) ); } - if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value <= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime.AddDays(-1)) ) + if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value <= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime.AddDays( -1 ) ) ) { DateTime maxDate = this.Maximum.Value; _calendar.BlackoutDates.Add( new CalendarDateRange( maxDate.AddDays( 1 ), System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime ) ); @@ -513,6 +625,7 @@ private void SetBlackOutDates() } } + #endregion //Methods } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml index 3bca7df2b..996160137 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -33,7 +33,7 @@ - + - @@ -227,6 +226,7 @@ AllowSpin="{TemplateBinding TimePickerAllowSpin}" Step="{TemplateBinding Step}" ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}" + TimeListItemsStyle="{TemplateBinding TimePickerTimeListItemsStyle}" Watermark="{TemplateBinding TimeWatermark}" WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}" Visibility="{TemplateBinding TimePickerVisibility}" /> @@ -278,15 +278,15 @@ Value="{Binding ElementName=PART_TextBox}" /> - - - - - + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml index a1584947b..3834715ef 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -191,7 +191,7 @@ Height="{Binding DropDownButtonHeight, RelativeSource={RelativeSource TemplatedParent}}" Background="White" Focusable="False" - Content="{Binding DropDownButtonContent, RelativeSource={RelativeSource TemplatedParent}}" + Content="{Binding DropDownButtonContent, RelativeSource={RelativeSource TemplatedParent}}" IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource DateTimePickerToggleButtonStyle}" IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" @@ -251,6 +251,7 @@ AllowSpin="{TemplateBinding TimePickerAllowSpin}" Step="{TemplateBinding Step}" ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}" + TimeListItemsStyle="{TemplateBinding TimePickerTimeListItemsStyle}" Watermark="{TemplateBinding TimeWatermark}" WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}" Visibility="{TemplateBinding TimePickerVisibility}" /> @@ -285,18 +286,18 @@ Property="Content" Value="{Binding DropDownButtonDisabledContent, RelativeSource={RelativeSource TemplatedParent}}" /> - - - - - - - - + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs index 563722b22..1fe3574fb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs index 42a244cee..02abf4675 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs index 069cc8147..d68468f62 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -32,7 +32,7 @@ public static bool TryParse( string value, string format, DateTime currentDate, if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( format ) ) return false; - DateTimeParser.UpdateValueFormatForQuotes( ref value, ref format ); + DateTimeParser.UpdateValueFormatForQuotes( ref value, ref format ); var dateTimeString = ComputeDateTimeString( value, format, currentDate, cultureInfo, autoClipTimeParts ).Trim(); @@ -98,12 +98,12 @@ private static string ComputeDateTimeString( string dateTime, string format, Dat dateTimeParts.Add( currentString ); } currentformat = c.ToString(); - currentString = (i < dateTime.Length) ? dateTime[ i ].ToString() : ""; + currentString = ( i < dateTime.Length ) ? dateTime[ i ].ToString() : ""; } else { currentformat = string.Concat( currentformat, c ); - currentString = string.Concat( currentString, (i < dateTime.Length) ? dateTime[ i ] : '\0' ); + currentString = string.Concat( currentString, ( i < dateTime.Length ) ? dateTime[ i ] : '\0' ); } } if( !string.IsNullOrEmpty( currentformat ) ) @@ -116,7 +116,7 @@ private static string ComputeDateTimeString( string dateTime, string format, Dat //Auto-complete missing date parts if( dateTimeParts.Count < formats.Count ) { - while( dateTimeParts.Count != formats.Count ) + while( dateTimeParts.Count != formats.Count ) { dateTimeParts.Add( "0" ); } @@ -231,7 +231,7 @@ private static void UpdateSortableDateTimeString( ref string dateTime, ref strin else if( item.Contains( "y" ) ) { key = "Year"; - value = currentDate.Year.ToString("D4"); + value = currentDate.Year.ToString( "D4" ); } if( !dateParts.ContainsKey( key ) ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs index 0f305b159..14d17d24b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs index 212214e6d..8a6582f0d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -43,7 +43,7 @@ public bool AutoClipTimeParts { get { - return (bool)GetValue( AutoClipTimePartsProperty ); + return ( bool )GetValue( AutoClipTimePartsProperty ); } set { @@ -102,7 +102,7 @@ internal static bool IsFormatStringValid( object value ) try { // Test the format string if it is used. - CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.ToString( (string)value, CultureInfo.CurrentCulture ); + CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.ToString( ( string )value, CultureInfo.CurrentCulture ); } catch { @@ -121,14 +121,14 @@ private static void OnFormatStringChanged( DependencyObject o, DependencyPropert protected virtual void OnFormatStringChanged( string oldValue, string newValue ) { - FormatUpdated(); + FormatUpdated(); } #endregion //FormatString #region Kind - public static readonly DependencyProperty KindProperty = DependencyProperty.Register( "Kind", typeof( DateTimeKind ), typeof( DateTimeUpDown ), + public static readonly DependencyProperty KindProperty = DependencyProperty.Register( "Kind", typeof( DateTimeKind ), typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( DateTimeKind.Unspecified, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnKindChanged ) ); public DateTimeKind Kind { @@ -153,7 +153,7 @@ protected virtual void OnKindChanged( DateTimeKind oldValue, DateTimeKind newVal { //Upate the value based on kind. (Postpone to EndInit if not yet initialized) if( !_setKindInternal - && this.Value != null + && this.Value != null && this.IsInitialized ) { this.Value = this.ConvertToKind( this.Value.Value, newValue ); @@ -244,7 +244,7 @@ protected override void OnIncrement() { this.Increment( this.Step ); } - } + } protected override void OnDecrement() { @@ -329,7 +329,7 @@ protected override object OnCoerceValue( object newValue ) DateTime? value = ( DateTime? )base.OnCoerceValue( newValue ); //Let the initialized determine the final "kind" value. - if(value != null && this.IsInitialized) + if( value != null && this.IsInitialized ) { //Update kind based on value kind this.SetKindInternal( value.Value.Kind ); @@ -344,7 +344,7 @@ protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue ) //this only occurs when the user manually type in a value for the Value Property if( info == null ) - info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ]; + info = ( this.CurrentDateTimePart != DateTimePart.Other ) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ]; if( info == null ) info = _dateTimeInfoList[ 0 ]; @@ -678,7 +678,7 @@ protected override bool IsLowerThan( DateTime? value1, DateTime? value2 ) if( value1 == null || value2 == null ) return false; - return (value1.Value < value2.Value); + return ( value1.Value < value2.Value ); } protected override bool IsGreaterThan( DateTime? value1, DateTime? value2 ) @@ -686,7 +686,7 @@ protected override bool IsGreaterThan( DateTime? value1, DateTime? value2 ) if( value1 == null || value2 == null ) return false; - return (value1.Value > value2.Value); + return ( value1.Value > value2.Value ); } protected override void OnUpdateValueOnEnterKeyChanged( bool oldValue, bool newValue ) @@ -706,7 +706,7 @@ protected override void OnKeyDown( KeyEventArgs e ) } -#endregion //Base Class Overrides + #endregion //Base Class Overrides #region Methods @@ -875,7 +875,7 @@ internal string GetFormatString( DateTimeFormat dateTimeFormat ) //this only occurs when the user manually type in a value for the Value Property if( info == null ) - info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ]; + info = ( this.CurrentDateTimePart != DateTimePart.Other ) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ]; if( info == null ) info = _dateTimeInfoList[ 0 ]; @@ -887,45 +887,45 @@ internal string GetFormatString( DateTimeFormat dateTimeFormat ) { case DateTimePart.Year: { - result = ( ( DateTime )currentDateTime).AddYears( value ); + result = ( ( DateTime )currentDateTime ).AddYears( value ); break; } case DateTimePart.Month: case DateTimePart.MonthName: { - result = ( ( DateTime )currentDateTime).AddMonths( value ); + result = ( ( DateTime )currentDateTime ).AddMonths( value ); break; } case DateTimePart.Day: case DateTimePart.DayName: { - result = ( ( DateTime )currentDateTime).AddDays( value ); + result = ( ( DateTime )currentDateTime ).AddDays( value ); break; } case DateTimePart.Hour12: case DateTimePart.Hour24: { - result = ( ( DateTime )currentDateTime).AddHours( value ); + result = ( ( DateTime )currentDateTime ).AddHours( value ); break; } case DateTimePart.Minute: { - result = ( ( DateTime )currentDateTime).AddMinutes( value ); + result = ( ( DateTime )currentDateTime ).AddMinutes( value ); break; } case DateTimePart.Second: { - result = ( ( DateTime )currentDateTime).AddSeconds( value ); + result = ( ( DateTime )currentDateTime ).AddSeconds( value ); break; } case DateTimePart.Millisecond: { - result = ( ( DateTime )currentDateTime).AddMilliseconds( value ); + result = ( ( DateTime )currentDateTime ).AddMilliseconds( value ); break; } case DateTimePart.AmPmDesignator: { - result = ( ( DateTime )currentDateTime).AddHours( value * 12 ); + result = ( ( DateTime )currentDateTime ).AddHours( value * 12 ); break; } default: @@ -986,7 +986,7 @@ private DateTime ConvertToKind( DateTime dateTime, DateTimeKind kind ) //"ToLocalTime()" from an unspecified will assume // That the time was originaly Utc and affect the datetime value. // Just "Force" the "Kind" instead. - if( dateTime.Kind == DateTimeKind.Unspecified + if( dateTime.Kind == DateTimeKind.Unspecified || kind == DateTimeKind.Unspecified ) return DateTime.SpecifyKind( dateTime, kind ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml index 473c14120..b295b1a74 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml index ccf7aae0d..c86f94efe 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs index f58a3de36..e2cda0ffa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -21,7 +21,6 @@ using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; -using Xceed.Wpf.Toolkit.Primitives; using System.Windows.Media; using Xceed.Wpf.Toolkit.Core.Utilities; @@ -135,7 +134,7 @@ public PlacementMode DropDownPosition { get { - return (PlacementMode)GetValue( DropDownPositionProperty ); + return ( PlacementMode )GetValue( DropDownPositionProperty ); } set { @@ -221,7 +220,7 @@ public double MaxDropDownHeight { get { - return (double)GetValue( MaxDropDownHeightProperty ); + return ( double )GetValue( MaxDropDownHeightProperty ); } set { @@ -233,7 +232,7 @@ private static void OnMaxDropDownHeightChanged( DependencyObject o, DependencyPr { var dropDownButton = o as DropDownButton; if( dropDownButton != null ) - dropDownButton.OnMaxDropDownHeightChanged( (double)e.OldValue, (double)e.NewValue ); + dropDownButton.OnMaxDropDownHeightChanged( ( double )e.OldValue, ( double )e.NewValue ); } protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue ) @@ -376,7 +375,7 @@ private void OnKeyDown( object sender, KeyEventArgs e ) private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e ) { - if( (_popup != null) && !_popup.IsMouseDirectlyOver ) + if( ( _popup != null ) && !_popup.IsMouseDirectlyOver ) { this.CloseDropDown( true ); } @@ -397,7 +396,7 @@ private void Popup_Opened( object sender, EventArgs e ) // Set the focus on the content of the ContentPresenter. if( _contentPresenter != null ) { - _contentPresenter.MoveFocus(new TraversalRequest(FocusNavigationDirection.First)); + _contentPresenter.MoveFocus( new TraversalRequest( FocusNavigationDirection.First ) ); } } @@ -431,7 +430,7 @@ private void CloseDropDown( bool isFocusOnButton ) } ReleaseMouseCapture(); - if( isFocusOnButton && (this.Button != null) ) + if( isFocusOnButton && ( this.Button != null ) ) { Button.Focus(); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml index fdd9e4cd9..26f8572a8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml index 510f43c2d..66bc5a536 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs index 3da949524..8293c04ba 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml index 380be473a..b90da1b12 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml index 380be473a..b90da1b12 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs index 5f14984d2..0e6bca245 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs index 1d6f430bc..167259cf6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs index df3ede909..dd3cfb9ca 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -72,7 +72,7 @@ public bool IsUsingZoomOnMouseWheel { get { - return (bool)GetValue( IsUsingZoomOnMouseWheelProperty ); + return ( bool )GetValue( IsUsingZoomOnMouseWheelProperty ); } set { @@ -155,7 +155,7 @@ internal Rect ViewBox #region ZoomFactor - public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged), OnValidationCallback ); + public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged ), OnValidationCallback ); public double ZoomFactor { get @@ -195,7 +195,7 @@ public double ZoomFactorOnMouseWheel { get { - return (double)GetValue( ZoomFactorOnMouseWheelProperty ); + return ( double )GetValue( ZoomFactorOnMouseWheelProperty ); } set { @@ -205,13 +205,13 @@ public double ZoomFactorOnMouseWheel private static bool OnZoomFactorOnMouseWheelValidationCallback( object baseValue ) { - double zoomFactorOnMouseWheel = (double)baseValue; - return (zoomFactorOnMouseWheel >= 0); + double zoomFactorOnMouseWheel = ( double )baseValue; + return ( zoomFactorOnMouseWheel >= 0 ); } private static void OnZoomFactorOnMouseWheelPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) { - Magnifier m = (Magnifier)d; + Magnifier m = ( Magnifier )d; m.OnZoomFactorOnMouseWheelChanged( e ); } @@ -250,12 +250,12 @@ private void UpdateSizeFromRadius() if( this.FrameType == Toolkit.FrameType.Circle ) { double newSize = Radius * 2; - if(!DoubleHelper.AreVirtuallyEqual( Width, newSize )) + if( !DoubleHelper.AreVirtuallyEqual( Width, newSize ) ) { Width = newSize; } - if(!DoubleHelper.AreVirtuallyEqual( Height, newSize )) + if( !DoubleHelper.AreVirtuallyEqual( Height, newSize ) ) { Height = newSize; } @@ -302,9 +302,9 @@ private void UpdateViewBox() if( !IsInitialized ) return; - ViewBox = new Rect( - ViewBox.Location, - new Size( ActualWidth * ZoomFactor , ActualHeight * ZoomFactor ) ); + ViewBox = new Rect( + ViewBox.Location, + new Size( ActualWidth * ZoomFactor, ActualHeight * ZoomFactor ) ); } #endregion //Methods diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs index 7579deb14..4bb5b7a0d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -55,7 +55,7 @@ private void OnProcessInput( object sender, ProcessInputEventArgs e ) { Point pt = Mouse.GetPosition( this ); - if( (_currentMousePosition == pt) && (_magnifier.ZoomFactor == _currentZoomFactor) ) + if( ( _currentMousePosition == pt ) && ( _magnifier.ZoomFactor == _currentZoomFactor ) ) return; if( _magnifier.IsFrozen ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs index b034f68aa..8cd603b85 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -75,7 +75,7 @@ private void Element_MouseEnter( object sender, MouseEventArgs e ) private void Element_MouseWheel( object sender, MouseWheelEventArgs e ) { var magnifier = MagnifierManager.GetMagnifier( _element ) as Magnifier; - if( (magnifier != null) && magnifier.IsUsingZoomOnMouseWheel ) + if( ( magnifier != null ) && magnifier.IsUsingZoomOnMouseWheel ) { if( e.Delta < 0 ) { @@ -86,9 +86,9 @@ private void Element_MouseWheel( object sender, MouseWheelEventArgs e ) magnifier.SetCurrentValue( Magnifier.ZoomFactorProperty, newValue ); #endif } - else if ( e.Delta > 0 ) + else if( e.Delta > 0 ) { - var newValue = (magnifier.ZoomFactor >= magnifier.ZoomFactorOnMouseWheel) ? magnifier.ZoomFactor - magnifier.ZoomFactorOnMouseWheel : 0d; + var newValue = ( magnifier.ZoomFactor >= magnifier.ZoomFactorOnMouseWheel ) ? magnifier.ZoomFactor - magnifier.ZoomFactorOnMouseWheel : 0d; #if VS2008 magnifier.ZoomFactor = newValue; #else @@ -142,6 +142,6 @@ void HideAdorner() } } -#endregion //Methods + #endregion //Methods } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml index b827c1ab3..4ade1294e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs index 9a20d1c8a..b561677e7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,9 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Text; using System.ComponentModel; namespace Xceed.Wpf.Toolkit @@ -36,11 +33,14 @@ public AutoCompletingMaskEventArgs( MaskedTextProvider maskedTextProvider, int s #region MaskedTextProvider PROPERTY - private MaskedTextProvider m_maskedTextProvider; + private MaskedTextProvider m_maskedTextProvider; public MaskedTextProvider MaskedTextProvider { - get { return m_maskedTextProvider; } + get + { + return m_maskedTextProvider; + } } #endregion MaskedTextProvider PROPERTY @@ -51,7 +51,10 @@ public MaskedTextProvider MaskedTextProvider public int StartPosition { - get { return m_startPosition; } + get + { + return m_startPosition; + } } #endregion StartPosition PROPERTY @@ -62,7 +65,10 @@ public int StartPosition public int SelectionLength { - get { return m_selectionLength; } + get + { + return m_selectionLength; + } } #endregion SelectionLength PROPERTY @@ -73,7 +79,10 @@ public int SelectionLength public string Input { - get { return m_input; } + get + { + return m_input; + } } #endregion Input PROPERTY @@ -85,8 +94,14 @@ public string Input public int AutoCompleteStartPosition { - get { return m_autoCompleteStartPosition; } - set { m_autoCompleteStartPosition = value; } + get + { + return m_autoCompleteStartPosition; + } + set + { + m_autoCompleteStartPosition = value; + } } #endregion AutoCompleteStartPosition PROPERTY @@ -97,8 +112,14 @@ public int AutoCompleteStartPosition public string AutoCompleteText { - get { return m_autoCompleteText; } - set { m_autoCompleteText = value; } + get + { + return m_autoCompleteText; + } + set + { + m_autoCompleteText = value; + } } #endregion AutoCompleteText PROPERTY diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs index 74c92f7cd..f24b3e5e8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Text; - namespace Xceed.Wpf.Toolkit { public enum InsertKeyMode diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs index 265cdac8c..4ee3f15e5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Text; - namespace Xceed.Wpf.Toolkit { public enum MaskFormat diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs index 82c7bba47..b1005893a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,23 +17,17 @@ using System; using System.Collections.Generic; -using System.Text; -using System.Windows.Controls; -using System.Windows; -using System.Windows.Data; -using System.Collections.Specialized; using System.ComponentModel; -using System.Windows.Input; using System.Diagnostics; -using System.Windows.Documents; using System.Globalization; -using System.Windows.Controls.Primitives; using System.Reflection; - -using System.Collections; using System.Security; using System.Security.Permissions; -using System.Windows.Automation; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Documents; +using System.Windows.Input; using Xceed.Wpf.Toolkit.Primitives; namespace Xceed.Wpf.Toolkit @@ -1223,9 +1217,9 @@ private void ToggleInsertExecutedCallback( object sender, ExecutedRoutedEventArg m_insertToggled = !m_insertToggled; } -#endregion COMMANDS + #endregion COMMANDS -#region DRAG DROP + #region DRAG DROP private void PreviewQueryContinueDragCallback( object sender, QueryContinueDragEventArgs e ) { @@ -1258,10 +1252,10 @@ protected override void OnDragOver( DragEventArgs e ) base.OnDragOver( e ); } -#endregion DRAG DROP + #endregion DRAG DROP -#region VALUE FROM TEXT + #region VALUE FROM TEXT protected override bool QueryValueFromTextCore( string text, out object value ) { @@ -1284,9 +1278,9 @@ protected override bool QueryValueFromTextCore( string text, out object value ) return base.QueryValueFromTextCore( text, out value ); } -#endregion VALUE FROM TEXT + #endregion VALUE FROM TEXT -#region TEXT FROM VALUE + #region TEXT FROM VALUE protected override string QueryTextFromValueCore( object value ) { @@ -1305,10 +1299,10 @@ protected override string QueryTextFromValueCore( object value ) return base.QueryTextFromValueCore( value ); } -#endregion TEXT FROM VALUE + #endregion TEXT FROM VALUE -#region PROTECTED METHODS + #region PROTECTED METHODS protected virtual char[] GetMaskCharacters() { @@ -1349,7 +1343,7 @@ private MaskedTextProvider CreateMaskedTextProvider( string mask ) provider.IncludeLiterals = true; provider.IncludePrompt = true; - provider.IsPassword = false; + provider.IsPassword = false; return provider; } @@ -1439,10 +1433,10 @@ protected override void ValidateValue( object value ) } } -#endregion PROTECTED METHODS + #endregion PROTECTED METHODS -#region INTERNAL PROPERTIES + #region INTERNAL PROPERTIES internal bool IsForcingMask { @@ -1479,9 +1473,9 @@ internal override bool GetIsEditTextEmpty() return true; } -#endregion INTERNAL PROPERTIES + #endregion INTERNAL PROPERTIES -#region INTERNAL METHODS + #region INTERNAL METHODS internal override string GetCurrentText() { @@ -1595,9 +1589,9 @@ internal void ForceMask( string mask ) } } -#endregion INTERNAL METHODS + #endregion INTERNAL METHODS -#region PRIVATE PROPERTIES + #region PRIVATE PROPERTIES private bool IsOverwriteMode { @@ -1939,7 +1933,7 @@ private string GetFormattedString( MaskedTextProvider provider, string text ) { //System.Diagnostics.Debug.Assert( provider.EditPositionCount > 0 ); - bool includePrompt = ( !this.HidePromptOnLeave || this.IsFocused ); + bool includePrompt = ( !this.HidePromptOnLeave || this.IsFocused ); string displayString = provider.ToString( false, includePrompt, true, 0, m_maskedTextProvider.Length ); @@ -1966,9 +1960,9 @@ private string GetSelectedText() return m_maskedTextProvider.ToString( true, includePrompt, includeLiterals, this.SelectionStart, selectionLength ); } -#endregion PRIVATE METHODS + #endregion PRIVATE METHODS -#region PRIVATE FIELDS + #region PRIVATE FIELDS private MaskedTextProvider m_maskedTextProvider; // = null; private bool m_insertToggled; // = false; @@ -1979,6 +1973,6 @@ private string GetSelectedText() private string m_formatSpecifier; private MethodInfo m_valueToStringMethodInfo; // = null; -#endregion PRIVATE FIELDS + #endregion PRIVATE FIELDS } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs index feeab261a..bd72ae282 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -99,7 +99,10 @@ public MessageBox() protected Window Container { - get { return ( this.Parent as Window ); } + get + { + return ( this.Parent as Window ); + } } #endregion //Protected Properties @@ -215,7 +218,10 @@ public Style OkButtonStyle /// public MessageBoxResult MessageBoxResult { - get { return _dialogResult; } + get + { + return _dialogResult; + } } #endregion //MessageBoxResult @@ -313,7 +319,10 @@ public Style YesButtonStyle internal override bool AllowPublicIsActiveChange { - get { return false; } + get + { + return false; + } } /// @@ -404,7 +413,7 @@ internal override void UpdateBlockMouseInputsPanel() /// A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user. public static MessageBoxResult Show( string messageText ) { - return Show( messageText, string.Empty, MessageBoxButton.OK, (Style)null ); + return Show( messageText, string.Empty, MessageBoxButton.OK, ( Style )null ); } /// @@ -416,7 +425,7 @@ public static MessageBoxResult Show( string messageText ) /// A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user. public static MessageBoxResult Show( Window owner, string messageText ) { - return Show( owner, messageText, string.Empty, MessageBoxButton.OK, (Style) null ); + return Show( owner, messageText, string.Empty, MessageBoxButton.OK, ( Style )null ); } /// @@ -427,12 +436,12 @@ public static MessageBoxResult Show( Window owner, string messageText ) /// A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user. public static MessageBoxResult Show( string messageText, string caption ) { - return Show(messageText, caption, MessageBoxButton.OK, (Style)null); + return Show( messageText, caption, MessageBoxButton.OK, ( Style )null ); } public static MessageBoxResult Show( Window owner, string messageText, string caption ) { - return Show(owner, messageText, caption, (Style)null); + return Show( owner, messageText, caption, ( Style )null ); } public static MessageBoxResult Show( Window owner, string messageText, string caption, Style messageBoxStyle ) @@ -442,7 +451,7 @@ public static MessageBoxResult Show( Window owner, string messageText, string ca public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button ) { - return Show(messageText, caption, button, (Style)null); + return Show( messageText, caption, button, ( Style )null ); } /// @@ -461,7 +470,7 @@ public static MessageBoxResult Show( string messageText, string caption, Message public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button ) { - return Show(owner, messageText, caption, button, (Style)null); + return Show( owner, messageText, caption, button, ( Style )null ); } public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle ) @@ -472,7 +481,7 @@ public static MessageBoxResult Show( Window owner, string messageText, string ca public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon ) { - return Show(messageText, caption, button, icon, (Style)null); + return Show( messageText, caption, button, icon, ( Style )null ); } /// @@ -491,7 +500,7 @@ public static MessageBoxResult Show( string messageText, string caption, Message public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon ) { - return Show(owner, messageText, caption, button, icon, (Style)null); + return Show( owner, messageText, caption, button, icon, ( Style )null ); } public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle ) @@ -502,7 +511,7 @@ public static MessageBoxResult Show( Window owner, string messageText, string ca public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult ) { - return Show(messageText, caption, button, icon, defaultResult, (Style)null); + return Show( messageText, caption, button, icon, defaultResult, ( Style )null ); } /// /// Displays a message box that has a message and that returns a result. @@ -521,7 +530,7 @@ public static MessageBoxResult Show( string messageText, string caption, Message public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult ) { - return Show(owner, messageText, caption, button, icon, defaultResult, (Style) null); + return Show( owner, messageText, caption, button, icon, defaultResult, ( Style )null ); } @@ -829,7 +838,7 @@ private static MessageBoxResult ShowCore( Window owner, IntPtr ownerHandle, stri throw new InvalidOperationException( "Static methods for MessageBoxes are not available in XBAP. Use the instance ShowMessageBox methods instead." ); } - if( (owner != null) && (ownerHandle != IntPtr.Zero) ) + if( ( owner != null ) && ( ownerHandle != IntPtr.Zero ) ) { throw new NotSupportedException( "The owner of a MessageBox can't be both a Window and a WindowHandle." ); } @@ -871,7 +880,7 @@ private static Window ComputeOwnerWindow() } ) ); } - } + } return result; } @@ -1122,7 +1131,7 @@ private void OnClose() private void MessageBox_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e ) { - if( (bool)e.NewValue ) + if( ( bool )e.NewValue ) { Action action = () => { @@ -1201,6 +1210,6 @@ private void ExecuteCopy( object sender, ExecutedRoutedEventArgs e ) } } -#endregion COMMANDS + #endregion COMMANDS } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs index c8ad5a197..179fdfbaf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml index d62d936f6..aa424421f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml index 036440804..9fd86051b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs index 2da812579..0ffcaccd0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml index a57ba8c68..f3f8b8762 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml index 169abf15e..f894f913f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs index a68bf856a..e221737f1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs index 7ca7cfd06..1d724d4e0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -27,7 +27,7 @@ public class ByteUpDown : CommonNumericUpDown static ByteUpDown() { UpdateMetadata( typeof( ByteUpDown ), ( byte )1, byte.MinValue, byte.MaxValue ); - MaxLengthProperty.OverrideMetadata( typeof(ByteUpDown), new FrameworkPropertyMetadata( 3 ) ); + MaxLengthProperty.OverrideMetadata( typeof( ByteUpDown ), new FrameworkPropertyMetadata( 3 ) ); } public ByteUpDown() diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs index bac6a64c1..524626dfb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,10 @@ ***********************************************************************************/ using System; -using System.Windows; using System.Globalization; using System.IO; using System.Linq; +using System.Windows; namespace Xceed.Wpf.Toolkit { @@ -63,8 +63,14 @@ private set public NumberStyles ParsingNumberStyle { - get { return ( NumberStyles )GetValue( ParsingNumberStyleProperty ); } - set { SetValue( ParsingNumberStyleProperty, value ); } + get + { + return ( NumberStyles )GetValue( ParsingNumberStyleProperty ); + } + set + { + SetValue( ParsingNumberStyleProperty, value ); + } } #endregion //ParsingNumberStyle @@ -154,7 +160,7 @@ private bool IsGreaterThan( T? value1, T? value2 ) private bool HandleNullSpin() { var hasValue = this.UpdateValueOnEnterKey - ? (this.ConvertTextToValue( this.TextBox.Text ) != null) + ? ( this.ConvertTextToValue( this.TextBox.Text ) != null ) : this.Value.HasValue; if( !hasValue ) @@ -166,10 +172,10 @@ private bool HandleNullSpin() { this.TextBox.Text = newValue.Value.ToString( this.FormatString, this.CultureInfo ); } - else + else { this.Value = newValue; - } + } return true; } @@ -304,9 +310,9 @@ protected override void SetValidSpinDirection() ValidSpinDirections validDirections = ValidSpinDirections.None; // Null increment always prevents spin. - if( (this.Increment != null) && !IsReadOnly ) + if( ( this.Increment != null ) && !IsReadOnly ) { - if( IsLowerThan( Value, Maximum ) || !Value.HasValue || !Maximum.HasValue) + if( IsLowerThan( Value, Maximum ) || !Value.HasValue || !Maximum.HasValue ) validDirections = validDirections | ValidSpinDirections.Increase; if( IsGreaterThan( Value, Minimum ) || !Value.HasValue || !Minimum.HasValue ) @@ -323,14 +329,25 @@ private bool IsPercent( string stringToTest ) if( PIndex >= 0 ) { //stringToTest contains a "P" between 2 "'", it's considered as text, not percent - bool isText = (stringToTest.Substring( 0, PIndex ).Contains( "'" ) - && stringToTest.Substring( PIndex, FormatString.Length - PIndex ).Contains( "'" )); + bool isText = ( stringToTest.Substring( 0, PIndex ).Contains( "'" ) + && stringToTest.Substring( PIndex, FormatString.Length - PIndex ).Contains( "'" ) ); return !isText; } return false; } + private bool CultureContainsCharacter( char c ) + { + NumberFormatInfo info = NumberFormatInfo.GetInstance( this.CultureInfo ); + var charString = c.ToString(); + + return info.GetType().GetProperties() + .Where( p => p.PropertyType == typeof( string ) ) + .Select( p => ( string )p.GetValue( info, null ) ) + .Any( value => !string.IsNullOrEmpty( value ) && value == charString ); + } + private T? ConvertTextToValueCore( string currentValueText, string text ) { T? result; @@ -360,10 +377,26 @@ private bool IsPercent( string stringToTest ) // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again. if( currentValueTextSpecialCharacters.Except( textSpecialCharacters ).ToList().Count == 0 ) { - foreach( var character in textSpecialCharacters ) + var numericValue = new string( text.Where( c => char.IsDigit( c ) || this.CultureContainsCharacter( c ) ).ToArray() ); + decimal number; + if( Decimal.TryParse( numericValue, this.ParsingNumberStyle, CultureInfo, out number ) ) + { + foreach( var character in textSpecialCharacters ) + { + if( !this.CultureContainsCharacter( character ) ) + { + text = text.Replace( character.ToString(), string.Empty ); + } + } + } + else { - text = text.Replace( character.ToString(), string.Empty ); + foreach( var character in textSpecialCharacters ) + { + text = text.Replace( character.ToString(), string.Empty ); + } } + // if without the special characters, parsing is good, do not throw if( _fromText( text, this.ParsingNumberStyle, CultureInfo, out outputValue ) ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs index df09bb58d..eacee1570 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ***********************************************************************************/ using System; -using System.Windows; namespace Xceed.Wpf.Toolkit { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs index be2479dc0..516daeba9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,6 @@ using System; using System.Windows; -using System.Globalization; -using System.IO; namespace Xceed.Wpf.Toolkit { @@ -48,8 +46,14 @@ public DoubleUpDown() public AllowedSpecialValues AllowInputSpecialValues { - get { return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); } - set { SetValue( AllowInputSpecialValuesProperty, value ); } + get + { + return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); + } + set + { + SetValue( AllowInputSpecialValuesProperty, value ); + } } #endregion //AllowInputSpecialValues diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs index e24c9b76d..c1e809630 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ***********************************************************************************/ using System; -using System.Windows; namespace Xceed.Wpf.Toolkit { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs index df661686c..c0009da22 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ***********************************************************************************/ using System; -using System.Windows; namespace Xceed.Wpf.Toolkit { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs index 3a5444bd2..eedd139bc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -87,7 +87,7 @@ private static object OnCoerceFormatString( DependencyObject o, object baseValue { NumericUpDown numericUpDown = o as NumericUpDown; if( numericUpDown != null ) - return numericUpDown.OnCoerceFormatString( (string)baseValue ); + return numericUpDown.OnCoerceFormatString( ( string )baseValue ); return baseValue; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs index 314653864..15f8765d7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs index c4236e410..8658bfa90 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,7 +16,6 @@ ***********************************************************************************/ using System; -using System.Windows; namespace Xceed.Wpf.Toolkit { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs index 08c2ccf27..c16711e8a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,6 @@ using System; using System.Windows; -using System.Globalization; -using System.IO; namespace Xceed.Wpf.Toolkit { @@ -47,8 +45,14 @@ public SingleUpDown() public AllowedSpecialValues AllowInputSpecialValues { - get { return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); } - set { SetValue( AllowInputSpecialValuesProperty, value ); } + get + { + return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); + } + set + { + SetValue( AllowInputSpecialValuesProperty, value ); + } } #endregion //AllowInputSpecialValues diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs index 557baa2ee..214fceb32 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,10 @@ ***********************************************************************************/ using System; -using System.Windows; namespace Xceed.Wpf.Toolkit { - [CLSCompliantAttribute(false)] + [CLSCompliantAttribute( false )] public class UIntegerUpDown : CommonNumericUpDown { #region Constructors diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs index 96565a1f0..39e17b5d4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs index ecbcc3d35..1684c5ca2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml index 0b75c0310..2a8171d68 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml index d117f2a00..5aa61f7fe 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs index d249b1101..5a6d9cbfd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -23,7 +23,7 @@ namespace Xceed.Wpf.Toolkit.Obselete { - [Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", false)] + [Obsolete( "Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", false )] public class MaskedTextBox : TextBox { #region Members diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs index ac1603da7..75183d981 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs index fcf2798a4..d7efc0d9b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,7 +18,6 @@ using System; using System.ComponentModel; using System.Globalization; -using Xceed.Wpf.Toolkit.Panels; namespace Xceed.Wpf.Toolkit.Panels { @@ -35,7 +34,7 @@ public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, || ( type == typeof( DoubleAnimator ) ); } - public override object ConvertFrom( + public override object ConvertFrom( ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value ) { IterativeAnimator result = null; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs index 810ea3ef9..f2ca62869 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs index 3a4994882..fb5bf9ef8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs index 9adade6b2..f8cc58fc9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs index 68ee86657..10d8b44df 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs index e3586e203..7dc78cea2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs index 15aa6c882..9e5b102de 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs index ebabe6b45..fbe886142 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs index 2e69d20c8..e68ab89ac 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs index de58791f1..52a73d8eb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs index a8cf86491..4a1e7e6c7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs index c84bf9e9f..a8c7c5829 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,8 +18,8 @@ using System; using System.ComponentModel; using System.Windows; -using Xceed.Wpf.Toolkit.Media.Animation; using Xceed.Wpf.Toolkit.Core; +using Xceed.Wpf.Toolkit.Media.Animation; namespace Xceed.Wpf.Toolkit.Panels { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs index 496db17b6..4c24492dc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs index 6967aeb9c..a0055f052 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs index 836d2db9e..9ed3a4842 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs index 55eb4309e..d473a1829 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -23,12 +23,10 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; -using System.Windows.Documents; using System.Windows.Media; using System.Windows.Threading; -using Xceed.Wpf.Toolkit.Primitives; -using Xceed.Wpf.Toolkit.Media.Animation; using Xceed.Wpf.Toolkit.Core.Utilities; +using Xceed.Wpf.Toolkit.Media.Animation; namespace Xceed.Wpf.Toolkit.Panels { @@ -118,7 +116,7 @@ protected virtual void OnActiveLayoutChanged( DependencyPropertyChangedEventArgs this.RaiseActiveLayoutChangedEvent(); this.Dispatcher.BeginInvoke( DispatcherPriority.Normal, - ( ThreadStart )delegate() + ( ThreadStart )delegate () { this.UpdateSwitchTemplate(); } ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs index f898c1819..fc244f28a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -45,7 +45,7 @@ public SwitchPresenter() // Using a DependencyProperty as the backing store for DelaySwitch. This enables animation, styling, binding, etc... public static readonly DependencyProperty DelaySwitchProperty = - DependencyProperty.Register( "DelaySwitch", typeof( bool ), typeof( SwitchPresenter ), + DependencyProperty.Register( "DelaySwitch", typeof( bool ), typeof( SwitchPresenter ), new UIPropertyMetadata( false ) ); public bool DelaySwitch @@ -87,7 +87,7 @@ public DispatcherPriority DelayPriority internal static readonly DependencyProperty SwitchParentProperty = DependencyProperty.Register( "SwitchParent", typeof( SwitchPanel ), typeof( SwitchPresenter ), - new FrameworkPropertyMetadata( null, + new FrameworkPropertyMetadata( null, new PropertyChangedCallback( SwitchPresenter.OnSwitchParentChanged ) ) ); internal SwitchPanel SwitchParent @@ -249,7 +249,7 @@ private void DoSwapTemplate( DataTemplate template, bool beginAnimation ) { Dictionary newLocations = null; RoutedEventHandler onLoaded = null; - onLoaded = delegate( object sender, RoutedEventArgs e ) + onLoaded = delegate ( object sender, RoutedEventArgs e ) { FrameworkElement element = sender as FrameworkElement; element.Loaded -= onLoaded; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs index bccb1f707..e78782e1b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -28,7 +28,7 @@ public static class SwitchTemplate public static readonly DependencyProperty IDProperty = DependencyProperty.RegisterAttached( "ID", typeof( string ), typeof( SwitchTemplate ), - new FrameworkPropertyMetadata( null, + new FrameworkPropertyMetadata( null, new PropertyChangedCallback( SwitchTemplate.OnIDChanged ) ) ); public static string GetID( DependencyObject d ) @@ -54,7 +54,7 @@ private static void OnIDChanged( DependencyObject d, DependencyPropertyChangedEv else { d.Dispatcher.BeginInvoke( DispatcherPriority.Loaded, - ( ThreadStart )delegate() + ( ThreadStart )delegate () { parentPresenter = VisualTreeHelperEx.FindAncestorByType( d ); if( parentPresenter != null ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs index 537299686..52ed11415 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -30,7 +30,7 @@ public class WrapPanel : AnimationPanel public static readonly DependencyProperty OrientationProperty = StackPanel.OrientationProperty.AddOwner( typeof( WrapPanel ), - new FrameworkPropertyMetadata( Orientation.Horizontal, + new FrameworkPropertyMetadata( Orientation.Horizontal, new PropertyChangedCallback( WrapPanel.OnOrientationChanged ) ) ); public Orientation Orientation @@ -104,7 +104,7 @@ public double ItemHeight public static readonly DependencyProperty IsStackReversedProperty = DependencyProperty.Register( "IsChildOrderReversed", typeof( bool ), typeof( WrapPanel ), - new FrameworkPropertyMetadata( false, + new FrameworkPropertyMetadata( false, new PropertyChangedCallback( WrapPanel.OnInvalidateMeasure ) ) ); public bool IsChildOrderReversed diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs index eac124bd9..d385d08c4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -19,9 +19,9 @@ using System.Collections.Specialized; using System.Windows; using System.Windows.Media; -using Xceed.Wpf.Toolkit.Primitives; using Xceed.Wpf.Toolkit.Core; using Xceed.Wpf.Toolkit.Core.Utilities; +using Xceed.Wpf.Toolkit.Primitives; namespace Xceed.Wpf.Toolkit { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs index 44fd138d8..0497bcec8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml index 154978010..92b55ed7c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml index 4f92e434a..4f11606a1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs index 9d9ccf37c..ce93af512 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.Primitives @@ -38,10 +35,22 @@ public CachedTextInfo( TextBox textBox ) { } - public string Text { get; private set; } - public int CaretIndex { get; private set; } - public int SelectionStart { get; private set; } - public int SelectionLength { get; private set; } + public string Text + { + get; private set; + } + public int CaretIndex + { + get; private set; + } + public int SelectionStart + { + get; private set; + } + public int SelectionLength + { + get; private set; + } #region ICloneable Members diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs index b339eb879..8954e4286 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,8 +18,8 @@ using System; using System.Windows; using System.Windows.Controls; -using System.Windows.Input; using System.Windows.Controls.Primitives; +using System.Windows.Input; using Xceed.Wpf.Toolkit.Core.Utilities; #if VS2008 using Microsoft.Windows.Controls; @@ -49,7 +49,7 @@ public object DropDownButtonContent { get { - return (object)GetValue( DropDownButtonContentProperty ); + return ( object )GetValue( DropDownButtonContentProperty ); } set { @@ -66,7 +66,7 @@ public object DropDownButtonDisabledContent { get { - return (object)GetValue( DropDownButtonDisabledContentProperty ); + return ( object )GetValue( DropDownButtonDisabledContentProperty ); } set { @@ -83,7 +83,7 @@ public double DropDownButtonHeight { get { - return (double)GetValue( DropDownButtonHeightProperty ); + return ( double )GetValue( DropDownButtonHeightProperty ); } set { @@ -100,7 +100,7 @@ public double DropDownButtonWidth { get { - return (double)GetValue( DropDownButtonWidthProperty ); + return ( double )GetValue( DropDownButtonWidthProperty ); } set { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs index 9a26e7b70..0d5e1d0c3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,12 +18,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Windows; using System.Windows.Data; using System.Windows.Input; using System.Windows.Threading; -using Xceed.Wpf.Toolkit.Primitives; namespace Xceed.Wpf.Toolkit.Primitives { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs index 3951f47ba..dce88f934 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs index 8c56d84c3..c9b3a62f5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs index 1ba5aa4bc..5c9383660 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - namespace Xceed.Wpf.Toolkit.Primitives { /// diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs index e7eda06b3..69c97a167 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,10 @@ ***********************************************************************************/ +using System.Collections.Generic; using System.Collections.Specialized; -using System.Windows; using System.Linq; -using System.Collections.Generic; +using System.Windows; namespace Xceed.Wpf.Toolkit.Primitives { @@ -35,6 +35,35 @@ public class SelectAllSelector : Selector #region Properties + #region AllItemsSelectedContent + + public static readonly DependencyProperty AllItemsSelectedContentProperty = DependencyProperty.Register( "AllItemsSelectedContent", typeof( string ), typeof( SelectAllSelector ) + , new UIPropertyMetadata( "All", OnAllItemsSelectedContentChanged ) ); + public string AllItemsSelectedContent + { + get + { + return ( string )GetValue( AllItemsSelectedContentProperty ); + } + set + { + SetValue( AllItemsSelectedContentProperty, value ); + } + } + + private static void OnAllItemsSelectedContentChanged( DependencyObject o, DependencyPropertyChangedEventArgs e ) + { + var selectAllSelector = o as SelectAllSelector; + if( selectAllSelector != null ) + selectAllSelector.OnAllItemsSelectedContentChanged( ( string )e.OldValue, ( string )e.NewValue ); + } + + protected virtual void OnAllItemsSelectedContentChanged( string oldValue, string newValue ) + { + } + + #endregion // SelectAllText + #region IsSelectAllActive public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register( "IsSelectAllActive", typeof( bool ), typeof( SelectAllSelector ), new UIPropertyMetadata( false, OnIsSelectAllActiveChanged ) ); @@ -115,7 +144,7 @@ public override void OnApplyTemplate() public void SelectAll() { - var currentSelectedItems = new List(this.SelectedItems as IEnumerable); + var currentSelectedItems = new List( this.SelectedItems as IEnumerable ); var items = this.ItemsCollection.Cast(); // Have a faster selection when there are more than 200 items. @@ -123,7 +152,7 @@ public void SelectAll() // Raise SelectionChanged for new selected items. var newSelectedItems = items.Except( currentSelectedItems ); - foreach ( var item in newSelectedItems) + foreach( var item in newSelectedItems ) { this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, true ) ); } @@ -136,7 +165,7 @@ public void UnSelectAll() this.SelectedItems.Clear(); // Raise SelectionChanged for selected items. - foreach (var item in currentSelectedItems) + foreach( var item in currentSelectedItems ) { this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, false ) ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs index 4e1e5b5fa..d060d8eb3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs index b8f0c5333..340246762 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,18 +17,15 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Collections.Specialized; using System.ComponentModel; using System.Linq; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; using System.Windows.Input; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Reflection; using Xceed.Wpf.Toolkit.Core.Utilities; -using System.Windows.Threading; namespace Xceed.Wpf.Toolkit.Primitives { @@ -511,7 +508,7 @@ protected object GetPathValue( object item, string propertyPath ) return ( prop != null ) ? prop.GetValue( item, null ) : null; - } + } } protected object GetItemValue( object item ) @@ -817,8 +814,8 @@ protected virtual void OnItemSelectionChanged( ItemSelectionChangedEventArgs arg protected virtual void OnItemSelectionChanging( ItemSelectionChangingEventArgs args ) { if( ItemSelectionChanging != null ) - { - ItemSelectionChanging( this, args ); + { + ItemSelectionChanging( this, args ); } } @@ -1072,7 +1069,7 @@ public ItemSelectionChangedEventArgs( RoutedEvent routedEvent, object source, ob } } - public delegate void ItemSelectionChangingEventHandler( object sender, ItemSelectionChangingEventArgs e ); + public delegate void ItemSelectionChangingEventHandler( object sender, ItemSelectionChangingEventArgs e ); public class ItemSelectionChangingEventArgs : CancelEventArgs { public bool NewIsSelected diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs index 4bd0042ff..dddbf2718 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs index 5826fae4e..99cea642a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml index b652a2dd7..af27d45b0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml index 6957981f5..b1a218800 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -314,7 +314,9 @@ TargetName="TitleText" /> - + + + @@ -337,7 +339,6 @@ Value="Center" /> - diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml index 7c821c548..62152a212 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml index 14292df88..af4d4b7bd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -307,7 +307,9 @@ TargetName="TitleText" /> - + + + @@ -330,7 +332,6 @@ Value="Center" /> - @@ -346,7 +347,6 @@ Property="HorizontalAlignment" Value="Center" /> - diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs index e2a75cf75..f274647b8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -27,7 +27,7 @@ public static class ResourceKeys public static readonly ComponentResourceKey ControlDisabledBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" ); public static readonly ComponentResourceKey ControlNormalBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" ); public static readonly ComponentResourceKey ControlMouseOverBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" ); - public static readonly ComponentResourceKey ControlSelectedBorderKey = new ComponentResourceKey(typeof(ResourceKeys), "ControlSelectedBorderKey"); + public static readonly ComponentResourceKey ControlSelectedBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlSelectedBorderKey" ); public static readonly ComponentResourceKey ControlFocusedBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" ); public static readonly ComponentResourceKey ButtonNormalOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs index 8eaa804fb..4ff4b43ac 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,14 +16,13 @@ ***********************************************************************************/ using System; +using System.Globalization; using System.Windows; using System.Windows.Controls; using System.Windows.Data; using System.Windows.Input; -using Xceed.Wpf.Toolkit.Core; -using Xceed.Wpf.Toolkit.Core.Input; -using System.Globalization; using System.Windows.Threading; +using Xceed.Wpf.Toolkit.Core.Input; namespace Xceed.Wpf.Toolkit.Primitives { @@ -75,7 +74,7 @@ public bool AllowSpin { get { - return (bool)GetValue( AllowSpinProperty ); + return ( bool )GetValue( AllowSpinProperty ); } set { @@ -92,7 +91,7 @@ public double ButtonSpinnerHeight { get { - return (double)GetValue( ButtonSpinnerHeightProperty ); + return ( double )GetValue( ButtonSpinnerHeightProperty ); } set { @@ -111,7 +110,7 @@ public Location ButtonSpinnerLocation { get { - return (Location)GetValue( ButtonSpinnerLocationProperty ); + return ( Location )GetValue( ButtonSpinnerLocationProperty ); } set { @@ -128,7 +127,7 @@ public DataTemplate ButtonSpinnerDownContentTemplate { get { - return (DataTemplate)GetValue( ButtonSpinnerDownContentTemplateProperty ); + return ( DataTemplate )GetValue( ButtonSpinnerDownContentTemplateProperty ); } set { @@ -145,7 +144,7 @@ public DataTemplate ButtonSpinnerDownDisabledContentTemplate { get { - return (DataTemplate)GetValue( ButtonSpinnerDownDisabledContentTemplateProperty ); + return ( DataTemplate )GetValue( ButtonSpinnerDownDisabledContentTemplateProperty ); } set { @@ -157,12 +156,12 @@ public DataTemplate ButtonSpinnerDownDisabledContentTemplate #region ButtonSpinnerUpContentTemplate - public static readonly DependencyProperty ButtonSpinnerUpContentTemplateProperty = DependencyProperty.Register( "ButtonSpinnerUpContentTemplate", typeof( DataTemplate), typeof( UpDownBase ), new UIPropertyMetadata( null ) ); + public static readonly DependencyProperty ButtonSpinnerUpContentTemplateProperty = DependencyProperty.Register( "ButtonSpinnerUpContentTemplate", typeof( DataTemplate ), typeof( UpDownBase ), new UIPropertyMetadata( null ) ); public DataTemplate ButtonSpinnerUpContentTemplate { get { - return (DataTemplate)GetValue( ButtonSpinnerUpContentTemplateProperty ); + return ( DataTemplate )GetValue( ButtonSpinnerUpContentTemplateProperty ); } set { @@ -179,7 +178,7 @@ public DataTemplate ButtonSpinnerUpDisabledContentTemplate { get { - return (DataTemplate)GetValue( ButtonSpinnerUpDisabledContentTemplateProperty ); + return ( DataTemplate )GetValue( ButtonSpinnerUpDisabledContentTemplateProperty ); } set { @@ -196,7 +195,7 @@ public double ButtonSpinnerWidth { get { - return (double)GetValue( ButtonSpinnerWidthProperty ); + return ( double )GetValue( ButtonSpinnerWidthProperty ); } set { @@ -215,7 +214,7 @@ public bool ClipValueToMinMax { get { - return (bool)GetValue( ClipValueToMinMaxProperty ); + return ( bool )GetValue( ClipValueToMinMaxProperty ); } set { @@ -234,7 +233,7 @@ public bool DisplayDefaultValueOnEmptyText { get { - return (bool)GetValue( DisplayDefaultValueOnEmptyTextProperty ); + return ( bool )GetValue( DisplayDefaultValueOnEmptyTextProperty ); } set { @@ -244,7 +243,7 @@ public bool DisplayDefaultValueOnEmptyText private static void OnDisplayDefaultValueOnEmptyTextChanged( DependencyObject source, DependencyPropertyChangedEventArgs args ) { - ((UpDownBase)source).OnDisplayDefaultValueOnEmptyTextChanged( (bool)args.OldValue, (bool)args.NewValue ); + ( ( UpDownBase )source ).OnDisplayDefaultValueOnEmptyTextChanged( ( bool )args.OldValue, ( bool )args.NewValue ); } private void OnDisplayDefaultValueOnEmptyTextChanged( bool oldValue, bool newValue ) @@ -266,7 +265,7 @@ public T DefaultValue { get { - return (T)GetValue( DefaultValueProperty ); + return ( T )GetValue( DefaultValueProperty ); } set { @@ -276,7 +275,7 @@ public T DefaultValue private static void OnDefaultValueChanged( DependencyObject source, DependencyPropertyChangedEventArgs args ) { - ((UpDownBase)source).OnDefaultValueChanged( (T)args.OldValue, (T)args.NewValue ); + ( ( UpDownBase )source ).OnDefaultValueChanged( ( T )args.OldValue, ( T )args.NewValue ); } private void OnDefaultValueChanged( T oldValue, T newValue ) @@ -298,7 +297,7 @@ public T Maximum { get { - return (T)GetValue( MaximumProperty ); + return ( T )GetValue( MaximumProperty ); } set { @@ -310,7 +309,7 @@ private static void OnMaximumChanged( DependencyObject o, DependencyPropertyChan { UpDownBase upDown = o as UpDownBase; if( upDown != null ) - upDown.OnMaximumChanged( (T)e.OldValue, (T)e.NewValue ); + upDown.OnMaximumChanged( ( T )e.OldValue, ( T )e.NewValue ); } protected virtual void OnMaximumChanged( T oldValue, T newValue ) @@ -325,7 +324,7 @@ private static object OnCoerceMaximum( DependencyObject d, object baseValue ) { UpDownBase upDown = d as UpDownBase; if( upDown != null ) - return upDown.OnCoerceMaximum( (T)baseValue ); + return upDown.OnCoerceMaximum( ( T )baseValue ); return baseValue; } @@ -346,7 +345,7 @@ public T Minimum { get { - return (T)GetValue( MinimumProperty ); + return ( T )GetValue( MinimumProperty ); } set { @@ -358,7 +357,7 @@ private static void OnMinimumChanged( DependencyObject o, DependencyPropertyChan { UpDownBase upDown = o as UpDownBase; if( upDown != null ) - upDown.OnMinimumChanged( (T)e.OldValue, (T)e.NewValue ); + upDown.OnMinimumChanged( ( T )e.OldValue, ( T )e.NewValue ); } protected virtual void OnMinimumChanged( T oldValue, T newValue ) @@ -373,7 +372,7 @@ private static object OnCoerceMinimum( DependencyObject d, object baseValue ) { UpDownBase upDown = d as UpDownBase; if( upDown != null ) - return upDown.OnCoerceMinimum( (T)baseValue ); + return upDown.OnCoerceMinimum( ( T )baseValue ); return baseValue; } @@ -401,7 +400,7 @@ public MouseWheelActiveTrigger MouseWheelActiveTrigger { get { - return (MouseWheelActiveTrigger)GetValue( MouseWheelActiveTriggerProperty ); + return ( MouseWheelActiveTrigger )GetValue( MouseWheelActiveTriggerProperty ); } set { @@ -424,7 +423,7 @@ public bool MouseWheelActiveOnFocus get { #pragma warning disable 618 - return (bool)GetValue( MouseWheelActiveOnFocusProperty ); + return ( bool )GetValue( MouseWheelActiveOnFocusProperty ); #pragma warning restore 618 } set @@ -439,7 +438,7 @@ private static void OnMouseWheelActiveOnFocusChanged( DependencyObject o, Depend { UpDownBase upDownBase = o as UpDownBase; if( upDownBase != null ) - upDownBase.MouseWheelActiveTrigger = ((bool)e.NewValue) + upDownBase.MouseWheelActiveTrigger = ( ( bool )e.NewValue ) ? MouseWheelActiveTrigger.FocusedMouseOver : MouseWheelActiveTrigger.MouseOver; } @@ -455,7 +454,7 @@ public bool ShowButtonSpinner { get { - return (bool)GetValue( ShowButtonSpinnerProperty ); + return ( bool )GetValue( ShowButtonSpinnerProperty ); } set { @@ -467,13 +466,13 @@ public bool ShowButtonSpinner #region UpdateValueOnEnterKey - public static readonly DependencyProperty UpdateValueOnEnterKeyProperty = DependencyProperty.Register( "UpdateValueOnEnterKey", typeof( bool ), typeof( UpDownBase ), + public static readonly DependencyProperty UpdateValueOnEnterKeyProperty = DependencyProperty.Register( "UpdateValueOnEnterKey", typeof( bool ), typeof( UpDownBase ), new FrameworkPropertyMetadata( false, OnUpdateValueOnEnterKeyChanged ) ); public bool UpdateValueOnEnterKey { get { - return (bool)GetValue( UpdateValueOnEnterKeyProperty ); + return ( bool )GetValue( UpdateValueOnEnterKeyProperty ); } set { @@ -496,13 +495,13 @@ protected virtual void OnUpdateValueOnEnterKeyChanged( bool oldValue, bool newVa #region Value - public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase ), + public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase ), new FrameworkPropertyMetadata( default( T ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, OnCoerceValue, false, UpdateSourceTrigger.PropertyChanged ) ); public T Value { get { - return (T)GetValue( ValueProperty ); + return ( T )GetValue( ValueProperty ); } set { @@ -525,7 +524,7 @@ private void SetValueInternal( T value ) private static object OnCoerceValue( DependencyObject o, object basevalue ) { - return ((UpDownBase)o).OnCoerceValue( basevalue ); + return ( ( UpDownBase )o ).OnCoerceValue( basevalue ); } protected virtual object OnCoerceValue( object newValue ) @@ -537,7 +536,7 @@ private static void OnValueChanged( DependencyObject o, DependencyPropertyChange { UpDownBase upDownBase = o as UpDownBase; if( upDownBase != null ) - upDownBase.OnValueChanged( (T)e.OldValue, (T)e.NewValue ); + upDownBase.OnValueChanged( ( T )e.OldValue, ( T )e.NewValue ); } protected virtual void OnValueChanged( T oldValue, T newValue ) @@ -693,9 +692,9 @@ private void OnSpinnerSpin( object sender, SpinEventArgs e ) { var activeTrigger = this.MouseWheelActiveTrigger; bool spin = !e.UsingMouseWheel; - spin |= (activeTrigger == MouseWheelActiveTrigger.MouseOver); - spin |= ( (TextBox != null) && TextBox.IsFocused && (activeTrigger == MouseWheelActiveTrigger.FocusedMouseOver)); - spin |= ( (TextBox != null) && TextBox.IsFocused && (activeTrigger == MouseWheelActiveTrigger.Focused) && (Mouse.Captured is Spinner)); + spin |= ( activeTrigger == MouseWheelActiveTrigger.MouseOver ); + spin |= ( ( TextBox != null ) && TextBox.IsFocused && ( activeTrigger == MouseWheelActiveTrigger.FocusedMouseOver ) ); + spin |= ( ( TextBox != null ) && TextBox.IsFocused && ( activeTrigger == MouseWheelActiveTrigger.Focused ) && ( Mouse.Captured is Spinner ) ); if( spin ) { @@ -769,9 +768,9 @@ protected override void OnInitialized( EventArgs e ) // To be sure that the value is not initialized, it should // have no local value, no binding, and equal to the default value. bool updateValueFromText = - (this.ReadLocalValue( ValueProperty ) == DependencyProperty.UnsetValue) - && (BindingOperations.GetBinding( this, ValueProperty ) == null) - && (object.Equals( this.Value, ValueProperty.DefaultMetadata.DefaultValue )); + ( this.ReadLocalValue( ValueProperty ) == DependencyProperty.UnsetValue ) + && ( BindingOperations.GetBinding( this, ValueProperty ) == null ) + && ( object.Equals( this.Value, ValueProperty.DefaultMetadata.DefaultValue ) ); this.SyncTextAndValueProperties( updateValueFromText, Text, !updateValueFromText ); } @@ -781,7 +780,7 @@ protected override void OnInitialized( EventArgs e ) /// internal void DoDecrement() { - if( Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease ) + if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease ) { OnDecrement(); } @@ -792,7 +791,7 @@ internal void DoDecrement() /// internal void DoIncrement() { - if( Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase ) + if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase ) { OnIncrement(); } @@ -806,7 +805,7 @@ private void TextBox_TextChanged( object sender, TextChangedEventArgs e ) try { _isTextChangedFromUI = true; - Text = ((TextBox)sender).Text; + Text = ( ( TextBox )sender ).Text; } finally { @@ -816,7 +815,7 @@ private void TextBox_TextChanged( object sender, TextChangedEventArgs e ) private void UpDownBase_IsKeyboardFocusWithinChanged( object sender, DependencyPropertyChangedEventArgs e ) { - if( !(bool)e.NewValue ) + if( !( bool )e.NewValue ) { this.CommitInput(); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs index a7707c2f2..fba0b31fa 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,21 +16,13 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Text; -using System.Windows.Controls; -using System.Windows; -using System.Collections; -using System.Reflection; -using System.Windows.Input; -using System.Windows.Documents; -using System.Globalization; -using Microsoft.Win32; -using System.ComponentModel; using System.Collections.Specialized; +using System.ComponentModel; using System.Diagnostics; -using System.Windows.Automation; -using Xceed.Wpf.Toolkit; +using System.Globalization; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; using Xceed.Wpf.Toolkit.Core; using Xceed.Wpf.Toolkit.Core.Utilities; @@ -819,7 +811,7 @@ protected virtual bool QueryValueFromTextCore( string text, out object value ) { if( this.BeepOnError ) { - this.PlayBeep(); + this.PlayBeep(); } return false; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs index 3da46972f..d70881c5d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,8 +17,8 @@ using System; using System.Linq; -using System.Windows.Controls; using System.Windows; +using System.Windows.Controls; using System.Windows.Input; using System.Windows.Media; @@ -123,7 +123,7 @@ protected override Size MeasureOverride( Size constraint ) double height = double.IsNaN( this.Height ) ? this.Children.OfType().Max( ( w ) => w.Top + w.DesiredSize.Height ) : this.Height; - return new Size( Math.Min( width, constraint.Width), Math.Min( height, constraint.Height) ); + return new Size( Math.Min( width, constraint.Width ), Math.Min( height, constraint.Height ) ); } return size; @@ -316,7 +316,7 @@ private void CenterChild( WindowControl windowControl ) if( ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) ) { windowControl.Left = ( this.ActualWidth - windowControl.ActualWidth ) / 2.0; - windowControl.Left += (windowControl.Margin.Left - windowControl.Margin.Right); + windowControl.Left += ( windowControl.Margin.Left - windowControl.Margin.Right ); windowControl.Top = ( this.ActualHeight - windowControl.ActualHeight ) / 2.0; windowControl.Top += ( windowControl.Margin.Top - windowControl.Margin.Bottom ); } @@ -377,15 +377,15 @@ private void SetActiveWindow( WindowControl windowControl ) private bool IsModalWindow( WindowControl windowControl ) { - return ( ( ( windowControl is MessageBox ) && (windowControl.Visibility == Visibility.Visible) ) - || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal && ( ( ChildWindow )windowControl).WindowState == WindowState.Open ) ); + return ( ( ( windowControl is MessageBox ) && ( windowControl.Visibility == Visibility.Visible ) ) + || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal && ( ( ChildWindow )windowControl ).WindowState == WindowState.Open ) ); } private WindowControl GetModalWindow() { return this.Children.OfType() .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) ) - .FirstOrDefault( ( x ) => IsModalWindow( x ) && (x.Visibility == Visibility.Visible) ); + .FirstOrDefault( ( x ) => IsModalWindow( x ) && ( x.Visibility == Visibility.Visible ) ); } private double GetRestrictedLeft( WindowControl windowControl ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs index 24b3d508d..ce4ccf9c9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,23 +16,19 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Controls; +using System.IO; using System.Windows; -using System.Windows.Media; +using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; -using System.IO; +using System.Windows.Media; using Xceed.Wpf.Toolkit.Core; -using System.ComponentModel; namespace Xceed.Wpf.Toolkit.Primitives { [TemplatePart( Name = PART_HeaderThumb, Type = typeof( Thumb ) )] [TemplatePart( Name = PART_Icon, Type = typeof( Image ) )] - [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )] + [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )] [TemplatePart( Name = PART_ToolWindowCloseButton, Type = typeof( Button ) )] [TemplatePart( Name = PART_BlockMouseInputsBorder, Type = typeof( Border ) )] [TemplatePart( Name = PART_HeaderGrid, Type = typeof( Grid ) )] @@ -100,7 +96,7 @@ public double CaptionFontSize { get { - return (double)GetValue( CaptionFontSizeProperty ); + return ( double )GetValue( CaptionFontSizeProperty ); } set { @@ -398,6 +394,9 @@ protected virtual void OnTopPropertyChanged( double oldValue, double newValue ) + + + #region WindowBackground public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) ); @@ -572,7 +571,7 @@ internal bool IsBlockMouseInputsPanelActive { if( value != _IsBlockMouseInputsPanelActive ) { - _IsBlockMouseInputsPanelActive = value; + _IsBlockMouseInputsPanelActive = value; this.UpdateBlockMouseInputsPanel(); } } @@ -584,7 +583,10 @@ internal bool IsBlockMouseInputsPanelActive internal virtual bool AllowPublicIsActiveChange { - get { return true; } + get + { + return true; + } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs index 2881bf7e7..e8584680c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -37,7 +37,7 @@ [assembly: AssemblyCompany("Xceed Software Inc.")] [assembly: AssemblyProduct( "Xceed Toolkit for WPF" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )] +[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )] [assembly: AssemblyCulture( "" )] @@ -102,7 +102,11 @@ #pragma warning disable 1699 [assembly: AssemblyDelaySign( false )] +#if NETCORE || NET5 +[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )] +#else [assembly: AssemblyKeyFile( @"..\..\sn.snk" )] +#endif [assembly: AssemblyKeyName( "" )] #pragma warning restore 1699 diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs index 4cd511950..3856adba8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -73,7 +73,7 @@ public CategoryOrderAttribute() } public CategoryOrderAttribute( string categoryName, int order ) - :this() + : this() { CategoryValue = categoryName; Order = order; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryPropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryPropertyOrderAttribute.cs index 33a357944..cf2825c1a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryPropertyOrderAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryPropertyOrderAttribute.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs index d7a7097ee..6e1914255 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs index 5d412647a..1dc8595a5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs index 4486c2bbf..3c0252b18 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs index b783205fa..a71971437 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs index 02eee3a1c..d0451097d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs index 23b5d4c55..e85be03f0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -40,7 +40,7 @@ public override Style SelectStyle( object item, DependencyObject container ) { var group = item as CollectionViewGroup; // Category is not "Misc" => use regular ItemGroupStyle - if( (group.Name != null) && !group.Name.Equals( CategoryAttribute.Default.Category ) ) + if( ( group.Name != null ) && !group.Name.Equals( CategoryAttribute.Default.Category ) ) return this.ItemGroupStyle; // Category is "Misc" @@ -55,7 +55,7 @@ public override Style SelectStyle( object item, DependencyObject container ) if( itemsControl != null ) { // Category is "Misc" and this is the only category => use SingleDefaultCategoryItemGroupContainerStyle - if( (itemsControl.Items.Count > 0) && (itemsControl.Items.Groups.Count == 1) ) + if( ( itemsControl.Items.Count > 0 ) && ( itemsControl.Items.Groups.Count == 1 ) ) return this.SingleDefaultCategoryItemGroupStyle; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs index 3b4afa6a9..5d5d75d1f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs index 1db38e421..366b33ca5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs index 9d3310e5a..804aa3aa5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,13 +16,10 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Controls; using System.ComponentModel; -using Xceed.Wpf.Toolkit.Core.Utilities; using System.Globalization; +using System.Windows.Controls; +using Xceed.Wpf.Toolkit.Core.Utilities; namespace Xceed.Wpf.Toolkit.PropertyGrid { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs index ce766577b..9dbc1d81c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,16 +15,14 @@ ***********************************************************************************/ -using System.Collections.Generic; -using System.Collections; using System; -using System.Windows; +using System.Collections; using System.ComponentModel; -using Xceed.Wpf.Toolkit.Core.Utilities; -using System.Windows.Data; -using System.Diagnostics; +using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; +using System.Windows.Data; +using Xceed.Wpf.Toolkit.Core.Utilities; namespace Xceed.Wpf.Toolkit.PropertyGrid { @@ -32,7 +30,7 @@ internal abstract class ContainerHelperBase { protected readonly IPropertyContainer PropertyContainer; - public ContainerHelperBase(IPropertyContainer propertyContainer) + public ContainerHelperBase( IPropertyContainer propertyContainer ) { if( propertyContainer == null ) throw new ArgumentNullException( "propertyContainer" ); @@ -106,7 +104,7 @@ public virtual void ClearHelper() this.IsCleaning = false; } - public virtual void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item ) + public virtual void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item ) { // Initialize the parent node propertyItem.ParentNode = PropertyContainer; @@ -163,30 +161,44 @@ protected virtual void OnPropertyContainerPropertyChanged( object sender, Proper { this.OnHideInheritedPropertiesChanged(); } - else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.EditorDefinitions )) + else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.EditorDefinitions ) ) { this.OnEditorDefinitionsChanged(); } - else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.PropertyDefinitions )) + else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.PropertyDefinitions ) ) { this.OnPropertyDefinitionsChanged(); } } - protected virtual void OnCategorizationChanged() { } + protected virtual void OnCategorizationChanged() + { + } - protected virtual void OnFilterChanged() { } + protected virtual void OnFilterChanged() + { + } - protected virtual void OnAutoGeneratePropertiesChanged() { } + protected virtual void OnAutoGeneratePropertiesChanged() + { + } - protected virtual void OnHideInheritedPropertiesChanged() { } + protected virtual void OnHideInheritedPropertiesChanged() + { + } - protected virtual void OnEditorDefinitionsChanged() { } + protected virtual void OnEditorDefinitionsChanged() + { + } - protected virtual void OnPropertyDefinitionsChanged() { } + protected virtual void OnPropertyDefinitionsChanged() + { + } - public virtual void OnEndInit() { } + public virtual void OnEndInit() + { + } public abstract PropertyItemBase ContainerFromItem( object item ); @@ -194,8 +206,12 @@ protected virtual void OnPropertyContainerPropertyChanged( object sender, Proper public abstract Binding CreateChildrenDefaultBinding( PropertyItemBase propertyItem ); - public virtual void NotifyEditorDefinitionsCollectionChanged() { } - public virtual void NotifyPropertyDefinitionsCollectionChanged() { } + public virtual void NotifyEditorDefinitionsCollectionChanged() + { + } + public virtual void NotifyPropertyDefinitionsCollectionChanged() + { + } public abstract void UpdateValuesFromSource(); @@ -204,7 +220,7 @@ protected internal virtual void SetPropertiesExpansion( bool isExpanded ) foreach( var item in this.Properties ) { var propertyItem = item as PropertyItemBase; - if( (propertyItem != null) && propertyItem.IsExpandable ) + if( ( propertyItem != null ) && propertyItem.IsExpandable ) { if( propertyItem.ContainerHelper != null ) { @@ -220,7 +236,7 @@ protected internal virtual void SetPropertiesExpansion( string propertyName, boo foreach( var item in this.Properties ) { var propertyItem = item as PropertyItemBase; - if( (propertyItem != null) && propertyItem.IsExpandable ) + if( ( propertyItem != null ) && propertyItem.IsExpandable ) { if( propertyItem.DisplayName == propertyName ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs index e32301bb0..4edad8daf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -29,7 +29,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters /// public sealed class EditorTimeSpanConverter : IValueConverter { - public bool AllowNulls { get; set; } + public bool AllowNulls + { + get; set; + } object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs index 528a5cb21..4f3908e54 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs index 714207385..6a9e14e36 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,8 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; using System.ComponentModel; using System.Globalization; -using System.Linq; -using System.Text; using System.Windows.Data; namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs index d607d91e1..04e9ab976 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs index 7c7ca8cfc..a8b321060 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,12 +16,12 @@ ***********************************************************************************/ using System; +using System.Collections; using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; using System.Linq; using System.Text; -using System.ComponentModel; -using System.Collections; -using System.Collections.ObjectModel; namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs index 0ff1ed19f..d9265ac54 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,7 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; using System.Windows.Data; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs index 7a62ad9be..7846a8019 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -43,7 +43,7 @@ public object Convert( object[] values, Type targetType, object parameter, Cultu var editorIsReadOnlyPropertyInfo = editorType.GetProperty( "IsReadOnly" ); if( editorIsReadOnlyPropertyInfo != null ) { - if( !this.IsPropertySetLocally( editor, TextBoxBase.IsReadOnlyProperty ) ) + if( !this.IsPropertySetLocally( editor, TextBoxBase.IsReadOnlyProperty ) ) { // Set Editor.IsReadOnly to PropertyGrid.IsReadOnly & propertyItem.IsReadOnly. var isReadOnlyValue = isPropertyGridReadOnly.Value diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyNameTextTrimmingConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyNameTextTrimmingConverter.cs index 17bf9d925..9a56f62a0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyNameTextTrimmingConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyNameTextTrimmingConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -26,7 +26,7 @@ public class PropertyNameTextTrimmingConverter : IValueConverter public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) { var textWrapping = ( TextWrapping )value; - return (textWrapping == TextWrapping.NoWrap) ? TextTrimming.CharacterEllipsis : TextTrimming.None; + return ( textWrapping == TextWrapping.NoWrap ) ? TextTrimming.CharacterEllipsis : TextTrimming.None; } public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs index f58178bf7..bac25c9dd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,14 +16,11 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; -using System.Globalization; using System.ComponentModel; -using System.Windows; +using System.Globalization; +using System.Linq; using System.Reflection; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters { @@ -40,7 +37,7 @@ public object Convert( object value, Type targetType, object parameter, CultureI if( !( parameter is string ) ) throw new ArgumentException( SelectedObjectConverter.ValidParameterMessage ); - if( this.CompareParam(parameter, "Type") ) + if( this.CompareParam( parameter, "Type" ) ) { return this.ConvertToType( value, culture ); } @@ -58,7 +55,7 @@ public object Convert( object value, Type targetType, object parameter, CultureI } } - private bool CompareParam(object parameter, string parameterValue ) + private bool CompareParam( object parameter, string parameterValue ) { return string.Compare( ( string )parameter, parameterValue, true ) == 0; } @@ -86,8 +83,8 @@ private object ConvertToTypeName( object value, CultureInfo culture ) DisplayNameAttribute displayNameAttribute = newType.GetCustomAttributes( false ).OfType().FirstOrDefault(); - return (displayNameAttribute == null) - ? newType.Name + return ( displayNameAttribute == null ) + ? newType.Name : displayNameAttribute.DisplayName; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs index 295f5842b..ffdea5422 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,7 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; -using System.Windows.Data; namespace Xceed.Wpf.Toolkit.PropertyGrid { @@ -55,8 +51,14 @@ internal CustomPropertyItem( bool isPropertyGridCategorized, bool isSortedAlphab public string Category { - get { return ( string )GetValue( CategoryProperty ); } - set { SetValue( CategoryProperty, value ); } + get + { + return ( string )GetValue( CategoryProperty ); + } + set + { + SetValue( CategoryProperty, value ); + } } #endregion //Category diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs index dec32a54b..82403f431 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,16 +16,10 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Collections; -using System.Collections.ObjectModel; using System.ComponentModel; -using Xceed.Wpf.Toolkit.PropertyGrid.Converters; +using System.Linq.Expressions; using System.Windows; using Xceed.Wpf.Toolkit.Core.Utilities; -using System.Linq.Expressions; namespace Xceed.Wpf.Toolkit.PropertyGrid { @@ -35,7 +29,10 @@ public abstract class DefinitionBase : DependencyObject internal bool IsLocked { - get { return _isLocked; } + get + { + return _isLocked; + } } internal void ThrowIfLocked( Expression> propertyExpression ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs index 848959b45..ed4bf6842 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,15 +15,7 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Collections; using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; -using System.Windows.Data; namespace Xceed.Wpf.Toolkit.PropertyGrid { @@ -32,12 +24,15 @@ public abstract class EditorDefinitionBase : PropertyDefinitionBase internal EditorDefinitionBase() { } - internal FrameworkElement GenerateEditingElementInternal( PropertyItemBase propertyItem ) + internal FrameworkElement GenerateEditingElementInternal( PropertyItemBase propertyItem ) { return this.GenerateEditingElement( propertyItem ); } - protected virtual FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem ) { return null; } + protected virtual FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem ) + { + return null; + } internal void UpdateProperty( FrameworkElement element, DependencyProperty elementProp, DependencyProperty definitionProperty ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs index 0f46d6e1a..d0cb8fd74 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,10 +15,6 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; namespace Xceed.Wpf.Toolkit.PropertyGrid @@ -33,8 +29,14 @@ public class EditorTemplateDefinition : EditorDefinitionBase public DataTemplate EditingTemplate { - get { return ( DataTemplate )GetValue( EditingTemplateProperty ); } - set { SetValue( EditingTemplateProperty, value ); } + get + { + return ( DataTemplate )GetValue( EditingTemplateProperty ); + } + set + { + SetValue( EditingTemplateProperty, value ); + } } #endregion //EditingTemplate diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs index 0402d3829..fae473920 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -39,14 +39,17 @@ internal PropertyDefinitionBase() #region TargetProperties - [TypeConverter(typeof(ListConverter))] - public IList TargetProperties + [TypeConverter( typeof( ListConverter ) )] + public IList TargetProperties { - get { return _targetProperties; } - set + get + { + return _targetProperties; + } + set { this.ThrowIfLocked( () => this.TargetProperties ); - _targetProperties = value; + _targetProperties = value; } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs index b6d4f261f..934604f64 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -98,7 +98,7 @@ protected override BindingBase CreateValueBinding() Mode = PropertyDescriptor.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay, ValidatesOnDataErrors = true, ValidatesOnExceptions = true, - ConverterCulture = CultureInfo.CurrentCulture + ConverterCulture = CultureInfo.CurrentCulture }; return binding; @@ -119,7 +119,7 @@ protected override bool ComputeCanResetValue() if( !PropertyDescriptor.IsReadOnly ) { var defaultValue = this.ComputeDefaultValueAttribute(); - if( defaultValue != null) + if( defaultValue != null ) return !defaultValue.Equals( this.Value ); // can Reset if different from defaultValue. return PropertyDescriptor.CanResetValue( SelectedObject ); @@ -207,7 +207,7 @@ internal override ITypeEditor CreateAttributeEditor() var assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault( a => a.FullName.Contains( typeDef[ 1 ].Trim() ) ); if( assembly != null ) { - type = assembly.GetTypes().FirstOrDefault( t => (t != null) && (t.FullName != null) && t.FullName.Contains( typeDef[ 0 ] ) ); + type = assembly.GetTypes().FirstOrDefault( t => ( t != null ) && ( t.FullName != null ) && t.FullName.Contains( typeDef[ 0 ] ) ); } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs index 177047e42..9509f5856 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -25,7 +25,6 @@ using Xceed.Wpf.Toolkit.PropertyGrid.Editors; using System.Diagnostics; using System.ComponentModel; -using System.Windows.Markup.Primitives; using System.Windows.Data; #if !VS2008 using System.ComponentModel.DataAnnotations; @@ -249,7 +248,7 @@ internal void UpdateAdvanceOptions() internal void UpdateIsExpandable() { - this.IsExpandable = this.ComputeIsExpandable() + this.IsExpandable = this.ComputeIsExpandable() && ( this.ExpandableAttribute ); } @@ -283,7 +282,7 @@ internal object ComputeDescriptionForItem( object item ) #endif var descriptionAtt = PropertyGridUtilities.GetAttribute( pd ); - return (descriptionAtt != null) + return ( descriptionAtt != null ) ? descriptionAtt.Description : pd.Description; } @@ -293,7 +292,7 @@ internal object ComputeNewItemTypesForItem( object item ) PropertyDescriptor pd = item as PropertyDescriptor; var attribute = PropertyGridUtilities.GetAttribute( pd ); - return (attribute != null) + return ( attribute != null ) ? attribute.Types : null; } @@ -323,15 +322,15 @@ internal object ComputeDisplayOrderForItem( object item ) if( this.IsPropertyGridCategorized ) { - var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Categorized) - || (x.UsageContext == UsageContextEnum.Both)) ); + var attribute = list.FirstOrDefault( x => ( ( x.UsageContext == UsageContextEnum.Categorized ) + || ( x.UsageContext == UsageContextEnum.Both ) ) ); if( attribute != null ) return attribute.Order; } else { - var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Alphabetical) - || (x.UsageContext == UsageContextEnum.Both)) ); + var attribute = list.FirstOrDefault( x => ( ( x.UsageContext == UsageContextEnum.Alphabetical ) + || ( x.UsageContext == UsageContextEnum.Both ) ) ); if( attribute != null ) return attribute.Order; } @@ -343,10 +342,10 @@ internal object ComputeDisplayOrderForItem( object item ) internal object ComputeExpandableAttributeForItem( object item ) { - var pd = (PropertyDescriptor)item; + var pd = ( PropertyDescriptor )item; var attribute = PropertyGridUtilities.GetAttribute( pd ); - return (attribute != null); + return ( attribute != null ); } internal int ComputeDisplayOrderInternal( bool isPropertyGridCategorized ) @@ -400,7 +399,7 @@ private static void CanExecuteResetValueCommand( object sender, CanExecuteRouted affectedPropertyItem = sender as PropertyItem; } - e.CanExecute = ( (affectedPropertyItem != null) && ( affectedPropertyItem.DescriptorDefinition != null) ) + e.CanExecute = ( ( affectedPropertyItem != null ) && ( affectedPropertyItem.DescriptorDefinition != null ) ) ? affectedPropertyItem.DescriptorDefinition.ComputeCanResetValue() : false; } @@ -411,11 +410,11 @@ private string ComputeDisplayName() var displayName = PropertyDescriptor.DisplayName; #else var displayAttribute = PropertyGridUtilities.GetAttribute( PropertyDescriptor ); - var displayName = (displayAttribute != null) ? displayAttribute.GetName() : PropertyDescriptor.DisplayName; + var displayName = ( displayAttribute != null ) ? displayAttribute.GetName() : PropertyDescriptor.DisplayName; #endif var attribute = PropertyGridUtilities.GetAttribute( PropertyDescriptor ); - if( (attribute != null) && attribute.NeedParenthesis ) + if( ( attribute != null ) && attribute.NeedParenthesis ) { displayName = "(" + displayName + ")"; } @@ -428,7 +427,7 @@ private void ValidatePropertyOrderAttributes( List list if( list.Count > 0 ) { PropertyOrderAttribute both = list.FirstOrDefault( x => x.UsageContext == UsageContextEnum.Both ); - if( (both != null) && (list.Count > 1) ) + if( ( both != null ) && ( list.Count > 1 ) ) Debug.Assert( false, "A PropertyItem can't have more than 1 PropertyOrderAttribute when it has UsageContext : Both" ); } } @@ -450,7 +449,7 @@ public ImageSource AdvancedOptionsIcon { get { - return (ImageSource)GetValue( AdvancedOptionsIconProperty ); + return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); } set { @@ -469,7 +468,7 @@ public object AdvancedOptionsTooltip { get { - return (object)GetValue( AdvancedOptionsTooltipProperty ); + return ( object )GetValue( AdvancedOptionsTooltipProperty ); } set { @@ -488,7 +487,7 @@ public bool IsExpandable { get { - return (bool)GetValue( IsExpandableProperty ); + return ( bool )GetValue( IsExpandableProperty ); } set { @@ -652,7 +651,7 @@ public object Value private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e ) { - ((DescriptorPropertyDefinitionBase)o).OnValueChanged( e.OldValue, e.NewValue ); + ( ( DescriptorPropertyDefinitionBase )o ).OnValueChanged( e.OldValue, e.NewValue ); } internal virtual void OnValueChanged( object oldValue, object newValue ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs index 9108c7a07..2d2f790c9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,13 +16,13 @@ ***********************************************************************************/ using System; -using System.Windows; using System.Collections.Generic; using System.Linq; +using System.Windows; namespace Xceed.Wpf.Toolkit.PropertyGrid { - [Obsolete(@"Use EditorTemplateDefinition instead of EditorDefinition. " + EditorDefinition.UsageEx)] + [Obsolete( @"Use EditorTemplateDefinition instead of EditorDefinition. " + EditorDefinition.UsageEx )] public class EditorDefinition : EditorTemplateDefinition { private const string UsageEx = " (XAML Ex: OR )"; @@ -76,7 +76,7 @@ internal override void Lock() if( this.EditingTemplate != null ) throw new InvalidOperationException( string.Format( usageError, "EditingTemplate" ) ); - if( this.TargetProperties != null && this.TargetProperties.Count > 0) + if( this.TargetProperties != null && this.TargetProperties.Count > 0 ) throw new InvalidOperationException( string.Format( usageError, "TargetProperties" ) ); List properties = new List(); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs index 0a76533fc..ab5378e03 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs index 15c34dfb6..ab57f6363 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,7 @@ ***********************************************************************************/ using System; -using System.Collections; using System.Collections.Generic; -using System.Linq; using System.Windows; using Xceed.Wpf.Toolkit.Core.Utilities; @@ -82,7 +80,7 @@ private void Editor_CollectionUpdated( object sender, RoutedEventArgs e ) propertyGrid.RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, propertyItem, null, propertyItem.Instance ) ); } } - } + } } protected override void ResolveValueBinding( PropertyItem propertyItem ) @@ -95,11 +93,11 @@ protected override void ResolveValueBinding( PropertyItem propertyItem ) { Editor.NewItemTypes = new List() { type.GetElementType() }; } - else + else { - if( (propertyItem.DescriptorDefinition != null) - && (propertyItem.DescriptorDefinition.NewItemTypes != null) - && (propertyItem.DescriptorDefinition.NewItemTypes.Count > 0) ) + if( ( propertyItem.DescriptorDefinition != null ) + && ( propertyItem.DescriptorDefinition.NewItemTypes != null ) + && ( propertyItem.DescriptorDefinition.NewItemTypes.Count > 0 ) ) { Editor.NewItemTypes = propertyItem.DescriptorDefinition.NewItemTypes; } @@ -107,7 +105,7 @@ protected override void ResolveValueBinding( PropertyItem propertyItem ) { //Check if we have a Dictionary var dictionaryTypes = ListUtilities.GetDictionaryItemsType( type ); - if( (dictionaryTypes != null) && (dictionaryTypes.Length == 2) ) + if( ( dictionaryTypes != null ) && ( dictionaryTypes.Length == 2 ) ) { // A Dictionary contains KeyValuePair that can't be edited. // We need to create EditableKeyValuePairs. @@ -119,7 +117,7 @@ protected override void ResolveValueBinding( PropertyItem propertyItem ) { //Check if we have a list var listType = ListUtilities.GetListItemType( type ); - if( listType != null ) + if( listType != null ) { Editor.NewItemTypes = new List() { listType }; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs index aaa3a8d9e..85cfe4e7b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs index bd0e2cd87..8576fe2a1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,7 +15,6 @@ ***********************************************************************************/ -using System.Collections.Generic; using System.Collections; using System.Windows; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs index 84353d745..56e05b16c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,11 @@ ***********************************************************************************/ using System; +using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Reflection; -using System.Collections; namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs index 6df3b3ac5..1c8134258 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,11 +15,10 @@ ***********************************************************************************/ -using System.Collections.Generic; +using System.Collections; using System.Linq; using System.Windows; using System.Windows.Media; -using System.Collections; using Xceed.Wpf.Toolkit.Core.Utilities; namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors @@ -29,7 +28,7 @@ public class FontComboBoxEditor : ComboBoxEditor protected override IEnumerable CreateItemsSource( PropertyItem propertyItem ) { if( propertyItem.PropertyType == typeof( FontFamily ) ) - return FontUtilities.Families.OrderBy( x => x.Source); + return FontUtilities.Families.OrderBy( x => x.Source ); else if( propertyItem.PropertyType == typeof( FontWeight ) ) return FontUtilities.Weights; else if( propertyItem.PropertyType == typeof( FontStyle ) ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs index f1f7afe80..670412fe1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs index 45c636513..f76b9663f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs index 7e51a0cd0..1cace694f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,11 +16,7 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; -using System.Windows.Controls; namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PasswordEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PasswordEditor.cs index e8d96c7fa..da5549623 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PasswordEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PasswordEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -36,7 +36,7 @@ protected override void SetValueDependencyProperty() protected override IValueConverter CreateValueConverter() { - return new PasswordToStringConverter(this.Editor); + return new PasswordToStringConverter( this.Editor ); } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs index 7219d3104..cd6fc7bce 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs index 292978114..e2ec11884 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -34,8 +34,8 @@ public class SourceComboBoxEditor : ComboBoxEditor public SourceComboBoxEditor( ICollection collection, TypeConverter typeConverter ) { // Add a "Null" input value in the ComboBox when using a NullableConverter. - _collection = (typeConverter is NullableConverter) - ? collection.Cast().Select( x => x ?? SourceComboBoxEditor.ComboBoxNullValue ).ToArray() + _collection = ( typeConverter is NullableConverter ) + ? collection.Cast().Select( x => x ?? SourceComboBoxEditor.ComboBoxNullValue ).ToArray() : collection; _typeConverter = typeConverter; } @@ -73,8 +73,8 @@ public object Convert( object value, Type targetType, object parameter, CultureI { if( _typeConverter != null ) { - if( _typeConverter.CanConvertTo( typeof(string) ) ) - return _typeConverter.ConvertTo( value, typeof(string) ); + if( _typeConverter.CanConvertTo( typeof( string ) ) ) + return _typeConverter.ConvertTo( value, typeof( string ) ); } return value; } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs index b47ba60c8..fe5a6e910 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,13 +15,13 @@ ***********************************************************************************/ -using System.Windows.Controls; -using System.Windows; +using System; using System.ComponentModel; +using System.Globalization; +using System.Windows; +using System.Windows.Controls; using System.Windows.Data; using Xceed.Wpf.Toolkit.Core; -using System; -using System.Globalization; namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs index a6512ef43..6c5775504 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs index 550876886..19ca14298 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -67,7 +67,7 @@ protected virtual void ResolveValueBinding( PropertyItem propertyItem ) { var _binding = new Binding( "Value" ); _binding.Source = propertyItem; - _binding.UpdateSourceTrigger = (Editor is InputBase) ? UpdateSourceTrigger.PropertyChanged : UpdateSourceTrigger.Default; + _binding.UpdateSourceTrigger = ( Editor is InputBase ) ? UpdateSourceTrigger.PropertyChanged : UpdateSourceTrigger.Default; _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay; _binding.Converter = CreateValueConverter(); BindingOperations.SetBinding( Editor, ValueProperty, _binding ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs index 745fd0b8e..6cbc4d4eb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -42,8 +42,8 @@ internal void SetMinMaxFromRangeAttribute( PropertyDescriptor propertyDescriptor var rangeAttribute = PropertyGridUtilities.GetAttribute( propertyDescriptor ); if( rangeAttribute != null ) { - Editor.Maximum = ((TType)converter.ConvertFrom( rangeAttribute.Maximum.ToString() )); - Editor.Minimum = ((TType)converter.ConvertFrom( rangeAttribute.Minimum.ToString() )); + Editor.Maximum = ( ( TType )converter.ConvertFrom( rangeAttribute.Maximum.ToString() ) ); + Editor.Minimum = ( ( TType )converter.ConvertFrom( rangeAttribute.Minimum.ToString() ) ); } } #endif @@ -95,7 +95,7 @@ protected override void SetControlProperties( PropertyItem propertyItem ) } } - public class DoubleUpDownEditor : NumericUpDownEditor + public class DoubleUpDownEditor : NumericUpDownEditor { protected override DoubleUpDown CreateEditor() { @@ -108,7 +108,7 @@ protected override void SetControlProperties( PropertyItem propertyItem ) Editor.AllowInputSpecialValues = AllowedSpecialValues.Any; #if !VS2008 - this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( double ) ) ); + this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( double ) ) ); #endif } } @@ -161,7 +161,7 @@ protected override void SetControlProperties( PropertyItem propertyItem ) } } - public class SingleUpDownEditor : NumericUpDownEditor + public class SingleUpDownEditor : NumericUpDownEditor { protected override SingleUpDown CreateEditor() { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs index 736cf69e8..f01e240e7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Xceed.Wpf.Toolkit.PropertyGrid { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs index 0822d16ef..78f0d0fb3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,12 +17,9 @@ using System.Collections.Generic; -using System.Windows.Controls; -using System.Collections; using System.ComponentModel; -using System.Windows.Data; -using System; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.PropertyGrid { internal interface IPropertyContainer @@ -34,23 +31,50 @@ internal interface IPropertyContainer - ContainerHelperBase ContainerHelper { get; } + ContainerHelperBase ContainerHelper + { + get; + } - Style PropertyContainerStyle { get; } + Style PropertyContainerStyle + { + get; + } - EditorDefinitionCollection EditorDefinitions { get; } + EditorDefinitionCollection EditorDefinitions + { + get; + } - PropertyDefinitionCollection PropertyDefinitions { get; } + PropertyDefinitionCollection PropertyDefinitions + { + get; + } - bool IsCategorized { get; } + bool IsCategorized + { + get; + } - bool IsSortedAlphabetically { get; } + bool IsSortedAlphabetically + { + get; + } - bool AutoGenerateProperties { get; } + bool AutoGenerateProperties + { + get; + } - bool HideInheritedProperties { get; } + bool HideInheritedProperties + { + get; + } - FilterInfo FilterInfo { get; } + FilterInfo FilterInfo + { + get; + } bool? IsPropertyVisible( PropertyDescriptor pd ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs index 08bd8543f..8e286fbd2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -82,8 +82,8 @@ protected override void GenerateSubPropertiesCore( Action() ); @@ -55,12 +54,15 @@ public ObjectContainerHelperBase( IPropertyContainer propertyContainer) public override IList Properties { - get { return _propertyItemCollection; } + get + { + return _propertyItemCollection; + } } private PropertyItem DefaultProperty { - get + get { PropertyItem defaultProperty = null; var defaultName = this.GetDefaultPropertyName(); @@ -115,7 +117,7 @@ public override object ItemFromContainer( PropertyItemBase container ) return propertyItem.PropertyDescriptor.Name; } - public override void UpdateValuesFromSource() + public override void UpdateValuesFromSource() { foreach( PropertyItem item in PropertyItems ) { @@ -126,7 +128,7 @@ public override void UpdateValuesFromSource() public void GenerateProperties() { - if( (PropertyItems.Count == 0) + if( ( PropertyItems.Count == 0 ) ) { this.RegenerateProperties(); @@ -199,7 +201,7 @@ private void UpdateFilter() private void UpdateCategorization( bool updateSubPropertiesCategorization ) { _propertyItemCollection.UpdateCategorization( this.ComputeCategoryGroupDescription(), this.PropertyContainer.IsCategorized, this.PropertyContainer.IsSortedAlphabetically ); - if( updateSubPropertiesCategorization && (_propertyItemCollection.Count > 0) ) + if( updateSubPropertiesCategorization && ( _propertyItemCollection.Count > 0 ) ) { foreach( PropertyItem propertyItem in _propertyItemCollection ) { @@ -291,7 +293,7 @@ protected static List GetPropertyDescriptors( object instanc { if( instance is ICustomTypeDescriptor ) { - descriptors = ((ICustomTypeDescriptor)instance).GetProperties(); + descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties(); } //ICustomTypeProvider is only available in .net 4.5 and over. Use reflection so the .net 4.0 and .net 3.5 still works. else if( instance.GetType().GetInterface( "ICustomTypeProvider", true ) != null ) @@ -431,7 +433,7 @@ private object GetTypeDefaultValue( Type type ) type = type.GetProperty( "Value" ).PropertyType; } - return ( type.IsValueType ? Activator.CreateInstance( type ) : null ) ; + return ( type.IsValueType ? Activator.CreateInstance( type ) : null ); } private void SetupDefinitionBinding( @@ -466,7 +468,7 @@ internal FrameworkElement GenerateChildrenEditorElement( PropertyItem propertyIt editorElement = editor.ResolveEditor( propertyItem ); - if( (editorElement == null) && (definitionKey == null) && ( propertyItem.PropertyDescriptor != null ) ) + if( ( editorElement == null ) && ( definitionKey == null ) && ( propertyItem.PropertyDescriptor != null ) ) editorElement = this.GenerateCustomEditingElement( propertyItem.PropertyDescriptor.Name, propertyItem ); if( editorElement == null && definitionKeyAsType == null ) @@ -479,7 +481,7 @@ internal FrameworkElement GenerateChildrenEditorElement( PropertyItem propertyIt && !ListUtilities.IsCollectionOfItems( propertyItem.PropertyType ) && !ListUtilities.IsDictionaryOfItems( propertyItem.PropertyType ) ) { - editor = new TextBlockEditor( (propertyItem.PropertyDescriptor != null) ? propertyItem.PropertyDescriptor.Converter : null ); + editor = new TextBlockEditor( ( propertyItem.PropertyDescriptor != null ) ? propertyItem.PropertyDescriptor.Converter : null ); } // Fallback: Use a default type editor. @@ -536,7 +538,7 @@ public override void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, public override void ClearChildrenPropertyItem( PropertyItemBase propertyItem, object item ) { - if( propertyItem.Editor != null + if( propertyItem.Editor != null && ContainerHelperBase.GetIsGenerated( propertyItem.Editor ) ) { propertyItem.Editor = null; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs index 392fb6c11..5e9efaaf6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -29,31 +29,40 @@ public class PropertyDefinition : PropertyDefinitionBase private string _category = null; private int? _displayOrder = null; - [Obsolete(@"Use 'TargetProperties' instead of 'Name'")] + [Obsolete( @"Use 'TargetProperties' instead of 'Name'" )] public string Name { - get { return _name; } - set + get + { + return _name; + } + set { const string usageError = "{0}: \'Name\' property is obsolete. Instead use \'TargetProperties\'. (XAML example: )"; System.Diagnostics.Trace.TraceWarning( usageError, typeof( PropertyDefinition ) ); - _name = value; + _name = value; } } public string Category { - get { return _category; } - set + get + { + return _category; + } + set { this.ThrowIfLocked( () => this.Category ); - _category = value; + _category = value; } } public string DisplayName { - get { return _displayName; } + get + { + return _displayName; + } set { this.ThrowIfLocked( () => this.DisplayName ); @@ -63,7 +72,10 @@ public string DisplayName public string Description { - get { return _description; } + get + { + return _description; + } set { this.ThrowIfLocked( () => this.Description ); @@ -73,7 +85,10 @@ public string Description public int? DisplayOrder { - get { return _displayOrder; } + get + { + return _displayOrder; + } set { this.ThrowIfLocked( () => this.DisplayOrder ); @@ -83,7 +98,10 @@ public string Description public bool? IsBrowsable { - get { return _isBrowsable; } + get + { + return _isBrowsable; + } set { this.ThrowIfLocked( () => this.IsBrowsable ); @@ -93,7 +111,10 @@ public string Description public bool? IsExpandable { - get { return _isExpandable; } + get + { + return _isExpandable; + } set { this.ThrowIfLocked( () => this.IsExpandable ); @@ -109,7 +130,7 @@ internal override void Lock() { throw new InvalidOperationException( string.Format( - @"{0}: When using 'TargetProperties' property, do not use 'Name' property.", + @"{0}: When using 'TargetProperties' property, do not use 'Name' property.", typeof( PropertyDefinition ) ) ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs index 74d3aa433..ebff88d1f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -19,7 +19,6 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Windows.Documents; namespace Xceed.Wpf.Toolkit.PropertyGrid { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs index 97983b140..57ca8a33a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -98,7 +98,7 @@ public DataTemplate CategoryGroupHeaderTemplate { get { - return (DataTemplate)GetValue( CategoryGroupHeaderTemplateProperty ); + return ( DataTemplate )GetValue( CategoryGroupHeaderTemplateProperty ); } set { @@ -409,7 +409,7 @@ public double PropertyNameLeftPadding { get { - return (double)GetValue( PropertyNameLeftPaddingProperty ); + return ( double )GetValue( PropertyNameLeftPaddingProperty ); } set { @@ -442,7 +442,7 @@ public IList Properties { get { - return (_containerHelper != null) ? _containerHelper.Properties : null; + return ( _containerHelper != null ) ? _containerHelper.Properties : null; } } @@ -468,8 +468,14 @@ public IList Properties /// public Style PropertyContainerStyle { - get { return ( Style )GetValue( PropertyContainerStyleProperty ); } - set { SetValue( PropertyContainerStyleProperty, value ); } + get + { + return ( Style )GetValue( PropertyContainerStyleProperty ); + } + set + { + SetValue( PropertyContainerStyleProperty, value ); + } } private static void OnPropertyContainerStyleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e ) @@ -494,7 +500,7 @@ public PropertyDefinitionCollection PropertyDefinitions { get { - return (PropertyDefinitionCollection)GetValue( PropertyDefinitionsProperty ); + return ( PropertyDefinitionCollection )GetValue( PropertyDefinitionsProperty ); } set { @@ -506,7 +512,7 @@ private static void OnPropertyDefinitionsChanged( DependencyObject o, Dependency { var owner = o as PropertyGrid; if( owner != null ) - owner.OnPropertyDefinitionsChanged( (PropertyDefinitionCollection)e.OldValue, (PropertyDefinitionCollection)e.NewValue ); + owner.OnPropertyDefinitionsChanged( ( PropertyDefinitionCollection )e.OldValue, ( PropertyDefinitionCollection )e.NewValue ); } protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue ) @@ -557,7 +563,7 @@ private static void OnIsReadOnlyChanged( DependencyObject o, DependencyPropertyC { var propertyGrid = o as PropertyGrid; if( propertyGrid != null ) - propertyGrid.OnIsReadOnlyChanged( (bool)e.OldValue, (bool)e.NewValue ); + propertyGrid.OnIsReadOnlyChanged( ( bool )e.OldValue, ( bool )e.NewValue ); } protected virtual void OnIsReadOnlyChanged( bool oldValue, bool newValue ) @@ -670,7 +676,7 @@ private static object OnCoerceSelectedObjectName( DependencyObject o, object bas PropertyGrid propertyGrid = o as PropertyGrid; if( propertyGrid != null ) { - if( (propertyGrid.SelectedObject is FrameworkElement) && ( String.IsNullOrEmpty( ( String )baseValue ) )) + if( ( propertyGrid.SelectedObject is FrameworkElement ) && ( String.IsNullOrEmpty( ( String )baseValue ) ) ) return ""; } @@ -733,7 +739,7 @@ protected virtual void OnSelectedPropertyItemChanged( PropertyItemBase oldValue, if( newValue != null ) newValue.IsSelected = true; - this.SelectedProperty = ( (newValue != null) && (_containerHelper != null) ) ? _containerHelper.ItemFromContainer( newValue ) : null; + this.SelectedProperty = ( ( newValue != null ) && ( _containerHelper != null ) ) ? _containerHelper.ItemFromContainer( newValue ) : null; RaiseEvent( new RoutedPropertyChangedEventArgs( oldValue, newValue, PropertyGrid.SelectedPropertyItemChangedEvent ) ); } @@ -753,8 +759,14 @@ protected virtual void OnSelectedPropertyItemChanged( PropertyItemBase oldValue, /// public object SelectedProperty { - get { return ( object )GetValue( SelectedPropertyProperty ); } - set { SetValue( SelectedPropertyProperty, value ); } + get + { + return ( object )GetValue( SelectedPropertyProperty ); + } + set + { + SetValue( SelectedPropertyProperty, value ); + } } private static void OnSelectedPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args ) @@ -914,7 +926,7 @@ static PropertyGrid() public PropertyGrid() { _propertyDefinitionsListener = new WeakEventListener( this.OnPropertyDefinitionsCollectionChanged ); - _editorDefinitionsListener = new WeakEventListener( this.OnEditorDefinitionsCollectionChanged); + _editorDefinitionsListener = new WeakEventListener( this.OnEditorDefinitionsCollectionChanged ); UpdateContainerHelper(); #if VS2008 EditorDefinitions = new EditorDefinitionCollection(); @@ -922,7 +934,7 @@ public PropertyGrid() this.SetCurrentValue( PropertyGrid.EditorDefinitionsProperty, new EditorDefinitionCollection() ); #endif - PropertyDefinitions = new PropertyDefinitionCollection(); + PropertyDefinitions = new PropertyDefinitionCollection(); this.PropertyValueChanged += this.PropertyGrid_PropertyValueChanged; AddHandler( PropertyItemBase.ItemSelectionChangedEvent, new RoutedEventHandler( OnItemSelectionChanged ) ); @@ -972,10 +984,10 @@ protected override void OnPreviewKeyDown( KeyEventArgs e ) var textBox = e.OriginalSource as TextBox; //hitting enter on textbox will update value of underlying source if UpdateTextBoxSourceOnEnterKey is true - if( (this.SelectedPropertyItem != null) - && (e.Key == Key.Enter) + if( ( this.SelectedPropertyItem != null ) + && ( e.Key == Key.Enter ) && this.UpdateTextBoxSourceOnEnterKey - && (textBox != null) + && ( textBox != null ) && !textBox.AcceptsReturn ) { BindingExpression be = textBox.GetBindingExpression( TextBox.TextProperty ); @@ -997,7 +1009,7 @@ protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e } -#endregion //Base Class Overrides + #endregion //Base Class Overrides #region Event Handlers @@ -1103,6 +1115,9 @@ private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e ) + + + @@ -1178,7 +1193,7 @@ public void CollapseProperty( string propertyName ) private ScrollViewer GetScrollViewer() { - if( (_containerHelper != null) && (_containerHelper.ChildrenItemsControl != null) ) + if( ( _containerHelper != null ) && ( _containerHelper.ChildrenItemsControl != null ) ) { return TreeHelper.FindChild( _containerHelper.ChildrenItemsControl ); } @@ -1250,10 +1265,10 @@ private void UpdateThumb() { if( _dragThumb != null ) { - if( IsCategorized ) - _dragThumb.Margin = new Thickness( 6, 0, 0, 0 ); - else - _dragThumb.Margin = new Thickness( -1, 0, 0, 0 ); + if( IsCategorized ) + _dragThumb.Margin = new Thickness( 6, 0, 0, 0 ); + else + _dragThumb.Margin = new Thickness( -1, 0, 0, 0 ); } } @@ -1369,6 +1384,12 @@ private void ObjectContainerHelper_ObjectsGenerated( object sender, EventArgs e + + + + + + #region PreparePropertyItemEvent Attached Routed Event /// @@ -1525,11 +1546,11 @@ public override void EndInit() FilterInfo IPropertyContainer.FilterInfo { - get + get { return new FilterInfo() { - Predicate = this.CreateFilter(this.Filter), + Predicate = this.CreateFilter( this.Filter ), InputString = this.Filter }; } @@ -1709,4 +1730,6 @@ public IsPropertyBrowsableArgs( PropertyDescriptor pd ) + + } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridContextMenu.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridContextMenu.cs index 787c1af06..c58be5c18 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridContextMenu.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridContextMenu.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs index cb4de631a..bfe4c8785 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -19,21 +19,14 @@ using System.Collections; using System.Collections.Generic; using System.ComponentModel; +using System.IO; using System.Linq; using System.Windows; +using System.Windows.Controls; using System.Windows.Data; using System.Windows.Media; -using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; -using Xceed.Wpf.Toolkit.PropertyGrid.Editors; -using System.Linq.Expressions; -using System.Windows.Input; using Xceed.Wpf.Toolkit.Core.Utilities; -using System.Windows.Controls; -using System.Reflection; -using System.Windows.Controls.Primitives; -using Xceed.Wpf.Toolkit.PropertyGrid.Converters; -using Xceed.Wpf.Toolkit.Primitives; -using System.IO; +using Xceed.Wpf.Toolkit.PropertyGrid.Editors; namespace Xceed.Wpf.Toolkit.PropertyGrid { @@ -52,16 +45,16 @@ internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverte ITypeEditor editor = null; var context = new EditorTypeDescriptorContext( null, propertyItem.Instance, propertyItem.PropertyDescriptor ); - if( (typeConverter != null) + if( ( typeConverter != null ) && typeConverter.GetStandardValuesSupported( context ) && typeConverter.GetStandardValuesExclusive( context ) && !( typeConverter is ReferenceConverter ) - && (propertyType != typeof( bool )) && (propertyType != typeof( bool? )) ) //Bool type always have a BooleanConverter with standardValues : True/False. + && ( propertyType != typeof( bool ) ) && ( propertyType != typeof( bool? ) ) ) //Bool type always have a BooleanConverter with standardValues : True/False. { var items = typeConverter.GetStandardValues( context ); editor = new SourceComboBoxEditor( items, typeConverter ); } - else if( propertyType == typeof( string ) ) + else if( propertyType == typeof( string ) ) editor = new TextBoxEditor(); else if( propertyType == typeof( bool ) || propertyType == typeof( bool? ) ) editor = new CheckBoxEditor(); @@ -97,9 +90,9 @@ internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverte editor = new TimeSpanUpDownEditor(); else if( propertyType == typeof( FontFamily ) || propertyType == typeof( FontWeight ) || propertyType == typeof( FontStyle ) || propertyType == typeof( FontStretch ) ) editor = new FontComboBoxEditor(); - else if (propertyType == typeof(Guid) || propertyType == typeof(Guid?)) + else if( propertyType == typeof( Guid ) || propertyType == typeof( Guid? ) ) editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA" }; - else if (propertyType == typeof(char) || propertyType == typeof(char?)) + else if( propertyType == typeof( char ) || propertyType == typeof( char? ) ) editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "&" }; else if( propertyType == typeof( object ) ) // If any type of object is possible in the property, default to the TextBoxEditor. @@ -123,7 +116,7 @@ internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverte var dictionaryType = ListUtilities.GetDictionaryItemsType( propertyType ); var collectionType = ListUtilities.GetCollectionItemType( propertyType ); // A dictionary of T or a Collection of T or an ICollection - if( (dictionaryType != null) || (collectionType != null) || typeof( ICollection ).IsAssignableFrom( propertyType ) ) + if( ( dictionaryType != null ) || ( collectionType != null ) || typeof( ICollection ).IsAssignableFrom( propertyType ) ) { editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor(); } @@ -132,9 +125,9 @@ internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverte // If the type is not supported, check if there is a converter that supports // string conversion to the object type. Use TextBox in theses cases. // Otherwise, return a TextBlock editor since no valid editor exists. - editor = (typeConverter != null && typeConverter.CanConvertFrom( typeof( string ) )) - ? (ITypeEditor)new TextBoxEditor() - : (ITypeEditor)new TextBlockEditor(); + editor = ( typeConverter != null && typeConverter.CanConvertFrom( typeof( string ) ) ) + ? ( ITypeEditor )new TextBoxEditor() + : ( ITypeEditor )new TextBlockEditor(); } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs index 4db14eb55..e4d4f4f03 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,20 +16,11 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; using System.ComponentModel; -using System.Linq; +using System.Globalization; using System.Windows; using System.Windows.Controls; -using System.Windows.Input; -using System.Windows.Media; using System.Windows.Data; -using System.Collections; -using Xceed.Wpf.Toolkit.Core.Utilities; -using System.Linq.Expressions; -using System.Diagnostics; -using System.Globalization; using System.Windows.Threading; namespace Xceed.Wpf.Toolkit.PropertyGrid @@ -49,15 +40,21 @@ public class PropertyItem : CustomPropertyItem public bool IsReadOnly { - get { return ( bool )GetValue( IsReadOnlyProperty ); } - set { SetValue( IsReadOnlyProperty, value ); } + get + { + return ( bool )GetValue( IsReadOnlyProperty ); + } + set + { + SetValue( IsReadOnlyProperty, value ); + } } private static void OnIsReadOnlyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e ) { var propertyItem = o as PropertyItem; if( propertyItem != null ) - propertyItem.OnIsReadOnlyChanged( (bool)e.OldValue, (bool)e.NewValue ); + propertyItem.OnIsReadOnlyChanged( ( bool )e.OldValue, ( bool )e.NewValue ); } protected virtual void OnIsReadOnlyChanged( bool oldValue, bool newValue ) @@ -133,7 +130,7 @@ public string PropertyName { get { - return (this.DescriptorDefinition != null) ? this.DescriptorDefinition.PropertyName : null; + return ( this.DescriptorDefinition != null ) ? this.DescriptorDefinition.PropertyName : null; } } @@ -173,6 +170,7 @@ public object Instance #endregion //Instance + #endregion //Properties #region Overrides @@ -225,15 +223,15 @@ protected override void OnValueChanged( object oldValue, object newValue ) internal void SetRedInvalidBorder( BindingExpression be ) { - if( (be != null) && be.DataItem is DescriptorPropertyDefinitionBase ) + if( ( be != null ) && be.DataItem is DescriptorPropertyDefinitionBase ) { this.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () => { DescriptorPropertyDefinitionBase descriptor = be.DataItem as DescriptorPropertyDefinitionBase; - if( ( descriptor != null) && Validation.GetHasError( descriptor ) ) + if( ( descriptor != null ) && Validation.GetHasError( descriptor ) ) { - var errors = Validation.GetErrors( descriptor ); - Validation.MarkInvalid( be, errors[0] ); + var errors = Validation.GetErrors( descriptor ); + Validation.MarkInvalid( be, errors[ 0 ] ); } } ) ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs index f901b294a..eae9f0e8d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -50,8 +50,14 @@ public abstract class PropertyItemBase : Control, IPropertyContainer, INotifyPro public ImageSource AdvancedOptionsIcon { - get { return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); } - set { SetValue( AdvancedOptionsIconProperty, value ); } + get + { + return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); + } + set + { + SetValue( AdvancedOptionsIconProperty, value ); + } } #endregion //AdvancedOptionsIcon @@ -63,8 +69,14 @@ public ImageSource AdvancedOptionsIcon public object AdvancedOptionsTooltip { - get { return ( object )GetValue( AdvancedOptionsTooltipProperty ); } - set { SetValue( AdvancedOptionsTooltipProperty, value ); } + get + { + return ( object )GetValue( AdvancedOptionsTooltipProperty ); + } + set + { + SetValue( AdvancedOptionsTooltipProperty, value ); + } } #endregion //AdvancedOptionsTooltip @@ -81,8 +93,14 @@ public object AdvancedOptionsTooltip public string Description { - get { return ( string )GetValue( DescriptionProperty ); } - set { SetValue( DescriptionProperty, value ); } + get + { + return ( string )GetValue( DescriptionProperty ); + } + set + { + SetValue( DescriptionProperty, value ); + } } #endregion //Description @@ -94,8 +112,14 @@ public string Description public string DisplayName { - get { return ( string )GetValue( DisplayNameProperty ); } - set { SetValue( DisplayNameProperty, value ); } + get + { + return ( string )GetValue( DisplayNameProperty ); + } + set + { + SetValue( DisplayNameProperty, value ); + } } #endregion //DisplayName @@ -181,8 +205,14 @@ protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue ) public bool IsExpandable { - get { return ( bool )GetValue( IsExpandableProperty ); } - set { SetValue( IsExpandableProperty, value ); } + get + { + return ( bool )GetValue( IsExpandableProperty ); + } + set + { + SetValue( IsExpandableProperty, value ); + } } #endregion //IsExpandable @@ -224,7 +254,10 @@ protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue ) /// public FrameworkElement ParentElement { - get { return this.ParentNode as FrameworkElement; } + get + { + return this.ParentNode as FrameworkElement; + } } #endregion @@ -286,7 +319,7 @@ public IList Properties /// Get the PropertyContainerStyle for sub items of this property. /// It return the value defined on PropertyGrid.PropertyContainerStyle. /// - public Style PropertyContainerStyle + public Style PropertyContainerStyle { get { @@ -379,6 +412,7 @@ static PropertyItemBase() internal PropertyItemBase() { + this.DataContext = this; this.GotFocus += new RoutedEventHandler( PropertyItemBase_GotFocus ); this.RequestBringIntoView += this.PropertyItemBase_RequestBringIntoView; AddHandler( PropertyItemsControl.PreparePropertyItemEvent, new PropertyItemEventHandler( OnPreparePropertyItemInternal ) ); @@ -447,7 +481,7 @@ protected override void OnMouseDown( MouseButtonEventArgs e ) private void PropertyItemBase_GotFocus( object sender, RoutedEventArgs e ) - { + { IsSelected = true; // Handle the event; otherwise, the possible // parent property item will select itself too. @@ -460,10 +494,10 @@ protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e // First check that the raised property is actually a real CLR property. // This could be something else like an Attached DP. - if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) - && this.IsLoaded - && (_parentNode != null) - && !_parentNode.ContainerHelper.IsCleaning) + if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) + && this.IsLoaded + && ( _parentNode != null ) + && !_parentNode.ContainerHelper.IsCleaning ) { this.RaisePropertyChanged( e.Property.Name ); } @@ -471,7 +505,7 @@ protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e private PropertyDefinitionCollection GetPropertItemPropertyDefinitions() { - if( (this.ParentNode != null) && (this.ParentNode.PropertyDefinitions != null) ) + if( ( this.ParentNode != null ) && ( this.ParentNode.PropertyDefinitions != null ) ) { var name = this.GetPropertyItemName(); foreach( var pd in this.ParentNode.PropertyDefinitions ) @@ -490,7 +524,7 @@ private PropertyDefinitionCollection GetPropertItemPropertyDefinitions() { var targetPropertyType = targetProperty as Type; // PropertyDefinitions contains a PropertyDefinition for this PropertyItem Type => return its PropertyDefinitions. - if( (targetPropertyType != null) && targetPropertyType.IsAssignableFrom( type ) ) + if( ( targetPropertyType != null ) && targetPropertyType.IsAssignableFrom( type ) ) return pd.PropertyDefinitions; } } @@ -511,14 +545,17 @@ private PropertyDefinitionCollection GetPropertItemPropertyDefinitions() Style IPropertyContainer.PropertyContainerStyle { - get { return this.PropertyContainerStyle; } + get + { + return this.PropertyContainerStyle; + } } EditorDefinitionCollection IPropertyContainer.EditorDefinitions { get { - return (this.ParentNode != null) ? this.ParentNode.EditorDefinitions : null; + return ( this.ParentNode != null ) ? this.ParentNode.EditorDefinitions : null; } } @@ -530,7 +567,7 @@ PropertyDefinitionCollection IPropertyContainer.PropertyDefinitions } } - ContainerHelperBase IPropertyContainer.ContainerHelper + ContainerHelperBase IPropertyContainer.ContainerHelper { get { @@ -538,7 +575,7 @@ ContainerHelperBase IPropertyContainer.ContainerHelper } } - bool IPropertyContainer.IsCategorized + bool IPropertyContainer.IsCategorized { get { @@ -562,7 +599,7 @@ bool IPropertyContainer.AutoGenerateProperties { var propertyItemPropertyDefinitions = this.GetPropertItemPropertyDefinitions(); // No PropertyDefinitions specified : show all properties of this PropertyItem. - if( (propertyItemPropertyDefinitions == null) || (propertyItemPropertyDefinitions.Count == 0) ) + if( ( propertyItemPropertyDefinitions == null ) || ( propertyItemPropertyDefinitions.Count == 0 ) ) return true; // A PropertyDefinitions is specified : show only the properties of the PropertyDefinitions from this PropertyItem. @@ -582,7 +619,10 @@ bool IPropertyContainer.HideInheritedProperties FilterInfo IPropertyContainer.FilterInfo { - get { return new FilterInfo(); } + get + { + return new FilterInfo(); + } } bool? IPropertyContainer.IsPropertyVisible( PropertyDescriptor pd ) @@ -597,7 +637,7 @@ FilterInfo IPropertyContainer.FilterInfo -#endregion + #endregion } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs index 3b8028d89..a2e474deb 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -21,7 +21,6 @@ using System.Windows.Data; using System; using System.Collections.Specialized; -using System.Diagnostics; using Xceed.Wpf.Toolkit.PropertyGrid.Attributes; using System.Linq; using System.Collections; @@ -51,19 +50,28 @@ static PropertyItemCollection() DisplayNamePropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.DisplayName ); } - public PropertyItemCollection(ObservableCollection editableCollection) - :base(editableCollection) + public PropertyItemCollection( ObservableCollection editableCollection ) + : base( editableCollection ) { EditableCollection = editableCollection; } internal Predicate FilterPredicate { - get { return GetDefaultView().Filter; } - set { GetDefaultView().Filter = value; } + get + { + return GetDefaultView().Filter; + } + set + { + GetDefaultView().Filter = value; + } } - public ObservableCollection EditableCollection { get; private set; } + public ObservableCollection EditableCollection + { + get; private set; + } private ICollectionView GetDefaultView() { @@ -175,7 +183,7 @@ internal static Predicate CreateFilter( string text, IList } #endif property.HighlightedText = property.DisplayName.ToLower().Contains( text.ToLower() ) ? text : null; - return (property.HighlightedText != null); + return ( property.HighlightedText != null ); } return false; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs index ab09c1c37..7f69b0a7e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs index ed931e0f7..0972553f4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -15,43 +15,56 @@ ***********************************************************************************/ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - namespace Xceed.Wpf.Toolkit.PropertyGrid { public static class StringConstants { public static string Local { - get { return "Local"; } + get + { + return "Local"; + } } public static string Resource { - get { return "Resource"; } + get + { + return "Resource"; + } } public static string Databinding { - get { return "Databinding"; } + get + { + return "Databinding"; + } } public static string Inheritance { - get { return "Inheritance"; } + get + { + return "Inheritance"; + } } public static string StyleSetter { - get { return "Style Setter"; } + get + { + return "Style Setter"; + } } public static string Default { - get { return "Default"; } + get + { + return "Default"; + } } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs index 25f3aa309..0a18c8934 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,10 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Xceed.Wpf.Toolkit.Core.Utilities; namespace Xceed.Wpf.Toolkit.PropertyGrid { @@ -35,8 +31,11 @@ public sealed class TargetPropertyType public Type Type { - get { return _type; } - set + get + { + return _type; + } + set { if( _sealed ) throw new InvalidOperationException( @@ -44,7 +43,7 @@ public Type Type "{0}.Type property cannot be modified once the instance is used", typeof( TargetPropertyType ) ) ); - _type = value; + _type = value; } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs index abf15d311..e2f1584cd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,9 +16,6 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Controls; using System.Windows.Documents; @@ -63,7 +60,7 @@ private static void OnIsTextTrimmedChanged( DependencyObject d, DependencyProper private void OnIsTextTrimmedChanged( bool oldValue, bool newValue ) { - this.ToolTip = ( newValue ) ? this.Text : null; + this.ToolTip = ( newValue ) ? this.Text : null; } #endregion @@ -120,7 +117,7 @@ protected virtual void HighlightedTextChanged( string oldValue, string newValue if( newValue == null ) { var newrRun = new Run( this.Text ); - this.Inlines.Clear(); + this.Inlines.Clear(); this.Inlines.Add( newrRun ); return; @@ -153,7 +150,7 @@ protected virtual void HighlightedTextChanged( string oldValue, string newValue #region Event Handler - private void TrimmedTextBlock_SizeChanged(object sender, SizeChangedEventArgs e) + private void TrimmedTextBlock_SizeChanged( object sender, SizeChangedEventArgs e ) { var textBlock = sender as TextBlock; if( textBlock != null ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml index 312dfe986..4e3681cf0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml index 2ccd44306..889b796a4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs index c95bcb67d..d9d4fcaa5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,17 +16,13 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; -using System.Text; using System.Windows.Controls; -using System.Windows.Controls.Primitives; using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Converters { - [Obsolete("This class is no longer used internaly and may be removed in a future release")] + [Obsolete( "This class is no longer used internaly and may be removed in a future release" )] public class SliderThumbWidthConverter : IValueConverter { public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs index ec7b33009..5f74c9cc8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -75,7 +75,7 @@ public AutoToolTipPlacement AutoToolTipPlacement { get { - return (AutoToolTipPlacement)GetValue( RangeSlider.AutoToolTipPlacementProperty ); + return ( AutoToolTipPlacement )GetValue( RangeSlider.AutoToolTipPlacementProperty ); } set { @@ -88,7 +88,7 @@ private static void OnAutoToolTipPlacementChanged( DependencyObject sender, Depe var rangeSlider = sender as RangeSlider; if( rangeSlider != null ) { - rangeSlider.OnAutoToolTipPlacementChanged( (AutoToolTipPlacement)e.OldValue, (AutoToolTipPlacement)e.NewValue ); + rangeSlider.OnAutoToolTipPlacementChanged( ( AutoToolTipPlacement )e.OldValue, ( AutoToolTipPlacement )e.NewValue ); } } @@ -107,7 +107,7 @@ public int AutoToolTipPrecision { get { - return (int)GetValue( RangeSlider.AutoToolTipPrecisionProperty ); + return ( int )GetValue( RangeSlider.AutoToolTipPrecisionProperty ); } set { @@ -129,7 +129,7 @@ public Brush HigherRangeBackground { get { - return (Brush)GetValue( RangeSlider.HigherRangeBackgroundProperty ); + return ( Brush )GetValue( RangeSlider.HigherRangeBackgroundProperty ); } set { @@ -151,7 +151,7 @@ public Style HigherRangeStyle { get { - return (Style)this.GetValue( RangeSlider.HigherRangeStyleProperty ); + return ( Style )this.GetValue( RangeSlider.HigherRangeStyleProperty ); } set { @@ -176,7 +176,7 @@ public double HigherRangeWidth { get { - return (double)GetValue( RangeSlider.HigherRangeWidthProperty ); + return ( double )GetValue( RangeSlider.HigherRangeWidthProperty ); } private set { @@ -198,7 +198,7 @@ public Brush HigherThumbBackground { get { - return (Brush)GetValue( RangeSlider.HigherThumbBackgroundProperty ); + return ( Brush )GetValue( RangeSlider.HigherThumbBackgroundProperty ); } set { @@ -219,7 +219,7 @@ public double HigherValue { get { - return (double)GetValue( RangeSlider.HigherValueProperty ); + return ( double )GetValue( RangeSlider.HigherValueProperty ); } set { @@ -229,14 +229,14 @@ public double HigherValue private static object OnCoerceHigherValueChanged( DependencyObject d, object basevalue ) { - var rangeSlider = (RangeSlider)d; - if( (rangeSlider == null) || !rangeSlider.IsLoaded) + var rangeSlider = ( RangeSlider )d; + if( ( rangeSlider == null ) || !rangeSlider.IsLoaded ) return basevalue; var min = Math.Min( rangeSlider.Minimum, rangeSlider.Maximum ); var max = Math.Max( rangeSlider.Minimum, rangeSlider.Maximum ); - var higherValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, (double)basevalue ) ); - higherValue = Math.Max( rangeSlider.LowerValue, ( double)basevalue ); + var higherValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, ( double )basevalue ) ); + higherValue = Math.Max( rangeSlider.LowerValue, ( double )basevalue ); return higherValue; } @@ -246,7 +246,7 @@ private static void OnHigherValueChanged( DependencyObject sender, DependencyPro RangeSlider rangeSlider = sender as RangeSlider; if( rangeSlider != null ) { - rangeSlider.OnHigherValueChanged( (double)args.OldValue, (double)args.NewValue ); + rangeSlider.OnHigherValueChanged( ( double )args.OldValue, ( double )args.NewValue ); } } @@ -272,7 +272,7 @@ public bool IsDeferredUpdateValues { get { - return (bool)GetValue( RangeSlider.IsDeferredUpdateValuesProperty ); + return ( bool )GetValue( RangeSlider.IsDeferredUpdateValuesProperty ); } set { @@ -291,7 +291,7 @@ public bool IsSnapToTickEnabled { get { - return (bool)GetValue( RangeSlider.IsSnapToTickEnabledProperty ); + return ( bool )GetValue( RangeSlider.IsSnapToTickEnabledProperty ); } set { @@ -313,7 +313,7 @@ public Brush LowerRangeBackground { get { - return (Brush)GetValue( RangeSlider.LowerRangeBackgroundProperty ); + return ( Brush )GetValue( RangeSlider.LowerRangeBackgroundProperty ); } set { @@ -335,7 +335,7 @@ public Style LowerRangeStyle { get { - return (Style)this.GetValue( RangeSlider.LowerRangeStyleProperty ); + return ( Style )this.GetValue( RangeSlider.LowerRangeStyleProperty ); } set { @@ -360,7 +360,7 @@ public double LowerRangeWidth { get { - return (double)GetValue( RangeSlider.LowerRangeWidthProperty ); + return ( double )GetValue( RangeSlider.LowerRangeWidthProperty ); } private set { @@ -381,7 +381,7 @@ public Brush LowerThumbBackground { get { - return (Brush)GetValue( RangeSlider.LowerThumbBackgroundProperty ); + return ( Brush )GetValue( RangeSlider.LowerThumbBackgroundProperty ); } set { @@ -402,7 +402,7 @@ public double LowerValue { get { - return (double)GetValue( RangeSlider.LowerValueProperty ); + return ( double )GetValue( RangeSlider.LowerValueProperty ); } set { @@ -412,14 +412,14 @@ public double LowerValue private static object OnCoerceLowerValueChanged( DependencyObject d, object basevalue ) { - var rangeSlider = (RangeSlider)d; - if( (rangeSlider == null) || !rangeSlider.IsLoaded ) + var rangeSlider = ( RangeSlider )d; + if( ( rangeSlider == null ) || !rangeSlider.IsLoaded ) return basevalue; var min = Math.Min( rangeSlider.Minimum, rangeSlider.Maximum ); var max = Math.Max( rangeSlider.Minimum, rangeSlider.Maximum ); - var lowerValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, (double)basevalue ) ); - lowerValue = Math.Min( (double)basevalue, rangeSlider.HigherValue ); + var lowerValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, ( double )basevalue ) ); + lowerValue = Math.Min( ( double )basevalue, rangeSlider.HigherValue ); return lowerValue; } @@ -429,7 +429,7 @@ private static void OnLowerValueChanged( DependencyObject sender, DependencyProp RangeSlider rangeSlider = sender as RangeSlider; if( rangeSlider != null ) { - rangeSlider.OnLowerValueChanged( (double)args.OldValue, (double)args.NewValue ); + rangeSlider.OnLowerValueChanged( ( double )args.OldValue, ( double )args.NewValue ); } } @@ -455,7 +455,7 @@ public double Maximum { get { - return (double)GetValue( RangeSlider.MaximumProperty ); + return ( double )GetValue( RangeSlider.MaximumProperty ); } set { @@ -468,7 +468,7 @@ private static void OnMaximumChanged( DependencyObject sender, DependencyPropert RangeSlider rangeSlider = sender as RangeSlider; if( rangeSlider != null ) { - rangeSlider.OnMaximumChanged( (double)args.OldValue, (double)args.NewValue ); + rangeSlider.OnMaximumChanged( ( double )args.OldValue, ( double )args.NewValue ); } } @@ -490,7 +490,7 @@ public double Minimum { get { - return (double)GetValue( RangeSlider.MinimumProperty ); + return ( double )GetValue( RangeSlider.MinimumProperty ); } set { @@ -503,7 +503,7 @@ private static void OnMinimumChanged( DependencyObject sender, DependencyPropert RangeSlider rangeSlider = sender as RangeSlider; if( rangeSlider != null ) { - rangeSlider.OnMinimumChanged( (double)args.OldValue, (double)args.NewValue ); + rangeSlider.OnMinimumChanged( ( double )args.OldValue, ( double )args.NewValue ); } } @@ -527,7 +527,7 @@ public Orientation Orientation { get { - return (Orientation)GetValue( RangeSlider.OrientationProperty ); + return ( Orientation )GetValue( RangeSlider.OrientationProperty ); } set { @@ -540,7 +540,7 @@ private static void OnOrientationChanged( DependencyObject sender, DependencyPro RangeSlider rangeSlider = sender as RangeSlider; if( rangeSlider != null ) { - rangeSlider.OnOrientationChanged( (Orientation)e.OldValue, (Orientation)e.NewValue ); + rangeSlider.OnOrientationChanged( ( Orientation )e.OldValue, ( Orientation )e.NewValue ); } } @@ -562,7 +562,7 @@ public Brush RangeBackground { get { - return (Brush)GetValue( RangeSlider.RangeBackgroundProperty ); + return ( Brush )GetValue( RangeSlider.RangeBackgroundProperty ); } set { @@ -584,7 +584,7 @@ public Style RangeStyle { get { - return (Style)this.GetValue( RangeSlider.RangeStyleProperty ); + return ( Style )this.GetValue( RangeSlider.RangeStyleProperty ); } set { @@ -608,7 +608,7 @@ public double RangeWidth { get { - return (double)GetValue( RangeSlider.RangeWidthProperty ); + return ( double )GetValue( RangeSlider.RangeWidthProperty ); } private set { @@ -629,7 +629,7 @@ public double Step { get { - return (double)GetValue( RangeSlider.StepProperty ); + return ( double )GetValue( RangeSlider.StepProperty ); } set { @@ -640,7 +640,7 @@ public double Step private static object CoerceStep( DependencyObject sender, object value ) { RangeSlider rangeSlider = sender as RangeSlider; - double newValue = (double)value; + double newValue = ( double )value; return Math.Max( 0.01, newValue ); } @@ -658,7 +658,7 @@ public double TickFrequency { get { - return (double)GetValue( RangeSlider.TickFrequencyProperty ); + return ( double )GetValue( RangeSlider.TickFrequencyProperty ); } set { @@ -671,7 +671,7 @@ private static void OnTickFrequencyChanged( DependencyObject sender, DependencyP var rangeSlider = sender as RangeSlider; if( rangeSlider != null ) { - rangeSlider.OnTickFrequencyChanged( (double)args.OldValue, (double)args.NewValue ); + rangeSlider.OnTickFrequencyChanged( ( double )args.OldValue, ( double )args.NewValue ); } } @@ -690,7 +690,7 @@ public TickPlacement TickPlacement { get { - return (TickPlacement)GetValue( RangeSlider.TickPlacementProperty ); + return ( TickPlacement )GetValue( RangeSlider.TickPlacementProperty ); } set { @@ -703,7 +703,7 @@ private static void OnTickPlacementChanged( DependencyObject sender, DependencyP var rangeSlider = sender as RangeSlider; if( rangeSlider != null ) { - rangeSlider.OnTickPlacementChanged( (TickPlacement)e.OldValue, (TickPlacement)e.NewValue ); + rangeSlider.OnTickPlacementChanged( ( TickPlacement )e.OldValue, ( TickPlacement )e.NewValue ); } } @@ -800,7 +800,7 @@ internal static double GetThumbWidth( Slider slider ) { if( slider != null ) { - var track = (Track)slider.Template.FindName( "PART_Track", slider ); + var track = ( Track )slider.Template.FindName( "PART_Track", slider ); if( track != null ) { var thumb = track.Thumb; @@ -814,7 +814,7 @@ internal static double GetThumbHeight( Slider slider ) { if( slider != null ) { - var track = (Track)slider.Template.FindName( "PART_Track", slider ); + var track = ( Track )slider.Template.FindName( "PART_Track", slider ); if( track != null ) { var thumb = track.Thumb; @@ -846,7 +846,7 @@ private void AdjustView( bool isHigherValueChanged = false ) higherSliderThumbWidth = RangeSlider.GetThumbHeight( _higherSlider ); } - actualWidth -= (lowerSliderThumbWidth + higherSliderThumbWidth); + actualWidth -= ( lowerSliderThumbWidth + higherSliderThumbWidth ); if( !this.IsDeferredUpdateValues || ( _deferredUpdateValue == null ) ) { @@ -858,14 +858,14 @@ private void AdjustView( bool isHigherValueChanged = false ) if( entireRange > 0 ) { - var higherValue = this.IsDeferredUpdateValues && isHigherValueChanged && (_deferredUpdateValue != null ) ? _deferredUpdateValue.Value : cv.HigherValue; + var higherValue = this.IsDeferredUpdateValues && isHigherValueChanged && ( _deferredUpdateValue != null ) ? _deferredUpdateValue.Value : cv.HigherValue; var lowerValue = this.IsDeferredUpdateValues && !isHigherValueChanged && ( _deferredUpdateValue != null ) ? _deferredUpdateValue.Value : cv.LowerValue; - this.HigherRangeWidth = (actualWidth * (cv.Maximum - higherValue ) ) / entireRange; + this.HigherRangeWidth = ( actualWidth * ( cv.Maximum - higherValue ) ) / entireRange; - this.RangeWidth = (actualWidth * ( higherValue - lowerValue ) ) / entireRange; + this.RangeWidth = ( actualWidth * ( higherValue - lowerValue ) ) / entireRange; - this.LowerRangeWidth = (actualWidth * ( lowerValue - cv.Minimum)) / entireRange; + this.LowerRangeWidth = ( actualWidth * ( lowerValue - cv.Minimum ) ) / entireRange; } else { @@ -877,7 +877,7 @@ private void AdjustView( bool isHigherValueChanged = false ) private void SetSlidersMargins() { - if( (_lowerSlider != null) && (_higherSlider != null) ) + if( ( _lowerSlider != null ) && ( _higherSlider != null ) ) { if( this.Orientation == Orientation.Horizontal ) { @@ -1036,7 +1036,7 @@ private void Slider_Loaded( object sender, RoutedEventArgs e ) private void LowerSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs e ) { - if( (_lowerSlider != null) && _lowerSlider.IsLoaded ) + if( ( _lowerSlider != null ) && _lowerSlider.IsLoaded ) { if( !this.IsDeferredUpdateValues ) { @@ -1052,7 +1052,7 @@ private void LowerSlider_ValueChanged( object sender, RoutedPropertyChangedEvent private void HigherSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs e ) { - if( ( _higherSlider != null) && _higherSlider.IsLoaded ) + if( ( _higherSlider != null ) && _higherSlider.IsLoaded ) { if( !this.IsDeferredUpdateValues ) { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml index 56ab22467..11bb40aae 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml index e42b96f9a..ac83246f9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs index b39db0622..d24b83cb9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs index f3a1e2502..1c58498d6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs index 6991ce79d..78c3fde50 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs index b0e575284..86f21d0a5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs index f5087c973..bbe61b139 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,7 +18,6 @@ using System; using System.Windows; using System.Windows.Data; -using System.Windows.Threading; namespace Xceed.Wpf.Toolkit { @@ -109,7 +108,7 @@ protected virtual void OnTextFormatterPropertyChanged( ITextFormatter oldValue, protected override void OnTextChanged( System.Windows.Controls.TextChangedEventArgs e ) { this.UpdateTextFromDocument(); - base.OnTextChanged( e ); + base.OnTextChanged( e ); } private void UpdateTextFromDocument() diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs index 075cbb058..156cf1ef7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs index 9fe92689e..f66048db3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -53,13 +53,13 @@ public static double[] FontSizes { get { - return new double[] { - 3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, - 10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0, - 16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0, - 32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0, - 80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0 - }; + return new double[] { + 3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, + 10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0, + 16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0, + 32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0, + 80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0 + }; } } @@ -122,7 +122,7 @@ private void FontBackgroundColor_SelectedColorChanged( object sender, RoutedProp private void Bullets_Clicked( object sender, RoutedEventArgs e ) { - if( BothSelectionListsAreChecked() && ( _btnNumbers != null) ) + if( BothSelectionListsAreChecked() && ( _btnNumbers != null ) ) { _btnNumbers.IsChecked = false; } @@ -130,7 +130,7 @@ private void Bullets_Clicked( object sender, RoutedEventArgs e ) private void Numbers_Clicked( object sender, RoutedEventArgs e ) { - if( BothSelectionListsAreChecked() && ( _btnBullets != null) ) + if( BothSelectionListsAreChecked() && ( _btnBullets != null ) ) { _btnBullets.IsChecked = false; } @@ -294,7 +294,7 @@ private void UpdateSelectedFontFamily() return; FontFamily currentFontFamily = ( FontFamily )value; - if( (currentFontFamily != null) && ( _cmbFontFamilies != null) ) + if( ( currentFontFamily != null ) && ( _cmbFontFamilies != null ) ) { _cmbFontFamilies.SelectedItem = FontUtilities.GetFontFamilyName( currentFontFamily ); } @@ -328,7 +328,7 @@ private void UpdateFontColor() if( value == DependencyProperty.UnsetValue ) return; - Color? currentColor = ( ( value == null ) + Color? currentColor = ( ( value == null ) ? null : ( Color? )( ( SolidColorBrush )value ).Color ); if( _cmbFontColor != null ) @@ -362,7 +362,7 @@ private void UpdateFontBackgroundColor() /// private void UpdateSelectionListType() { - if( (_btnNumbers == null) || ( _btnBullets == null) ) + if( ( _btnNumbers == null ) || ( _btnBullets == null ) ) return; //uncheck both @@ -395,8 +395,8 @@ private void UpdateSelectionListType() /// private bool BothSelectionListsAreChecked() { - return (( _btnBullets != null) && (_btnBullets.IsChecked == true) ) - && (( _btnNumbers != null) && (_btnNumbers.IsChecked == true)); + return ( ( _btnBullets != null ) && ( _btnBullets.IsChecked == true ) ) + && ( ( _btnNumbers != null ) && ( _btnNumbers.IsChecked == true ) ); } void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value ) @@ -452,10 +452,10 @@ public bool PreventDisplayFadeOut { get { - return ( (( _cmbFontFamilies != null) && _cmbFontFamilies.IsDropDownOpen) - || (( _cmbFontSizes != null) && _cmbFontSizes.IsDropDownOpen) - || (( _cmbFontBackgroundColor != null) && _cmbFontBackgroundColor.IsOpen) - || (( _cmbFontColor != null) && _cmbFontColor.IsOpen) + return ( ( ( _cmbFontFamilies != null ) && _cmbFontFamilies.IsDropDownOpen ) + || ( ( _cmbFontSizes != null ) && _cmbFontSizes.IsDropDownOpen ) + || ( ( _cmbFontBackgroundColor != null ) && _cmbFontBackgroundColor.IsOpen ) + || ( ( _cmbFontColor != null ) && _cmbFontColor.IsOpen ) || _waitingForMouseOver ); } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs index 1261b0738..42c02cd7b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml index 870c93229..57301457f 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml index 4d4bbdfbe..469707561 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs index 76ab21ef7..23006aff3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -76,6 +76,6 @@ public override void OnApplyTemplate() } - #endregion //Base Class Overrides + #endregion //Base Class Overrides } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml index 578208f6b..b995a449e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml index 54a9c99ea..9f4b47d9a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs index ef7cb29ab..ebc59996e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -16,12 +16,9 @@ ***********************************************************************************/ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Data; using System.Globalization; using System.Windows; +using System.Windows.Data; namespace Xceed.Wpf.Toolkit.Converters { @@ -29,8 +26,8 @@ public class StyleableWindowClippingBorderConverter : IValueConverter { public object Convert( object value, Type targetType, object parameter, CultureInfo culture ) { - double borderThickness = (double)value; - return new Thickness( borderThickness, borderThickness, borderThickness, borderThickness * 2); + double borderThickness = ( double )value; + return new Thickness( borderThickness, borderThickness, borderThickness, borderThickness * 2 ); } public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture ) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml index f1708037a..b4e4a93e8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml index 5e2ce368e..3c201357c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml index 55c9d32a4..7d7780761 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml index c6b1f1b7b..83fe7d1c8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml index ad1c523f3..1116f52a5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml index dbffa7891..7028a4e9c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml index 61c8ca2eb..669e07dd8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml index 2f3355740..e3ae0fa12 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml index f32dda2ad..0972712ee 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml index 0a94f1503..ce8604a82 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml index e4d114422..d29bf90cc 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml index 2186161de..c6f0fe4f4 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml index 08ce08b08..c9af5e4f1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml index 8ea86d7a8..143fd9e04 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml index 8ea86d7a8..143fd9e04 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml index 7bf52b171..001eb08d9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml index 8ea86d7a8..143fd9e04 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml index 8ea86d7a8..143fd9e04 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs index 40ddf4391..085dd1ad9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs index 4acbcd78a..a9851f887 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,11 +17,11 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Windows; using System.Windows.Controls; using System.Windows.Input; using Xceed.Wpf.Toolkit.Core.Utilities; -using System.Collections.Generic; using Xceed.Wpf.Toolkit.Primitives; namespace Xceed.Wpf.Toolkit @@ -98,6 +98,48 @@ protected override void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat #endregion //Format + #region TimeListItemsStyle + + /// + /// TimeListItemsStyle Dependency Property + /// + public static readonly DependencyProperty TimeListItemsStyleProperty = DependencyProperty.Register( "TimeListItemsStyle", typeof( Style ), typeof( TimePicker ), + new FrameworkPropertyMetadata( ( Style )null, new PropertyChangedCallback( OnTimeListItemsStyleChanged ) ) ); + + /// + /// Gets or sets the TimeListItemsStyle property. + /// This dependency property indicates the style to apply to TimeListItems objects. + /// + public Style TimeListItemsStyle + { + get + { + return ( Style )GetValue( TimeListItemsStyleProperty ); + } + set + { + SetValue( TimeListItemsStyleProperty, value ); + } + } + + /// + /// Handles changes to the TimeListItemsStyle property. + /// + private static void OnTimeListItemsStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e ) + { + ( ( TimePicker )d ).OnTimeListItemsStyleChanged( e ); + } + + /// + /// Provides derived classes an opportunity to handle changes to the TimeListItemsStyle property. + /// + protected virtual void OnTimeListItemsStyleChanged( DependencyPropertyChangedEventArgs e ) + { + // TODO: Add your property changed side-effects. Descendants can override as well. + } + + #endregion + #region MaxDropDownHeight public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double ), typeof( TimePicker ), new UIPropertyMetadata( 130d, OnMaxDropDownHeightChanged ) ); @@ -307,7 +349,7 @@ protected override void Popup_Opened( object sender, EventArgs e ) { this.UpdateListBoxItems(); - var time = (this.Value != null) ? this.Value.Value.TimeOfDay : TimePicker.StartTimeDefaultValue; + var time = ( this.Value != null ) ? this.Value.Value.TimeOfDay : TimePicker.StartTimeDefaultValue; var nearestItem = this.GetNearestTimeItem( time ); if( nearestItem != null ) { @@ -395,8 +437,8 @@ private void TimeListBox_SelectionChanged( object sender, SelectionChangedEventA //} //else //{ - var date = this.Value ?? this.ContextNow; - this.Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind ); + var date = this.Value ?? this.ContextNow; + this.Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind ); //} } } @@ -476,7 +518,7 @@ public IEnumerable GenerateTimeListItemsSource() protected virtual TimeItem CreateTimeItem( TimeSpan time ) { var date = Value ?? this.ContextNow; - string formatString = this.GetFormatString( (DateTimeFormat)this.Format ); + string formatString = this.GetFormatString( ( DateTimeFormat )this.Format ); return new TimeItem( date.Date.Add( time ).ToString( formatString, CultureInfo ), time ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml index 86c380231..cbf4641b1 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -70,57 +70,13 @@ - @@ -156,6 +112,8 @@ Value="{StaticResource DropDownArrowGlyph}" /> + @@ -243,7 +201,7 @@ + ItemContainerStyle="{TemplateBinding TimeListItemsStyle}"> diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml index 18aa6cf5b..8ed4b2b66 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -150,6 +150,8 @@ Value="{StaticResource DropDownArrowGlyph}" /> + @@ -205,12 +207,12 @@ Height="{Binding DropDownButtonHeight, RelativeSource={RelativeSource TemplatedParent}}" Background="White" Focusable="False" - Content="{Binding DropDownButtonContent, RelativeSource={RelativeSource TemplatedParent}}" + Content="{Binding DropDownButtonContent, RelativeSource={RelativeSource TemplatedParent}}" IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource TimePickerToggleButtonStyle}" IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" - Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}" > + Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}"> + ItemContainerStyle="{TemplateBinding TimeListItemsStyle}"> diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs index 0711e8883..bba23033c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -132,6 +132,35 @@ protected virtual void OnShowDaysChanged( bool oldValue, bool newValue ) #endregion //ShowDays + #region ShowHours + + public static readonly DependencyProperty ShowHoursProperty = DependencyProperty.Register( "ShowHours", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowHoursChanged ) ); + public bool ShowHours + { + get + { + return ( bool )GetValue( ShowHoursProperty ); + } + set + { + SetValue( ShowHoursProperty, value ); + } + } + + private static void OnShowHoursChanged( DependencyObject o, DependencyPropertyChangedEventArgs e ) + { + var timeSpanUpDown = o as TimeSpanUpDown; + if( timeSpanUpDown != null ) + timeSpanUpDown.OnShowHoursChanged( ( bool )e.OldValue, ( bool )e.NewValue ); + } + + protected virtual void OnShowHoursChanged( bool oldValue, bool newValue ) + { + this.UpdateValue(); + } + + #endregion //ShowHours + #region ShowSeconds public static readonly DependencyProperty ShowSecondsProperty = DependencyProperty.Register( "ShowSeconds", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowSecondsChanged ) ); @@ -266,6 +295,14 @@ protected override string ConvertValueToText() var haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' ); var haveDays = ( separators.Count() > 1 ) && ( separators.First() == '.' ) && ( intValues.Count() >= 3 ); + if( !this.ShowHours ) + { + if( this.ShowDays ) + { + throw new NotSupportedException( "Cannot show days when show hours is set to false." ); + } + } + if( this.ShowDays ) { var days = haveDays ? intValues[ 0 ] : intValues[ 0 ] / 24; @@ -290,20 +327,37 @@ protected override string ConvertValueToText() } else { - var hours = intValues[ 0 ]; - if( hours > TimeSpan.MaxValue.TotalHours ) - return this.ResetToLastValidValue(); - var minutes = intValues[ 1 ]; - if( ( ( hours * TimeSpanUpDown.MinutesInHour ) + minutes ) > TimeSpan.MaxValue.TotalMinutes ) - return this.ResetToLastValidValue(); - var seconds = this.ShowSeconds && ( intValues.Count() >= 3 ) ? intValues[ 2 ] : 0; - if( ( ( hours * TimeSpanUpDown.SecondsInHour ) + ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds ) - return this.ResetToLastValidValue(); - var milliseconds = haveMS ? intValues.Last() : 0; - if( ( ( hours * TimeSpanUpDown.MilliSecondsInHour ) + ( minutes * TimeSpanUpDown.MilliSecondsInMinute ) + ( seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds ) - return this.ResetToLastValidValue(); - - timeSpan = new TimeSpan( 0, hours, minutes, seconds, milliseconds ); + if( this.ShowHours ) + { + var hours = intValues[ 0 ]; + if( hours > TimeSpan.MaxValue.TotalHours ) + return this.ResetToLastValidValue(); + var minutes = intValues[ 1 ]; + if( ( ( hours * TimeSpanUpDown.MinutesInHour ) + minutes ) > TimeSpan.MaxValue.TotalMinutes ) + return this.ResetToLastValidValue(); + var seconds = this.ShowSeconds && ( intValues.Count() >= 3 ) ? intValues[ 2 ] : 0; + if( ( ( hours * TimeSpanUpDown.SecondsInHour ) + ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds ) + return this.ResetToLastValidValue(); + var milliseconds = haveMS ? intValues.Last() : 0; + if( ( ( hours * TimeSpanUpDown.MilliSecondsInHour ) + ( minutes * TimeSpanUpDown.MilliSecondsInMinute ) + ( seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds ) + return this.ResetToLastValidValue(); + + timeSpan = new TimeSpan( 0, hours, minutes, seconds, milliseconds ); + } + else + { + var minutes = intValues[ 0 ]; + if( minutes > TimeSpan.MaxValue.TotalMinutes ) + return this.ResetToLastValidValue(); + var seconds = this.ShowSeconds && ( intValues.Count() >= 2 ) ? intValues[ 1 ] : 0; + if( ( ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds ) + return this.ResetToLastValidValue(); + var milliseconds = haveMS ? intValues.Last() : 0; + if( ( ( minutes * TimeSpanUpDown.MilliSecondsInMinute ) + ( seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds ) + return this.ResetToLastValidValue(); + + timeSpan = new TimeSpan( 0, 0, minutes, seconds, milliseconds ); + } } if( text.StartsWith( "-" ) ) @@ -454,6 +508,8 @@ protected override void InitializeDateTimeInfoList( TimeSpan? value ) { var lastDayInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Day ); bool hasDay = lastDayInfo != null; + var lastHourInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Hour12 || x.Type == DateTimePart.Hour24 ); + bool hasHour = lastHourInfo != null; var negInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Other ); bool hasNegative = ( negInfo != null ) && ( negInfo.Content == "-" ); @@ -471,6 +527,14 @@ protected override void InitializeDateTimeInfoList( TimeSpan? value ) } } + if( !this.ShowHours ) + { + if( this.ShowDays ) + { + throw new NotSupportedException( "Cannot show days when show hours is set to false." ); + } + } + if( this.ShowDays ) { if( value.HasValue ) @@ -506,9 +570,43 @@ protected override void InitializeDateTimeInfoList( TimeSpan? value ) } } - _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Hour24, Length = 2, Format = "hh" } ); - _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } ); + if( this.ShowHours ) + { + if( value.HasValue ) + { + int hourLength = Math.Abs( value.Value.Hours ).ToString( "00" ).Length; + _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Hour24, Length = Math.Max( 2, hourLength ), Format = "hh" } ); + _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } ); + + if( this.TextBox != null ) + { + //number of digits for hours has changed when selection is not on date part, move TextBox.Selection to keep it on current DateTimeInfo + if( hasHour && ( hourLength != lastHourInfo.Length ) && ( _selectedDateTimeInfo.Type != DateTimePart.Hour24 ) ) + { + _fireSelectionChangedEvent = false; + this.TextBox.SelectionStart = Math.Max( 0, this.TextBox.SelectionStart + ( hourLength - lastHourInfo.Length ) ); + _fireSelectionChangedEvent = true; + } + // hour has been added, move TextBox.Selection to keep it on current DateTimeInfo + else if( !hasHour ) + { + _fireSelectionChangedEvent = false; + this.TextBox.SelectionStart += ( hourLength + 1 ); + _fireSelectionChangedEvent = true; + } + } + } + // Hour has been removed, move TextBox.Selection to keep it on current DateTimeInfo + else if( hasHour ) + { + _fireSelectionChangedEvent = false; + this.TextBox.SelectionStart = Math.Max( hasNegative ? 1 : 0, this.TextBox.SelectionStart - ( lastHourInfo.Length + 1 ) ); + _fireSelectionChangedEvent = true; + } + } + _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Minute, Length = 2, Format = "mm" } ); + if( this.ShowSeconds ) { _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } ); diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml index 16a54f25b..62a3c9ae6 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml index b22cde2ad..5461219c9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs index 2bb2c998b..6d87f6a2e 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs index 209601c76..9e930b267 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs index 6d516c0b3..206353122 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -555,7 +555,7 @@ private void LayoutItems( UIElementCollection children, Size availableSize ) break; - #endregion + #endregion //--------------------------------------------------------------------- // @@ -598,7 +598,7 @@ private void LayoutItems( UIElementCollection children, Size availableSize ) break; - #endregion + #endregion //--------------------------------------------------------------------- // @@ -721,7 +721,7 @@ private void LayoutItems( UIElementCollection children, Size availableSize ) break; - #endregion + #endregion //--------------------------------------------------------------------- // @@ -842,7 +842,7 @@ private void LayoutItems( UIElementCollection children, Size availableSize ) break; - #endregion + #endregion //--------------------------------------------------------------------- // @@ -885,7 +885,7 @@ private void LayoutItems( UIElementCollection children, Size availableSize ) break; - #endregion + #endregion //--------------------------------------------------------------------- // @@ -1008,7 +1008,7 @@ private void LayoutItems( UIElementCollection children, Size availableSize ) break; - #endregion + #endregion //--------------------------------------------------------------------- // diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs index bfb3b82b4..1a43d818a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -29,40 +29,40 @@ private ThrowException() public static void ThrowArgumentException( string message, string paramName, Exception innerExcept ) { - #if ( XCEEDCF || SILVERLIGHT || PORTABLE ) +#if( XCEEDCF || SILVERLIGHT || PORTABLE ) throw new ArgumentException( message, innerExcept ); - #else +#else throw new ArgumentException( message, paramName, innerExcept ); - #endif +#endif } public static void ThrowArgumentOutOfRangeException( string paramName, object value, string message ) { - #if ( XCEEDCF || SILVERLIGHT || PORTABLE ) +#if( XCEEDCF || SILVERLIGHT || PORTABLE ) throw new ArgumentOutOfRangeException( message ); - #else +#else throw new ArgumentOutOfRangeException( paramName, value, message ); - #endif +#endif } - #if !NO_CODE_ANALYSIS +#if !NO_CODE_ANALYSIS [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type" )] - #endif // !NO_CODE_ANALYSIS +#endif // !NO_CODE_ANALYSIS public static void ThrowLicenseException( Type type, object instance, string message ) { - #if PORTABLE || NETCORE || NET5 +#if PORTABLE || NETCORE || NET5 throw new Exception( message ); - #elif ( XCEEDCF || SILVERLIGHT || XAMARIN ) +#elif ( XCEEDCF || SILVERLIGHT || XAMARIN ) throw new SystemException( message ); - #else - #if XBAP_FRIENDLY +#else +#if XBAP_FRIENDLY // Under some circumstances, passing a type to a LicenseException will throw a // FileNotFoundException on the assembly containing the type. throw new System.ComponentModel.LicenseException( null, instance, message ); - #else +#else throw new System.ComponentModel.LicenseException( type, instance, message ); - #endif // XBAP_FRIENDLY - #endif // ( XCEEDCF || NETCORE || NET5) +#endif // XBAP_FRIENDLY +#endif // ( XCEEDCF || NETCORE || NET5) } #endregion PUBLIC STATIC METHODS diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs index 0fdb7e24d..b2399821a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs index 9a71ae339..b81ac78e9 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -17,6 +17,7 @@ using System.Windows; using System.Windows.Controls; +using System.Windows.Media; namespace Xceed.Wpf.Toolkit { @@ -56,7 +57,26 @@ public DataTemplate WatermarkTemplate } } - #endregion //WatermarkTemplate + #endregion //WatermarkBackground + + #region WatermarkBackground + + public static readonly DependencyProperty WatermarkBackgroundProperty = DependencyProperty.RegisterAttached( + "WatermarkBackground", typeof( Brush ), typeof( WatermarkComboBox ), new PropertyMetadata( ( Brush )null ) ); + + public Brush WatermarkBackground + { + get + { + return ( Brush )GetValue( WatermarkBackgroundProperty ); + } + set + { + SetValue( WatermarkBackgroundProperty, value ); + } + } + + #endregion //WatermarkBackground #endregion //Properties diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml index 165dbd2a3..92db61317 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -95,16 +95,8 @@ - - - - - - + SnapsToDevicePixels="True" + Background="{Binding WatermarkBackground, RelativeSource={RelativeSource AncestorType={x:Type local:WatermarkComboBox}}}"> + + @@ -177,6 +173,8 @@ Value="true" /> + + @@ -235,6 +235,8 @@ Value="true" /> + + + - - - - - - + SnapsToDevicePixels="True" + Background="{Binding WatermarkBackground, RelativeSource={RelativeSource AncestorType={x:Type local:WatermarkComboBox}}}"> + + @@ -177,6 +173,8 @@ Value="true" /> + + @@ -235,6 +235,8 @@ Value="true" /> + + + 0) ? this.CaretIndex : this.CaretIndex - 1 ); + this.PasswordRemove( ( this.SelectedText.Length > 0 ) ? this.CaretIndex : this.CaretIndex - 1 ); e.Handled = true; //Handle to prevent TextChanged when OnPreviewKeyDown exists break; case Key.Delete: @@ -172,7 +172,7 @@ protected override void OnPreviewKeyDown( KeyEventArgs e ) e.Handled = true; //Handle to prevent TextChanged when OnPreviewKeyDown exist break; case Key.V: - if( (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control ) + if( ( Keyboard.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control ) { if( Clipboard.ContainsText() ) { @@ -240,7 +240,7 @@ protected override void OnTextChanged( TextChangedEventArgs e ) #region Event Handlers - [ SecuritySafeCritical] + [SecuritySafeCritical] private void OnPaste( object sender, DataObjectPastingEventArgs e ) { //Pasting something that is not text @@ -276,7 +276,7 @@ private void PasswordInsert( string text, int index ) { if( text == null ) return; - if( (index < 0) || (index > this.Password.Length) ) + if( ( index < 0 ) || ( index > this.Password.Length ) ) return; //If there is a selection, remove it first @@ -289,7 +289,7 @@ private void PasswordInsert( string text, int index ) for( int i = 0; i < text.Length; ++i ) { // MaxLength == 0 is no limit - if( (this.MaxLength == 0) || (newPassword.Length < this.MaxLength) ) + if( ( this.MaxLength == 0 ) || ( newPassword.Length < this.MaxLength ) ) { newPassword = newPassword.Insert( index++, text[ i ].ToString() ); } @@ -300,7 +300,7 @@ private void PasswordInsert( string text, int index ) [SecurityCritical] private void PasswordRemove( int index ) { - if( (index < 0) || (index >= this.Password.Length) ) + if( ( index < 0 ) || ( index >= this.Password.Length ) ) return; if( this.SelectedText.Length > 0 ) @@ -308,7 +308,7 @@ private void PasswordRemove( int index ) var newPassword = this.Password; for( int i = 0; i < this.SelectedText.Length; ++i ) { - newPassword = newPassword.Remove( index, 1 ); + newPassword = newPassword.Remove( index, 1 ); } this.SetPassword( newPassword, index ); } @@ -329,7 +329,7 @@ private void SetPassword( string password, int caretIndex ) private void SyncTextPassword( int nextCarretIndex ) { var sb = new StringBuilder(); - this.Text = sb.Append( Enumerable.Repeat(this.PasswordChar, this.Password.Length).ToArray() ).ToString(); + this.Text = sb.Append( Enumerable.Repeat( this.PasswordChar, this.Password.Length ).ToArray() ).ToString(); //set CaretIndex after Text is changed this.CaretIndex = Math.Max( nextCarretIndex, 0 ); } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs index 64151ad5f..1c09a5ddf 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml index 5c8c9371f..e71566eb5 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml index c70395ea1..bbddeeb4d 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs index e9c771726..509f2f8ac 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -664,7 +664,7 @@ private void Window_Closing( object sender, CancelEventArgs e ) if( !e.Cancel ) { // Set dialog result only when closing is not canceled. - window.DialogResult = _dialogResult; + window.DialogResult = _dialogResult; } _dialogResult = null; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs index 08c5b2a68..da8aac916 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs index fdeebc5bb..c31c3eb00 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs index 6709888f8..dd94de8d3 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs index e69f0951b..8d84c194b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml index 87a400567..418b89770 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml index 5840830d1..4bb12c715 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj new file mode 100644 index 000000000..3204ee07b --- /dev/null +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj @@ -0,0 +1,969 @@ + + + + obj\net5\ + false + false + + + + net5.0-windows + Xceed.Wpf.Toolkit + Xceed.Wpf.Toolkit.NET5 + false + true + + + TRACE;DEBUG;NET5 + full + True + + + TRACE;NET5 + none + False + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CollectionControlDialog.xaml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + Code + + + + Code + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ErrorMessages.cs + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml index 19a6af600..48a4f66d2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml index da83867c7..a31022ecd 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs index dcef5917e..a6011d3d0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -82,13 +82,13 @@ public Zoombox() this.Loaded += this.Zoombox_Loaded; } -#endregion + #endregion -#region AnimationAccelerationRatio Property + #region AnimationAccelerationRatio Property public static readonly DependencyProperty AnimationAccelerationRatioProperty = DependencyProperty.Register( "AnimationAccelerationRatio", typeof( double ), typeof( Zoombox ), - new FrameworkPropertyMetadata( 0d ), + new FrameworkPropertyMetadata( 0d ), new ValidateValueCallback( Zoombox.ValidateAccelerationRatio ) ); public double AnimationAccelerationRatio @@ -112,13 +112,13 @@ private static bool ValidateAccelerationRatio( object value ) return true; } -#endregion + #endregion -#region AnimationDecelerationRatio Property + #region AnimationDecelerationRatio Property public static readonly DependencyProperty AnimationDecelerationRatioProperty = DependencyProperty.Register( "AnimationDecelerationRatio", typeof( double ), typeof( Zoombox ), - new FrameworkPropertyMetadata( 0d ), + new FrameworkPropertyMetadata( 0d ), new ValidateValueCallback( Zoombox.ValidateDecelerationRatio ) ); public double AnimationDecelerationRatio @@ -142,9 +142,9 @@ private static bool ValidateDecelerationRatio( object value ) return true; } -#endregion + #endregion -#region AnimationDuration Property + #region AnimationDuration Property public static readonly DependencyProperty AnimationDurationProperty = DependencyProperty.Register( "AnimationDuration", typeof( Duration ), typeof( Zoombox ), @@ -162,9 +162,9 @@ public Duration AnimationDuration } } -#endregion + #endregion -#region AreDragModifiersActive Property + #region AreDragModifiersActive Property private static readonly DependencyPropertyKey AreDragModifiersActivePropertyKey = DependencyProperty.RegisterReadOnly( "AreDragModifiersActive", typeof( bool ), typeof( Zoombox ), @@ -185,9 +185,9 @@ private void SetAreDragModifiersActive( bool value ) this.SetValue( Zoombox.AreDragModifiersActivePropertyKey, value ); } -#endregion + #endregion -#region AreRelativeZoomModifiersActive Property + #region AreRelativeZoomModifiersActive Property private static readonly DependencyPropertyKey AreRelativeZoomModifiersActivePropertyKey = DependencyProperty.RegisterReadOnly( "AreRelativeZoomModifiersActive", typeof( bool ), typeof( Zoombox ), @@ -208,9 +208,9 @@ private void SetAreRelativeZoomModifiersActive( bool value ) this.SetValue( Zoombox.AreRelativeZoomModifiersActivePropertyKey, value ); } -#endregion + #endregion -#region AreZoomModifiersActive Property + #region AreZoomModifiersActive Property private static readonly DependencyPropertyKey AreZoomModifiersActivePropertyKey = DependencyProperty.RegisterReadOnly( "AreZoomModifiersActive", typeof( bool ), typeof( Zoombox ), @@ -231,9 +231,9 @@ private void SetAreZoomModifiersActive( bool value ) this.SetValue( Zoombox.AreZoomModifiersActivePropertyKey, value ); } -#endregion + #endregion -#region AreZoomToSelectionModifiersActive Property + #region AreZoomToSelectionModifiersActive Property private static readonly DependencyPropertyKey AreZoomToSelectionModifiersActivePropertyKey = DependencyProperty.RegisterReadOnly( "AreZoomToSelectionModifiersActive", typeof( bool ), typeof( Zoombox ), @@ -254,13 +254,13 @@ private void SetAreZoomToSelectionModifiersActive( bool value ) this.SetValue( Zoombox.AreZoomToSelectionModifiersActivePropertyKey, value ); } -#endregion + #endregion -#region AutoWrapContentWithViewbox Property + #region AutoWrapContentWithViewbox Property public static readonly DependencyProperty AutoWrapContentWithViewboxProperty = DependencyProperty.Register( "AutoWrapContentWithViewbox", typeof( bool ), typeof( Zoombox ), - new FrameworkPropertyMetadata( true, + new FrameworkPropertyMetadata( true, new PropertyChangedCallback( Zoombox.OnAutoWrapContentWithViewboxChanged ) ) ); public bool AutoWrapContentWithViewbox @@ -373,13 +373,13 @@ private object CoerceContentValue( object value ) private UIElement _trueContent; //null -#endregion + #endregion -#region CurrentView Property + #region CurrentView Property private static readonly DependencyPropertyKey CurrentViewPropertyKey = DependencyProperty.RegisterReadOnly( "CurrentView", typeof( ZoomboxView ), typeof( Zoombox ), - new FrameworkPropertyMetadata( ZoomboxView.Empty, + new FrameworkPropertyMetadata( ZoomboxView.Empty, new PropertyChangedCallback( Zoombox.OnCurrentViewChanged ) ) ); public static readonly DependencyProperty CurrentViewProperty = Zoombox.CurrentViewPropertyKey.DependencyProperty; @@ -407,9 +407,9 @@ private static void OnCurrentViewChanged( DependencyObject o, DependencyProperty zoombox.RaiseEvent( new ZoomboxViewChangedEventArgs( e.OldValue as ZoomboxView, e.NewValue as ZoomboxView, zoombox._lastViewIndex, zoombox.CurrentViewIndex ) ); } -#endregion + #endregion -#region CurrentViewIndex Property + #region CurrentViewIndex Property private static readonly DependencyPropertyKey CurrentViewIndexPropertyKey = DependencyProperty.RegisterReadOnly( "CurrentViewIndex", typeof( int ), typeof( Zoombox ), @@ -430,9 +430,9 @@ internal void SetCurrentViewIndex( int value ) this.SetValue( Zoombox.CurrentViewIndexPropertyKey, value ); } -#endregion + #endregion -#region DragModifiers Property + #region DragModifiers Property public static readonly DependencyProperty DragModifiersProperty = DependencyProperty.Register( "DragModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ), @@ -459,9 +459,9 @@ private static KeyModifierCollection GetDefaultDragModifiers() return result; } -#endregion + #endregion -#region DragOnPreview Property + #region DragOnPreview Property public static readonly DependencyProperty DragOnPreviewProperty = DependencyProperty.Register( "DragOnPreview", typeof( bool ), typeof( Zoombox ), @@ -479,9 +479,9 @@ public bool DragOnPreview } } -#endregion + #endregion -#region EffectiveViewStackMode Property + #region EffectiveViewStackMode Property private static readonly DependencyPropertyKey EffectiveViewStackModePropertyKey = DependencyProperty.RegisterReadOnly( "EffectiveViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ), @@ -502,9 +502,9 @@ private void SetEffectiveViewStackMode( ZoomboxViewStackMode value ) this.SetValue( Zoombox.EffectiveViewStackModePropertyKey, value ); } -#endregion + #endregion -#region HasBackStack Property + #region HasBackStack Property private static readonly DependencyPropertyKey HasBackStackPropertyKey = DependencyProperty.RegisterReadOnly( "HasBackStack", typeof( bool ), typeof( Zoombox ), @@ -520,9 +520,9 @@ public bool HasBackStack } } -#endregion + #endregion -#region HasForwardStack Property + #region HasForwardStack Property private static readonly DependencyPropertyKey HasForwardStackPropertyKey = DependencyProperty.RegisterReadOnly( "HasForwardStack", typeof( bool ), typeof( Zoombox ), @@ -538,13 +538,13 @@ public bool HasForwardStack } } -#endregion + #endregion -#region IsAnimated Property + #region IsAnimated Property public static readonly DependencyProperty IsAnimatedProperty = DependencyProperty.Register( "IsAnimated", typeof( bool ), typeof( Zoombox ), - new FrameworkPropertyMetadata( true, + new FrameworkPropertyMetadata( true, ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceIsAnimatedValue ) ) ); public bool IsAnimated @@ -570,9 +570,9 @@ private static object CoerceIsAnimatedValue( DependencyObject d, object value ) return result; } -#endregion + #endregion -#region IsDraggingContent Property + #region IsDraggingContent Property private static readonly DependencyPropertyKey IsDraggingContentPropertyKey = DependencyProperty.RegisterReadOnly( "IsDraggingContent", typeof( bool ), typeof( Zoombox ), @@ -593,9 +593,9 @@ private void SetIsDraggingContent( bool value ) this.SetValue( Zoombox.IsDraggingContentPropertyKey, value ); } -#endregion + #endregion -#region IsSelectingRegion Property + #region IsSelectingRegion Property private static readonly DependencyPropertyKey IsSelectingRegionPropertyKey = DependencyProperty.RegisterReadOnly( "IsSelectingRegion", typeof( bool ), typeof( Zoombox ), @@ -616,9 +616,9 @@ private void SetIsSelectingRegion( bool value ) this.SetValue( Zoombox.IsSelectingRegionPropertyKey, value ); } -#endregion + #endregion -#region IsUsingScrollBars Property + #region IsUsingScrollBars Property public static readonly DependencyProperty IsUsingScrollBarsProperty = DependencyProperty.Register( "IsUsingScrollBars", typeof( bool ), typeof( Zoombox ), @@ -636,9 +636,9 @@ public bool IsUsingScrollBars } } -#endregion + #endregion -#region MaxScale Property + #region MaxScale Property public static readonly DependencyProperty MaxScaleProperty = DependencyProperty.Register( "MaxScale", typeof( double ), typeof( Zoombox ), @@ -675,9 +675,9 @@ private static object CoerceMaxScaleValue( DependencyObject d, object value ) return result; } -#endregion + #endregion -#region MinScale Property + #region MinScale Property public static readonly DependencyProperty MinScaleProperty = DependencyProperty.Register( "MinScale", typeof( double ), typeof( Zoombox ), @@ -714,9 +714,9 @@ private static object CoerceMinScaleValue( DependencyObject d, object value ) return result; } -#endregion + #endregion -#region NavigateOnPreview Property + #region NavigateOnPreview Property public static readonly DependencyProperty NavigateOnPreviewProperty = DependencyProperty.Register( "NavigateOnPreview", typeof( bool ), typeof( Zoombox ), @@ -734,9 +734,9 @@ public bool NavigateOnPreview } } -#endregion + #endregion -#region PanDistance Property + #region PanDistance Property public static readonly DependencyProperty PanDistanceProperty = DependencyProperty.Register( "PanDistance", typeof( double ), typeof( Zoombox ), @@ -754,9 +754,9 @@ public double PanDistance } } -#endregion + #endregion -#region Position Property + #region Position Property public static readonly DependencyProperty PositionProperty = DependencyProperty.Register( "Position", typeof( Point ), typeof( Zoombox ), @@ -788,9 +788,9 @@ private static void OnPositionChanged( DependencyObject o, DependencyPropertyCha } } -#endregion + #endregion -#region RelativeZoomModifiers Property + #region RelativeZoomModifiers Property public static readonly DependencyProperty RelativeZoomModifiersProperty = DependencyProperty.Register( "RelativeZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ), @@ -818,13 +818,13 @@ private static KeyModifierCollection GetDefaultRelativeZoomModifiers() return result; } -#endregion + #endregion -#region Scale Property + #region Scale Property public static readonly DependencyProperty ScaleProperty = DependencyProperty.Register( "Scale", typeof( double ), typeof( Zoombox ), - new FrameworkPropertyMetadata( double.NaN, + new FrameworkPropertyMetadata( double.NaN, new PropertyChangedCallback( Zoombox.OnScaleChanged ), new CoerceValueCallback( Zoombox.CoerceScaleValue ) ) ); public double Scale @@ -867,9 +867,9 @@ private static object CoerceScaleValue( DependencyObject d, object value ) return result; } -#endregion + #endregion -#region ViewFinder Property + #region ViewFinder Property private static readonly DependencyPropertyKey ViewFinderPropertyKey = DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ), @@ -900,9 +900,9 @@ private void OnViewFinderChanged( DependencyPropertyChangedEventArgs e ) _isUsingDefaultViewFinder = false; } -#endregion + #endregion -#region ViewFinderVisibility Attached Property + #region ViewFinderVisibility Attached Property public static readonly DependencyProperty ViewFinderVisibilityProperty = DependencyProperty.RegisterAttached( "ViewFinderVisibility", typeof( Visibility ), typeof( Zoombox ), @@ -918,13 +918,13 @@ public static void SetViewFinderVisibility( DependencyObject d, Visibility value d.SetValue( Zoombox.ViewFinderVisibilityProperty, value ); } -#endregion + #endregion -#region Viewport Property + #region Viewport Property private static readonly DependencyPropertyKey ViewportPropertyKey = DependencyProperty.RegisterReadOnly( "Viewport", typeof( Rect ), typeof( Zoombox ), - new FrameworkPropertyMetadata( Rect.Empty, + new FrameworkPropertyMetadata( Rect.Empty, new PropertyChangedCallback( Zoombox.OnViewportChanged ) ) ); public static readonly DependencyProperty ViewportProperty = Zoombox.ViewportPropertyKey.DependencyProperty; @@ -944,9 +944,9 @@ private static void OnViewportChanged( DependencyObject o, DependencyPropertyCha zoombox.Position = new Point( -zoombox.Viewport.Left * zoombox.Scale / zoombox._viewboxFactor, -zoombox.Viewport.Top * zoombox.Scale / zoombox._viewboxFactor ); } -#endregion + #endregion -#region ViewStackCount Property + #region ViewStackCount Property private static readonly DependencyPropertyKey ViewStackCountPropertyKey = DependencyProperty.RegisterReadOnly( "ViewStackCount", typeof( int ), typeof( Zoombox ), @@ -981,9 +981,9 @@ private void OnViewStackCountChanged( DependencyPropertyChangedEventArgs e ) this.UpdateStackProperties(); } -#endregion + #endregion -#region ViewStackIndex Property + #region ViewStackIndex Property public static readonly DependencyProperty ViewStackIndexProperty = DependencyProperty.Register( "ViewStackIndex", typeof( int ), typeof( Zoombox ), @@ -1033,11 +1033,11 @@ private static object CoerceViewStackIndexValue( DependencyObject d, object valu return ( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled ) ? -1 : value; } -#endregion + #endregion -#region ViewStackMode Property + #region ViewStackMode Property - public static readonly DependencyProperty ViewStackModeProperty = + public static readonly DependencyProperty ViewStackModeProperty = DependencyProperty.Register( "ViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ), new FrameworkPropertyMetadata( ZoomboxViewStackMode.Default, new PropertyChangedCallback( Zoombox.OnViewStackModeChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackModeValue ) ) ); @@ -1097,9 +1097,9 @@ private static object CoerceViewStackModeValue( DependencyObject d, object value return value; } -#endregion + #endregion -#region ViewStackSource Property + #region ViewStackSource Property public static readonly DependencyProperty ViewStackSourceProperty = DependencyProperty.Register( "ViewStackSource", typeof( IEnumerable ), typeof( Zoombox ), @@ -1150,9 +1150,9 @@ private static void OnViewStackSourceChanged( DependencyObject d, DependencyProp zoombox.CoerceValue( Zoombox.ViewStackModeProperty ); } -#endregion + #endregion -#region ZoomModifiers Property + #region ZoomModifiers Property public static readonly DependencyProperty ZoomModifiersProperty = DependencyProperty.Register( "ZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ), @@ -1179,9 +1179,9 @@ private static KeyModifierCollection GetDefaultZoomModifiers() return result; } -#endregion + #endregion -#region ZoomOnPreview Property + #region ZoomOnPreview Property public static readonly DependencyProperty ZoomOnPreviewProperty = DependencyProperty.Register( "ZoomOnPreview", typeof( bool ), typeof( Zoombox ), @@ -1199,9 +1199,9 @@ public bool ZoomOnPreview } } -#endregion + #endregion -#region ZoomOrigin Property + #region ZoomOrigin Property public static readonly DependencyProperty ZoomOriginProperty = DependencyProperty.Register( "ZoomOrigin", typeof( Point ), typeof( Zoombox ), @@ -1219,9 +1219,9 @@ public Point ZoomOrigin } } -#endregion + #endregion -#region ZoomPercentage Property + #region ZoomPercentage Property public static readonly DependencyProperty ZoomPercentageProperty = DependencyProperty.Register( "ZoomPercentage", typeof( double ), typeof( Zoombox ), @@ -1239,9 +1239,9 @@ public double ZoomPercentage } } -#endregion + #endregion -#region ZoomOn Property + #region ZoomOn Property public static readonly DependencyProperty ZoomOnProperty = DependencyProperty.Register( "ZoomOn", typeof( ZoomboxZoomOn ), typeof( Zoombox ), @@ -1259,9 +1259,9 @@ public ZoomboxZoomOn ZoomOn } } -#endregion + #endregion -#region ZoomToSelectionModifiers Property + #region ZoomToSelectionModifiers Property public static readonly DependencyProperty ZoomToSelectionModifiersProperty = DependencyProperty.Register( "ZoomToSelectionModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ), @@ -1288,13 +1288,13 @@ private static KeyModifierCollection GetDefaultZoomToSelectionModifiers() return result; } -#endregion + #endregion -#region KeepContentInBounds Property + #region KeepContentInBounds Property public static readonly DependencyProperty KeepContentInBoundsProperty = DependencyProperty.Register( "KeepContentInBounds", typeof( bool ), typeof( Zoombox ), - new FrameworkPropertyMetadata( false, + new FrameworkPropertyMetadata( false, new PropertyChangedCallback( Zoombox.OnKeepContentInBoundsChanged ) ) ); public bool KeepContentInBounds @@ -1331,9 +1331,9 @@ private void OnKeepContentInBoundsChanged( DependencyPropertyChangedEventArgs e } } -#endregion + #endregion -#region ViewStack Property + #region ViewStack Property public ZoomboxViewStack ViewStack { @@ -1347,9 +1347,9 @@ public ZoomboxViewStack ViewStack } } -#endregion + #endregion -#region HasArrangedContentPresenter Internal Property + #region HasArrangedContentPresenter Internal Property internal bool HasArrangedContentPresenter { @@ -1363,9 +1363,9 @@ internal bool HasArrangedContentPresenter } } -#endregion + #endregion -#region IsUpdatingView Internal Property + #region IsUpdatingView Internal Property internal bool IsUpdatingView { @@ -1379,9 +1379,9 @@ internal bool IsUpdatingView } } -#endregion + #endregion -#region ContentOffset Private Property + #region ContentOffset Private Property private Vector ContentOffset { @@ -1423,9 +1423,9 @@ private Vector ContentOffset } } -#endregion + #endregion -#region ContentRect Private Property + #region ContentRect Private Property private Rect ContentRect { @@ -1436,9 +1436,9 @@ private Rect ContentRect } } -#endregion + #endregion -#region HasRenderedFirstView Private Property + #region HasRenderedFirstView Private Property private bool HasRenderedFirstView { @@ -1452,9 +1452,9 @@ private bool HasRenderedFirstView } } -#endregion + #endregion -#region HasUIPermission Private Property + #region HasUIPermission Private Property private bool HasUIPermission { @@ -1464,9 +1464,9 @@ private bool HasUIPermission } } -#endregion + #endregion -#region IsContentWrapped Private Property + #region IsContentWrapped Private Property private bool IsContentWrapped { @@ -1480,9 +1480,9 @@ private bool IsContentWrapped } } -#endregion + #endregion -#region IsDraggingViewport Private Property + #region IsDraggingViewport Private Property private bool IsDraggingViewport { @@ -1496,9 +1496,9 @@ private bool IsDraggingViewport } } -#endregion + #endregion -#region IsMonitoringInput Private Property + #region IsMonitoringInput Private Property private bool IsMonitoringInput { @@ -1512,9 +1512,9 @@ private bool IsMonitoringInput } } -#endregion + #endregion -#region IsResizingViewport Private Property + #region IsResizingViewport Private Property private bool IsResizingViewport { @@ -1528,9 +1528,9 @@ private bool IsResizingViewport } } -#endregion + #endregion -#region IsUpdatingViewport Private Property + #region IsUpdatingViewport Private Property private bool IsUpdatingViewport { @@ -1544,9 +1544,9 @@ private bool IsUpdatingViewport } } -#endregion + #endregion -#region RefocusViewOnFirstRender Private Property + #region RefocusViewOnFirstRender Private Property private bool RefocusViewOnFirstRender { @@ -1560,9 +1560,9 @@ private bool RefocusViewOnFirstRender } } -#endregion + #endregion -#region ViewFinderDisplayRect Private Property + #region ViewFinderDisplayRect Private Property private Rect ViewFinderDisplayRect { @@ -1573,9 +1573,9 @@ private Rect ViewFinderDisplayRect } } -#endregion + #endregion -#region AnimationBeginning Event + #region AnimationBeginning Event public static readonly RoutedEvent AnimationBeginningEvent = EventManager.RegisterRoutedEvent( "AnimationBeginning", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) ); @@ -1591,9 +1591,9 @@ private Rect ViewFinderDisplayRect } } -#endregion + #endregion -#region AnimationCompleted Event + #region AnimationCompleted Event public static readonly RoutedEvent AnimationCompletedEvent = EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) ); @@ -1609,9 +1609,9 @@ private Rect ViewFinderDisplayRect } } -#endregion + #endregion -#region CurrentViewChanged Event + #region CurrentViewChanged Event public static readonly RoutedEvent CurrentViewChangedEvent = EventManager.RegisterRoutedEvent( "CurrentViewChanged", RoutingStrategy.Bubble, typeof( ZoomboxViewChangedEventHandler ), typeof( Zoombox ) ); @@ -1627,11 +1627,11 @@ private Rect ViewFinderDisplayRect } } -#endregion + #endregion public event EventHandler Scroll; -#region ViewStackIndexChanged Event + #region ViewStackIndexChanged Event public static readonly RoutedEvent ViewStackIndexChangedEvent = EventManager.RegisterRoutedEvent( "ViewStackIndexChanged", RoutingStrategy.Bubble, typeof( IndexChangedEventHandler ), typeof( Zoombox ) ); @@ -1647,9 +1647,9 @@ private Rect ViewFinderDisplayRect } } -#endregion + #endregion -#region Back Command + #region Back Command public static RoutedUICommand Back = new RoutedUICommand( "Go Back", "GoBack", typeof( Zoombox ) ); @@ -1664,9 +1664,9 @@ private void GoBack( object sender, ExecutedRoutedEventArgs e ) this.GoBack(); } -#endregion + #endregion -#region Center Command + #region Center Command public static RoutedUICommand Center = new RoutedUICommand( "Center Content", "Center", typeof( Zoombox ) ); @@ -1675,9 +1675,9 @@ private void CenterContent( object sender, ExecutedRoutedEventArgs e ) this.CenterContent(); } -#endregion + #endregion -#region Fill Command + #region Fill Command public static RoutedUICommand Fill = new RoutedUICommand( "Fill Bounds with Content", "FillToBounds", typeof( Zoombox ) ); @@ -1686,9 +1686,9 @@ private void FillToBounds( object sender, ExecutedRoutedEventArgs e ) this.FillToBounds(); } -#endregion + #endregion -#region Fit Command + #region Fit Command public static RoutedUICommand Fit = new RoutedUICommand( "Fit Content within Bounds", "FitToBounds", typeof( Zoombox ) ); @@ -1697,9 +1697,9 @@ private void FitToBounds( object sender, ExecutedRoutedEventArgs e ) this.FitToBounds(); } -#endregion + #endregion -#region Forward Command + #region Forward Command public static RoutedUICommand Forward = new RoutedUICommand( "Go Forward", "GoForward", typeof( Zoombox ) ); @@ -1714,9 +1714,9 @@ private void GoForward( object sender, ExecutedRoutedEventArgs e ) this.GoForward(); } -#endregion + #endregion -#region Home Command + #region Home Command public static RoutedUICommand Home = new RoutedUICommand( "Go Home", "GoHome", typeof( Zoombox ) ); @@ -1732,9 +1732,9 @@ private void GoHome( object sender, ExecutedRoutedEventArgs e ) this.GoHome(); } -#endregion + #endregion -#region PanDown Command + #region PanDown Command public static RoutedUICommand PanDown = new RoutedUICommand( "Pan Down", "PanDown", typeof( Zoombox ) ); @@ -1743,9 +1743,9 @@ private void PanDownExecuted( object sender, ExecutedRoutedEventArgs e ) this.Position = new Point( _basePosition.X, _basePosition.Y + PanDistance ); } -#endregion + #endregion -#region PanLeft Command + #region PanLeft Command public static RoutedUICommand PanLeft = new RoutedUICommand( "Pan Left", "PanLeft", typeof( Zoombox ) ); @@ -1754,9 +1754,9 @@ private void PanLeftExecuted( object sender, ExecutedRoutedEventArgs e ) this.Position = new Point( _basePosition.X - this.PanDistance, _basePosition.Y ); } -#endregion + #endregion -#region PanRight Command + #region PanRight Command public static RoutedUICommand PanRight = new RoutedUICommand( "Pan Right", "PanRight", typeof( Zoombox ) ); @@ -1765,9 +1765,9 @@ private void PanRightExecuted( object sender, ExecutedRoutedEventArgs e ) this.Position = new Point( _basePosition.X + this.PanDistance, _basePosition.Y ); } -#endregion + #endregion -#region PanUp Command + #region PanUp Command public static RoutedUICommand PanUp = new RoutedUICommand( "Pan Up", "PanUp", typeof( Zoombox ) ); @@ -1776,9 +1776,9 @@ private void PanUpExecuted( object sender, ExecutedRoutedEventArgs e ) this.Position = new Point( _basePosition.X, _basePosition.Y - this.PanDistance ); } -#endregion + #endregion -#region Refocus Command + #region Refocus Command public static RoutedUICommand Refocus = new RoutedUICommand( "Refocus View", "Refocus", typeof( Zoombox ) ); @@ -1794,9 +1794,9 @@ private void RefocusView( object sender, ExecutedRoutedEventArgs e ) this.RefocusView(); } -#endregion + #endregion -#region ZoomIn Command + #region ZoomIn Command public static RoutedUICommand ZoomIn = new RoutedUICommand( "Zoom In", "ZoomIn", typeof( Zoombox ) ); @@ -1805,9 +1805,9 @@ private void ZoomInExecuted( object sender, ExecutedRoutedEventArgs e ) this.Zoom( this.ZoomPercentage / 100 ); } -#endregion + #endregion -#region ZoomOut Command + #region ZoomOut Command public static RoutedUICommand ZoomOut = new RoutedUICommand( "Zoom Out", "ZoomOut", typeof( Zoombox ) ); @@ -1816,7 +1816,7 @@ private void ZoomOutExecuted( object sender, ExecutedRoutedEventArgs e ) this.Zoom( -this.ZoomPercentage / 100 ); } -#endregion + #endregion public void CenterContent() { @@ -2149,7 +2149,7 @@ private void AttachToVisualTree() VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true ); // User has not defined a ViewFinder(or is using the one from this template), use the one from this template - if( (this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null) || _isUsingDefaultViewFinder ) + if( ( this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null ) || _isUsingDefaultViewFinder ) { // set a reference to the ViewFinder element, if present this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement ); @@ -2299,7 +2299,7 @@ private void ContentPresenterFirstArranged( object sender, EventArgs e ) private void DetachFromVisualTree() { // remove the drag adorner - if( (_dragAdorner != null) && ( AdornerLayer.GetAdornerLayer( this ) != null ) ) + if( ( _dragAdorner != null ) && ( AdornerLayer.GetAdornerLayer( this ) != null ) ) AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner ); this.InputBindings.Clear(); @@ -2343,7 +2343,7 @@ private void Zoombox_Loaded( object sender, RoutedEventArgs e ) private void VerticalScrollBar_Scroll( object sender, ScrollEventArgs e ) { - double diff = -(e.NewValue + _relativePosition.Y); + double diff = -( e.NewValue + _relativePosition.Y ); if( e.ScrollEventType == ScrollEventType.LargeIncrement ) { @@ -3690,7 +3690,7 @@ private Point GetZoomRelativePoint() return zoomPoint; } -#region OnKeyDown Methods + #region OnKeyDown Methods protected override void OnPreviewKeyDown( KeyEventArgs e ) { @@ -3712,9 +3712,9 @@ protected override void OnKeyDown( KeyEventArgs e ) base.OnKeyDown( e ); } -#endregion + #endregion -#region OnMouseDown Methods + #region OnMouseDown Methods protected override void OnPreviewMouseDown( MouseButtonEventArgs e ) { @@ -3736,9 +3736,9 @@ protected override void OnMouseDown( MouseButtonEventArgs e ) base.OnMouseDown( e ); } -#endregion + #endregion -#region OnMouseEnter Methods + #region OnMouseEnter Methods protected override void OnMouseEnter( MouseEventArgs e ) { @@ -3747,9 +3747,9 @@ protected override void OnMouseEnter( MouseEventArgs e ) base.OnMouseEnter( e ); } -#endregion + #endregion -#region OnMouseLeave Methods + #region OnMouseLeave Methods protected override void OnMouseLeave( MouseEventArgs e ) { @@ -3758,9 +3758,9 @@ protected override void OnMouseLeave( MouseEventArgs e ) base.OnMouseLeave( e ); } -#endregion + #endregion -#region OnMouseLeftButton Methods + #region OnMouseLeftButton Methods protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e ) { @@ -3802,9 +3802,9 @@ protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e ) base.OnMouseLeftButtonUp( e ); } -#endregion + #endregion -#region OnMouseMove Methods + #region OnMouseMove Methods protected override void OnPreviewMouseMove( MouseEventArgs e ) { @@ -3826,9 +3826,9 @@ protected override void OnMouseMove( MouseEventArgs e ) base.OnMouseMove( e ); } -#endregion + #endregion -#region OnMouseWheel Methods + #region OnMouseWheel Methods protected override void OnPreviewMouseWheel( MouseWheelEventArgs e ) { @@ -3850,9 +3850,9 @@ protected override void OnMouseWheel( MouseWheelEventArgs e ) base.OnMouseWheel( e ); } -#endregion + #endregion -#region Private Fields + #region Private Fields // the default value for a single mouse wheel delta appears to be 28 private static int MOUSE_WHEEL_DELTA = 28; @@ -3896,9 +3896,9 @@ protected override void OnMouseWheel( MouseWheelEventArgs e ) private BitVector32 _cacheBits = new BitVector32( 0 ); -#endregion + #endregion -#region ViewFinderSelectionConverter Nested Type + #region ViewFinderSelectionConverter Nested Type private sealed class ViewFinderSelectionConverter : IValueConverter { @@ -3931,9 +3931,9 @@ public object ConvertBack( object value, Type targetType, object parameter, Cult private readonly Zoombox _zoombox; } -#endregion + #endregion -#region DragAdorner Nested Type + #region DragAdorner Nested Type internal sealed class DragAdorner : Adorner { @@ -4031,9 +4031,9 @@ protected override void OnRender( DrawingContext drawingContext ) private Size _cachedSize; } -#endregion + #endregion -#region CacheBits Nested Type + #region CacheBits Nested Type private enum CacheBits { @@ -4049,9 +4049,9 @@ private enum CacheBits HasUIPermission = 0x00000200, } -#endregion + #endregion -#region ResizeEdge Nested Type + #region ResizeEdge Nested Type private enum ResizeEdge { @@ -4066,6 +4066,6 @@ private enum ResizeEdge Bottom, } -#endregion + #endregion } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs index 833553399..51be3c4ea 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs index 5661c0f34..599c3a0c7 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -18,8 +18,8 @@ using System; using System.ComponentModel; using System.Windows; -using Xceed.Wpf.Toolkit.Core.Utilities; using Xceed.Wpf.Toolkit.Core; +using Xceed.Wpf.Toolkit.Core.Utilities; namespace Xceed.Wpf.Toolkit.Zoombox { diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs index 3e163120a..9040f892c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs index bde3bf9ee..13713f72b 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs index 5b28ef519..9b30bc153 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -59,9 +59,9 @@ public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, || ( base.CanConvertTo( typeDescriptorContext, type ) ); } - public override object ConvertFrom( + public override object ConvertFrom( ITypeDescriptorContext typeDescriptorContext, - CultureInfo cultureInfo, + CultureInfo cultureInfo, object value ) { ZoomboxView result = null; @@ -145,10 +145,10 @@ public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, return ( result == null ? base.ConvertFrom( typeDescriptorContext, cultureInfo, value ) : result ); } - public override object ConvertTo( + public override object ConvertTo( ITypeDescriptorContext typeDescriptorContext, - CultureInfo cultureInfo, - object value, + CultureInfo cultureInfo, + object value, Type destinationType ) { object result = null; diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs index 7a5dff45b..dafad2671 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at @@ -23,7 +23,7 @@ public class ZoomboxViewException : Exception { #region Constructors - public ZoomboxViewException( string message ) + public ZoomboxViewException( string message ) : base( message ) { } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs index caba51ebd..02e9553c0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs index fa0c99d31..2cdf504a2 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs index 908fbb188..bc26190d8 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs index 2a152a3a4..d16a3904a 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs index e8b2a2036..2e802b864 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs @@ -2,7 +2,7 @@ Toolkit for WPF - Copyright (C) 2007-2020 Xceed Software Inc. + Copyright (C) 2007-2022 Xceed Software Inc. This program is provided to you under the terms of the XCEED SOFTWARE, INC. COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.NET5.sln b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.NET5.sln new file mode 100644 index 000000000..c4313502f --- /dev/null +++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.NET5.sln @@ -0,0 +1,64 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29418.71 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit.LiveExplorer.NET5", "Src\Xceed.Wpf.Toolkit.LiveExplorer\Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj", "{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}" + ProjectSection(ProjectDependencies) = postProject + {B3FC3E21-5F2D-4581-AEA2-59F671CFFC21} = {B3FC3E21-5F2D-4581-AEA2-59F671CFFC21} + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244} = {DB81988F-E0F2-45A0-A1FD-8C37F3D35244} + {89286EB4-B4A1-418C-839A-067B00F442D8} = {89286EB4-B4A1-418C-839A-067B00F442D8} + {72E591D6-8F83-4D8C-8F67-9C325E623234} = {72E591D6-8F83-4D8C-8F67-9C325E623234} + {BA72CCE0-A9FB-4995-B496-7FEC5C87B85B} = {BA72CCE0-A9FB-4995-B496-7FEC5C87B85B} + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit.NET5", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.NET5.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.NET5", "Src\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.NET5.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{8976E4A6-FF5F-44C5-AC57-FEDA249DD199}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.VS2010.NET5", "Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Metro.NET5", "Src\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Aero.NET5", "Src\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Release|Any CPU.Build.0 = Release|Any CPU + {72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Any CPU.Build.0 = Release|Any CPU + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.Build.0 = Release|Any CPU + {B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Any CPU.Build.0 = Release|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.Build.0 = Release|Any CPU + {BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5B29CA6B-7CCA-4E10-8788-C2902D49C5AE} + EndGlobalSection +EndGlobal