SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix UI namespaces

Browse Source
This commit is contained in:
pizzaboxer 2023-07-22 13:18:31 +01:00
parent 61255925e6
commit 049b340823
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
25 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bloxstrap/UI/Controls.cs
View File

@ -1,8 +1,8 @@
using System.Windows;
using Bloxstrap.UI.Elements.Bootstrapper;
using Bloxstrap.UI.Menu;
using Bloxstrap.UI.MessageBox;
using Bloxstrap.UI.Elements.Dialogs;
using Bloxstrap.UI.Elements.Menu;
namespace Bloxstrap.UI
{

4
Bloxstrap/UI/Elements/ExceptionDialog.xaml → Bloxstrap/UI/Elements/Dialogs/ExceptionDialog.xaml
View File

@ -1,10 +1,10 @@
<ui:UiWindow x:Class="Bloxstrap.UI.ExceptionDialog"
<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.ExceptionDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:local="clr-namespace:Bloxstrap.UI.MessageBox"
xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
mc:Ignorable="d"
Width="480"
MinHeight="0"

2
Bloxstrap/UI/Elements/ExceptionDialog.xaml.cs → Bloxstrap/UI/Elements/Dialogs/ExceptionDialog.xaml.cs
View File

@ -2,7 +2,7 @@
using System.Windows;
using System.Windows.Interop;
namespace Bloxstrap.UI
namespace Bloxstrap.UI.Elements.Dialogs
{
// hmm... do i use MVVM for this?
// this is entirely static, so i think im fine without it, and this way is just so much more efficient

4
Bloxstrap/UI/Elements/FluentMessageBox.xaml → Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml
View File

@ -1,10 +1,10 @@
<ui:UiWindow x:Class="Bloxstrap.UI.MessageBox.FluentMessageBox"
<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.FluentMessageBox"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:local="clr-namespace:Bloxstrap.UI.MessageBox"
xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
mc:Ignorable="d"
Title="Bloxstrap"
d:DesignWidth="480"

2
Bloxstrap/UI/Elements/FluentMessageBox.xaml.cs → Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs
View File

@ -6,7 +6,7 @@ using System.Windows.Media.Imaging;
using Bloxstrap.UI.Utility;
namespace Bloxstrap.UI.MessageBox
namespace Bloxstrap.UI.Elements.Dialogs
{
// wpfui does have its own messagebox control but it SUCKS so heres this instead

4
Bloxstrap/UI/Elements/Menu/MainWindow.xaml
View File

@ -1,10 +1,10 @@
<ui:UiWindow x:Class="Bloxstrap.UI.Menu.MainWindow"
<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Menu.MainWindow"
x:Name="ConfigurationWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pages="clr-namespace:Bloxstrap.UI.Menu.Pages"
xmlns:pages="clr-namespace:Bloxstrap.UI.Elements.Menu.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
mc:Ignorable="d"
Title="Bloxstrap Menu"

2
Bloxstrap/UI/Elements/Menu/MainWindow.xaml.cs
View File

@ -7,7 +7,7 @@ using Wpf.Ui.Mvvm.Services;
using Bloxstrap.UI.ViewModels.Menu;
namespace Bloxstrap.UI.Menu
namespace Bloxstrap.UI.Elements.Menu
{
/// <summary>
/// Interaction logic for MainWindow.xaml

2
Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml
View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.AboutPage"
<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.AboutPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml.cs
View File

@ -1,6 +1,6 @@
using Bloxstrap.UI.ViewModels.Menu;
namespace Bloxstrap.UI.Menu.Pages
namespace Bloxstrap.UI.Elements.Menu.Pages
{
/// <summary>
/// Interaction logic for AboutPage.xaml

2
Bloxstrap/UI/Elements/Menu/Pages/AppearancePage.xaml
View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.AppearancePage"
<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.AppearancePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
Bloxstrap/UI/Elements/Menu/Pages/AppearancePage.xaml.cs
View File

@ -1,6 +1,6 @@
using Bloxstrap.UI.ViewModels.Menu;
namespace Bloxstrap.UI.Menu.Pages
namespace Bloxstrap.UI.Elements.Menu.Pages
{
/// <summary>
/// Interaction logic for AppearancePage.xaml

2
Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml
View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.BehaviourPage"
<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.BehaviourPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml.cs
View File

@ -1,6 +1,6 @@
using Bloxstrap.UI.ViewModels.Menu;
namespace Bloxstrap.UI.Menu.Pages
namespace Bloxstrap.UI.Elements.Menu.Pages
{
/// <summary>
/// Interaction logic for BehaviourPage.xaml

2
Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.FastFlagsPage"
<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.FastFlagsPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml.cs
View File

@ -2,7 +2,7 @@
using Bloxstrap.UI.ViewModels.Menu;
namespace Bloxstrap.UI.Menu.Pages
namespace Bloxstrap.UI.Elements.Menu.Pages
{
/// <summary>
/// Interaction logic for FastFlagsPage.xaml

2
Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml
View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.InstallationPage"
<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.InstallationPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml.cs
View File

@ -1,6 +1,6 @@
using Bloxstrap.UI.ViewModels.Menu;
namespace Bloxstrap.UI.Menu.Pages
namespace Bloxstrap.UI.Elements.Menu.Pages
{
/// <summary>
/// Interaction logic for InstallationPage.xaml

2
Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml
View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.IntegrationsPage"
<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.IntegrationsPage"
x:Name="IntegrationsPageView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

2
Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml.cs
View File

@ -2,7 +2,7 @@
using Bloxstrap.UI.ViewModels.Menu;
namespace Bloxstrap.UI.Menu.Pages
namespace Bloxstrap.UI.Elements.Menu.Pages
{
/// <summary>
/// Interaction logic for IntegrationsPage.xaml

2
Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml
View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.ModsPage"
<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.ModsPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml.cs
View File

@ -2,7 +2,7 @@
using Bloxstrap.UI.ViewModels.Menu;
namespace Bloxstrap.UI.Menu.Pages
namespace Bloxstrap.UI.Elements.Menu.Pages
{
/// <summary>
/// Interaction logic for ModsPage.xaml

2
Bloxstrap/UI/Elements/Menu/Pages/PreInstallPage.xaml
View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.PreInstallPage"
<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.PreInstallPage"
x:Name="PreInstallPageView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

2
Bloxstrap/UI/Elements/Menu/Pages/PreInstallPage.xaml.cs
View File

@ -1,4 +1,4 @@
namespace Bloxstrap.UI.Menu.Pages
namespace Bloxstrap.UI.Elements.Menu.Pages
{
/// <summary>
/// Interaction logic for PreInstallPage.xaml

2
Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs
View File

@ -7,7 +7,7 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Win32;
using Bloxstrap.UI.Menu;
using Bloxstrap.UI.Elements.Menu;
namespace Bloxstrap.UI.ViewModels.Menu
{

2
Bloxstrap/UI/ViewModels/Menu/MainWindowViewModel.cs
View File

@ -7,7 +7,7 @@ using CommunityToolkit.Mvvm.Input;
using Wpf.Ui.Mvvm.Contracts;
using Bloxstrap.UI.Menu.Pages;
using Bloxstrap.UI.Elements.Menu.Pages;
namespace Bloxstrap.UI.ViewModels.Menu
{