diff --git a/DataGrid_PrintSpecificPages/App.xaml b/DataGrid_PrintSpecificPages/App.xaml index 491e468..5e796b0 100644 --- a/DataGrid_PrintSpecificPages/App.xaml +++ b/DataGrid_PrintSpecificPages/App.xaml @@ -1,15 +1,18 @@ - + + xmlns:local="using:SfDataGrid_Demo"> + - + - + + diff --git a/DataGrid_PrintSpecificPages/App.xaml.cs b/DataGrid_PrintSpecificPages/App.xaml.cs index 216afec..571ed85 100644 --- a/DataGrid_PrintSpecificPages/App.xaml.cs +++ b/DataGrid_PrintSpecificPages/App.xaml.cs @@ -3,10 +3,6 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; -using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; -using Windows.Foundation; -using Windows.Foundation.Collections; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; @@ -14,16 +10,21 @@ using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Navigation; +using Microsoft.UI.Xaml.Shapes; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace WinUIDemoApp +namespace SfDataGrid_Demo { /// /// Provides application-specific behavior to supplement the default Application class. /// - sealed partial class App : Application + public partial class App : Application { /// /// Initializes the singleton application object. This is the first line of authored code @@ -32,72 +33,21 @@ sealed partial class App : Application public App() { this.InitializeComponent(); - this.Suspending += OnSuspending; } /// - /// Invoked when the application is launched normally by the end user. Other entry points - /// will be used such as when the application is launched to open a specific file. + /// Invoked when the application is launched. /// - /// Details about the launch request and process. - protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e) + /// Details about the launch request and process. + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) { - Frame rootFrame = Window.Current.Content as Frame; - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == null) - { - // Create a Frame to act as the navigation context and navigate to the first page - rootFrame = new Frame(); - - rootFrame.NavigationFailed += OnNavigationFailed; - - if (e.UWPLaunchActivatedEventArgs.PreviousExecutionState == ApplicationExecutionState.Terminated) - { - //TODO: Load state from previously suspended application - } - - // Place the frame in the current Window - Window.Current.Content = rootFrame; - } - - if (e.UWPLaunchActivatedEventArgs.PrelaunchActivated == false) - { - if (rootFrame.Content == null) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - rootFrame.Navigate(typeof(MainPage), e.Arguments); - } - // Ensure the current window is active - Window.Current.Activate(); - } + m_window = new MainWindow(); + page = new Page(); + m_window.Activate(); } - /// - /// Invoked when Navigation to a certain page fails - /// - /// The Frame which failed navigation - /// Details about the navigation failure - void OnNavigationFailed(object sender, NavigationFailedEventArgs e) - { - throw new Exception("Failed to load Page " + e.SourcePageType.FullName); - } + public static Window? m_window; + public static Page? page; - /// - /// Invoked when application execution is being suspended. Application state is saved - /// without knowing whether the application will be terminated or resumed with the contents - /// of memory still intact. - /// - /// The source of the suspend request. - /// Details about the suspend request. - private void OnSuspending(object sender, SuspendingEventArgs e) - { - var deferral = e.SuspendingOperation.GetDeferral(); - //TODO: Save application state and stop any background activity - deferral.Complete(); - } } } diff --git a/DataGrid_PrintSpecificPages/Assets/LockScreenLogo.scale-200.png b/DataGrid_PrintSpecificPages/Assets/LockScreenLogo.scale-200.png index 735f57a..7440f0d 100644 Binary files a/DataGrid_PrintSpecificPages/Assets/LockScreenLogo.scale-200.png and b/DataGrid_PrintSpecificPages/Assets/LockScreenLogo.scale-200.png differ diff --git a/DataGrid_PrintSpecificPages/Assets/SplashScreen.scale-200.png b/DataGrid_PrintSpecificPages/Assets/SplashScreen.scale-200.png index 023e7f1..32f486a 100644 Binary files a/DataGrid_PrintSpecificPages/Assets/SplashScreen.scale-200.png and b/DataGrid_PrintSpecificPages/Assets/SplashScreen.scale-200.png differ diff --git a/DataGrid_PrintSpecificPages/Assets/Square150x150Logo.scale-200.png b/DataGrid_PrintSpecificPages/Assets/Square150x150Logo.scale-200.png index af49fec..53ee377 100644 Binary files a/DataGrid_PrintSpecificPages/Assets/Square150x150Logo.scale-200.png and b/DataGrid_PrintSpecificPages/Assets/Square150x150Logo.scale-200.png differ diff --git a/DataGrid_PrintSpecificPages/Assets/Square44x44Logo.scale-200.png b/DataGrid_PrintSpecificPages/Assets/Square44x44Logo.scale-200.png index ce342a2..f713bba 100644 Binary files a/DataGrid_PrintSpecificPages/Assets/Square44x44Logo.scale-200.png and b/DataGrid_PrintSpecificPages/Assets/Square44x44Logo.scale-200.png differ diff --git a/DataGrid_PrintSpecificPages/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/DataGrid_PrintSpecificPages/Assets/Square44x44Logo.targetsize-24_altform-unplated.png index f6c02ce..dc9f5be 100644 Binary files a/DataGrid_PrintSpecificPages/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/DataGrid_PrintSpecificPages/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/DataGrid_PrintSpecificPages/Assets/StoreLogo.png b/DataGrid_PrintSpecificPages/Assets/StoreLogo.png index 7385b56..a4586f2 100644 Binary files a/DataGrid_PrintSpecificPages/Assets/StoreLogo.png and b/DataGrid_PrintSpecificPages/Assets/StoreLogo.png differ diff --git a/DataGrid_PrintSpecificPages/Assets/Wide310x150Logo.scale-200.png b/DataGrid_PrintSpecificPages/Assets/Wide310x150Logo.scale-200.png index 288995b..8b4a5d0 100644 Binary files a/DataGrid_PrintSpecificPages/Assets/Wide310x150Logo.scale-200.png and b/DataGrid_PrintSpecificPages/Assets/Wide310x150Logo.scale-200.png differ diff --git a/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo.csproj b/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo.csproj deleted file mode 100644 index e378b38..0000000 --- a/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo.csproj +++ /dev/null @@ -1,128 +0,0 @@ - - - - - Debug - x86 - {67EE98B7-411F-48B5-8029-D1CE133DDC03} - AppContainerExe - Properties - WinUIDemoApp - WinUIDemoApp - en-US - UAP - 10.0.19041.0 - 10.0.17763.0 - 16 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - true - WinUI-Alpha-Projects-Don-t-Use-SDK-Xaml-Tools - WinUIDemoApp_TemporaryKey.pfx - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - pdbonly - x86 - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - pdbonly - x64 - false - prompt - true - true - - - PackageReference - - - - App.xaml - - - MainPage.xaml - - - - - - - - Designer - - - - - - - - - - - - - - - MSBuild:Compile - - - MSBuild:Compile - - - - - 6.2.10 - - - 3.0.0-preview3.201113.0 - - - 18.4.0.30-beta - - - - - - - $(MinimumVisualStudioVersion) - - - - \ No newline at end of file diff --git a/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo.sln b/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo.sln deleted file mode 100644 index 8cc1e8e..0000000 --- a/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo.sln +++ /dev/null @@ -1,35 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30709.64 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataGrid_PrintSpecificPageDemo", "DataGrid_PrintSpecificPageDemo.csproj", "{67EE98B7-411F-48B5-8029-D1CE133DDC03}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Debug|x64.ActiveCfg = Debug|x64 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Debug|x64.Build.0 = Debug|x64 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Debug|x64.Deploy.0 = Debug|x64 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Debug|x86.ActiveCfg = Debug|x86 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Debug|x86.Build.0 = Debug|x86 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Debug|x86.Deploy.0 = Debug|x86 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Release|x64.ActiveCfg = Release|x64 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Release|x64.Build.0 = Release|x64 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Release|x64.Deploy.0 = Release|x64 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Release|x86.ActiveCfg = Release|x86 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Release|x86.Build.0 = Release|x86 - {67EE98B7-411F-48B5-8029-D1CE133DDC03}.Release|x86.Deploy.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2ACDF59D-D841-4D1A-A0E8-579F45A0453F} - EndGlobalSection -EndGlobal diff --git a/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo_TemporaryKey.pfx b/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo_TemporaryKey.pfx deleted file mode 100644 index beb7030..0000000 Binary files a/DataGrid_PrintSpecificPages/DataGrid_PrintSpecificPageDemo_TemporaryKey.pfx and /dev/null differ diff --git a/DataGrid_PrintSpecificPages/MainPage.xaml b/DataGrid_PrintSpecificPages/MainPage.xaml deleted file mode 100644 index 3ef67ff..0000000 --- a/DataGrid_PrintSpecificPages/MainPage.xaml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -