From 84bd8e2f2d52a597dc9c3a44142293c1282b2821 Mon Sep 17 00:00:00 2001 From: imalcolm Date: Thu, 2 Oct 2025 16:11:41 -0700 Subject: [PATCH 01/26] Added calcite package --- src/Directory.Packages.props | 3 ++- src/WPF/WPF.Viewer/App.xaml | 1 + src/WPF/WPF.Viewer/ArcGIS.WPF.Viewer.Net.csproj | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 69227aafe3..afca99cb26 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -16,6 +16,7 @@ + @@ -36,4 +37,4 @@ - + \ No newline at end of file diff --git a/src/WPF/WPF.Viewer/App.xaml b/src/WPF/WPF.Viewer/App.xaml index ca6e866e28..def1ad329a 100644 --- a/src/WPF/WPF.Viewer/App.xaml +++ b/src/WPF/WPF.Viewer/App.xaml @@ -11,6 +11,7 @@ + - - - @@ -94,17 +85,23 @@ @@ -114,8 +111,6 @@ Text="Snap sources" /> - + \ No newline at end of file From cb31a02b1efc8757aa8882d2757a53db442d2e52 Mon Sep 17 00:00:00 2001 From: imalcolm Date: Thu, 2 Oct 2025 15:31:06 -0700 Subject: [PATCH 13/26] Replaced all existing manual calcite icons with icons from the dotnet calcite toolkit --- .../WPF.Viewer/Controls/SearchTextBox.xaml | 25 +++---- src/WPF/WPF.Viewer/MainWindow.xaml | 27 ++++---- .../CreateKmlMultiTrack.xaml | 25 ++++--- .../StatsQueryGroupAndSort.xaml | 14 +++- .../CreateAndEditGeometries.xaml | 66 +++++++++++++++---- ...GeometriesWithProgrammaticReticleTool.xaml | 31 +++++++-- .../SnapGeometryEdits/SnapGeometryEdits.xaml | 62 +++++++++++++---- ...pGeometryEditsWithUtilityNetworkRules.xaml | 34 +++++++--- src/WPF/WPF.Viewer/SourceCodeViewer.xaml | 11 ++-- 9 files changed, 215 insertions(+), 80 deletions(-) diff --git a/src/WPF/WPF.Viewer/Controls/SearchTextBox.xaml b/src/WPF/WPF.Viewer/Controls/SearchTextBox.xaml index beefd8b26f..daef7d6af9 100644 --- a/src/WPF/WPF.Viewer/Controls/SearchTextBox.xaml +++ b/src/WPF/WPF.Viewer/Controls/SearchTextBox.xaml @@ -1,6 +1,7 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:calcite="http://schemas.esri.com/calcite/2024"> - + - + \ No newline at end of file diff --git a/src/WPF/WPF.Viewer/MainWindow.xaml b/src/WPF/WPF.Viewer/MainWindow.xaml index 1bce173115..8e9e0263e2 100644 --- a/src/WPF/WPF.Viewer/MainWindow.xaml +++ b/src/WPF/WPF.Viewer/MainWindow.xaml @@ -37,10 +37,10 @@ Click="SampleGridFavoriteButton_Click" CommandParameter="{Binding FormalName}" Style="{DynamicResource SampleGridFavoriteButton}"> - + - + @@ -238,8 +238,11 @@ Background="White" BorderThickness="0" Click="ScreenshotButton_Click" - Visibility="Hidden"> - + Visibility="Hidden" + Style="{x:Null}"> + @@ -33,14 +37,17 @@ - - + + - + diff --git a/src/WPF/WPF.Viewer/Samples/Geometry/EditGeometriesWithProgrammaticReticleTool/EditGeometriesWithProgrammaticReticleTool.xaml b/src/WPF/WPF.Viewer/Samples/Geometry/EditGeometriesWithProgrammaticReticleTool/EditGeometriesWithProgrammaticReticleTool.xaml index aedc8dad15..7e7a0442ed 100644 --- a/src/WPF/WPF.Viewer/Samples/Geometry/EditGeometriesWithProgrammaticReticleTool/EditGeometriesWithProgrammaticReticleTool.xaml +++ b/src/WPF/WPF.Viewer/Samples/Geometry/EditGeometriesWithProgrammaticReticleTool/EditGeometriesWithProgrammaticReticleTool.xaml @@ -8,13 +8,17 @@ @@ -67,7 +71,10 @@ IsEnabled="False" Style="{StaticResource IconStyle}" ToolTipService.ToolTip="Undo"> - + diff --git a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/SnapGeometryEditsWithUtilityNetworkRules/SnapGeometryEditsWithUtilityNetworkRules.xaml b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/SnapGeometryEditsWithUtilityNetworkRules/SnapGeometryEditsWithUtilityNetworkRules.xaml index 8ecca5fc2e..194904c6ac 100644 --- a/src/WPF/WPF.Viewer/Samples/UtilityNetwork/SnapGeometryEditsWithUtilityNetworkRules/SnapGeometryEditsWithUtilityNetworkRules.xaml +++ b/src/WPF/WPF.Viewer/Samples/UtilityNetwork/SnapGeometryEditsWithUtilityNetworkRules/SnapGeometryEditsWithUtilityNetworkRules.xaml @@ -22,6 +22,20 @@ + @@ -87,20 +101,24 @@ Click="DiscardButton_Click" IsEnabled="{Binding GeometryEditor.IsStarted, ElementName=MyMapView}" Margin="3" - ToolTipService.ToolTip="Discard edits"> - + ToolTipService.ToolTip="Discard edits" + Style="{StaticResource ButtonIconStyle}"> + diff --git a/src/WPF/WPF.Viewer/SourceCodeViewer.xaml b/src/WPF/WPF.Viewer/SourceCodeViewer.xaml index 43655075e8..50c295afe8 100644 --- a/src/WPF/WPF.Viewer/SourceCodeViewer.xaml +++ b/src/WPF/WPF.Viewer/SourceCodeViewer.xaml @@ -1,6 +1,7 @@  @@ -39,10 +40,12 @@ Background="Transparent" BorderThickness="0" Click="CopyCodeButton_Click" - Content="" - FontFamily="pack://application:,,,/Resources/Fonts/#calcite-ui-icons-24" - FontSize="30" - ToolTip="Copy code to clipboard" /> + ToolTip="Copy code to clipboard" + Style="{x:Null}"> + + From a043fe40adb4219866d3a1e786305aaf13c0d613 Mon Sep 17 00:00:00 2001 From: imalcolm Date: Thu, 2 Oct 2025 15:51:56 -0700 Subject: [PATCH 14/26] Removed sample viewer default TreeView style --- .../WPF.Viewer/Resources/ControlStyles.xaml | 129 ------------------ .../SpatialRelationships.xaml | 5 +- .../Layers/GroupLayers/GroupLayers.xaml | 4 +- .../ListKmlContents/ListKmlContents.xaml | 4 + .../WmsServiceCatalog/WmsServiceCatalog.xaml | 7 +- 5 files changed, 17 insertions(+), 132 deletions(-) diff --git a/src/WPF/WPF.Viewer/Resources/ControlStyles.xaml b/src/WPF/WPF.Viewer/Resources/ControlStyles.xaml index 8dd1684058..0d59237598 100644 --- a/src/WPF/WPF.Viewer/Resources/ControlStyles.xaml +++ b/src/WPF/WPF.Viewer/Resources/ControlStyles.xaml @@ -149,135 +149,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 209413965112d66b93b1065114c2dd8dbe0ae94d Mon Sep 17 00:00:00 2001 From: imalcolm Date: Fri, 10 Oct 2025 09:11:43 -0700 Subject: [PATCH 19/26] Override of default calcite theme colors to use sample theme colors --- src/WPF/WPF.Viewer/App.xaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/WPF/WPF.Viewer/App.xaml b/src/WPF/WPF.Viewer/App.xaml index def1ad329a..cb64b00fdb 100644 --- a/src/WPF/WPF.Viewer/App.xaml +++ b/src/WPF/WPF.Viewer/App.xaml @@ -12,6 +12,13 @@ + + + #7938B6 + #652E98 + #51247A + #7938B6 + + @@ -35,7 +38,8 @@ Grid.Column="1" Margin="5" Click="RecordTrackButton_Click" - Content="Record Track" /> + Style="{StaticResource CalciteSecondaryButtonStyle}" + Content="Record Track"/>