Skip to content

Commit 9d63416

Browse files
AngryCarrot789AngryCarrot789
committed
fixed a few bugs and changed namespaces because TheR is a weird name lol... but so is reghzy but eh
1 parent 4bcdb51 commit 9d63416

25 files changed

+540
-758
lines changed

‎Themes/App.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Application x:Class="Themes.App"
1+
<Application x:Class="REghZyFramework.App"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:local="clr-namespace:Themes"
4+
xmlns:local="clr-namespace:REghZyFramework"
55
StartupUri="MainWindow.xaml">
66
<Application.Resources>
77
<ResourceDictionary>

‎Themes/App.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Windows;
22

3-
namespace Themes
3+
namespace REghZyFramework
44
{
55
/// <summary>
66
/// Interaction logic for App.xaml

‎Themes/Controls/LabelledItemSelector.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<UserControl x:Class="Themes.Controls.LabelledItemSelector"
1+
<UserControl x:Class="REghZyFramework.Controls.LabelledItemSelector"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:local="clr-namespace:Themes.Controls"
6+
xmlns:local="clr-namespace:REghZyFramework.Controls"
77
mc:Ignorable="d"
88
d:DesignHeight="32" d:DesignWidth="200"
99
Foreground="{DynamicResource ControlDefaultForeground}">

‎Themes/Controls/LabelledItemSelector.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Windows;
33
using System.Windows.Controls;
44

5-
namespace Themes.Controls
5+
namespace REghZyFramework.Controls
66
{
77
/// <summary>
88
/// Interaction logic for LabelledItemSelector.xaml

‎Themes/MainWindow.xaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<Window x:Class="Themes.MainWindow"
1+
<Window x:Class="REghZyFramework.MainWindow"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="clr-namespace:Themes.Controls" xmlns:system="clr-namespace:System;assembly=mscorlib"
5+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
xmlns:controls="clr-namespace:REghZyFramework.Controls"
7+
xmlns:system="clr-namespace:System;assembly=mscorlib"
68
Height="720" Width="1280"
79
Style="{DynamicResource CustomWindowStyle}"
810
Title="A custom window with a dark theme">
@@ -31,7 +33,7 @@
3133
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>
3234
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>
3335
<Separator Style="{DynamicResource MenuItemSeparator}"/>
34-
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>
36+
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}" IsEnabled="False"/>
3537
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>
3638
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>
3739
<Separator Style="{DynamicResource MenuItemSeparator}"/>
@@ -92,7 +94,7 @@
9294
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>
9395
</MenuItem>
9496
</MenuItem>
95-
<MenuItem Header="Edit">
97+
<MenuItem Header="Edit" IsEnabled="False">
9698
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>
9799
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>
98100
<MenuItem Header="Another menuitem" Template="{DynamicResource SingleDropDownMenuItem}"/>

‎Themes/MainWindow.xaml.cs‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
62
using System.Windows;
73
using System.Windows.Controls;
8-
using System.Windows.Data;
9-
using System.Windows.Documents;
10-
using System.Windows.Input;
11-
using System.Windows.Media;
124
using System.Windows.Media.Imaging;
13-
using System.Windows.Navigation;
14-
using System.Windows.Shapes;
15-
using Themes.Utilities;
16-
using Themes.ViewModels;
17-
using TheRThemes;
5+
using REghZyFramework.ViewModels;
6+
using REghZyFramework.Themes;
187

19-
namespace Themes
8+
namespace REghZyFramework
209
{
2110
/// <summary>
2211
/// Interaction logic for MainWindow.xaml

‎Themes/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Themes/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Themes/Themes.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,12 @@
7575
<DependentUpon>LightTheme.xaml</DependentUpon>
7676
</Compile>
7777
<Compile Include="Themes\ThemesController.cs" />
78+
<Compile Include="Utilities\BaseView.cs" />
7879
<Compile Include="Utilities\BaseViewModel.cs" />
7980
<Compile Include="Utilities\Command.cs" />
8081
<Compile Include="Utilities\CommandParam.cs" />
8182
<Compile Include="Utilities\ScrollViewerHelper.cs" />
83+
<Compile Include="Utilities\String\StringExtensions.cs" />
8284
<Compile Include="ViewModels\MainViewModel.cs" />
8385
<Page Include="Controls\LabelledItemSelector.xaml">
8486
<SubType>Designer</SubType>

‎Themes/Themes/ColourfulDarkTheme.xaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary x:Class="TheRThemes.ColourfulDarkTheme"
1+
<ResourceDictionary x:Class="REghZyFramework.Themes.ColourfulDarkTheme"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
@@ -1804,6 +1804,7 @@
18041804
</Trigger>
18051805
<Trigger Property="IsEnabled" Value="False">
18061806
<Setter Property="TextElement.Foreground" TargetName="templateRoot" Value="{StaticResource ControlDisabledGlythColour}"/>
1807+
<Setter Property="Background" Value="{StaticResource ControlDisabledBackground}"/>
18071808
</Trigger>
18081809
<Trigger Property="CanContentScroll" SourceName="SubMenuScrollViewer" Value="False">
18091810
<Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=SubMenuScrollViewer}"/>
@@ -1875,6 +1876,7 @@
18751876
<Setter Property="TextElement.Foreground" TargetName="templateRoot" Value="{StaticResource ControlDisabledGlythColour}"/>
18761877
<Setter Property="Fill" TargetName="Glyph" Value="{StaticResource ControlDisabledGlythColour}"/>
18771878
<Setter Property="Fill" TargetName="RightArrow" Value="{StaticResource ControlDisabledGlythColour}"/>
1879+
<Setter Property="Background" Value="{StaticResource ControlDisabledBackground}"/>
18781880
</Trigger>
18791881
<Trigger Property="CanContentScroll" SourceName="SubMenuScrollViewer" Value="False">
18801882
<Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=SubMenuScrollViewer}"/>
@@ -1937,6 +1939,7 @@
19371939
<Setter Property="TextElement.Foreground" TargetName="templateRoot" Value="{StaticResource ControlDisabledGlythColour}"/>
19381940
<Setter Property="Fill" TargetName="Glyph" Value="{StaticResource ControlDisabledGlythColour}"/>
19391941
<Setter Property="Fill" TargetName="RightArrow" Value="{StaticResource ControlDisabledGlythColour}"/>
1942+
<Setter Property="Background" Value="{StaticResource ControlDisabledBackground}"/>
19401943
</Trigger>
19411944
<Trigger Property="CanContentScroll" SourceName="SubMenuScrollViewer" Value="False">
19421945
<Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=SubMenuScrollViewer}"/>

0 commit comments

Comments
 (0)