Skip to content

Commit 590d248

Browse files
dbrown1986dbrown1986
committed
Linked ThanksButton to SpecialThanks window. Linked ViewDonors button to Donors window.
1 parent aabc809 commit 590d248

7 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎Pages/Donors.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Window x:Name="DonorsWindow" x:Class="SimTools_v4.Pages.Donors"
1+
<Window x:Name="DonorsWindow" x:Class="SimTools.Donors"
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"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:local="clr-namespace:SimTools_v4.Pages"
6+
xmlns:local="clr-namespace:SimTools"
77
mc:Ignorable="d"
8-
Title="Donors" Height="532" Width="530" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
8+
Title="Donors" Height="532" Width="530" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" AllowsTransparency="True">
99
<Window.Background>
1010
<ImageBrush ImageSource="/Images/TS3_Box2.png"/>
1111
</Window.Background>

‎Pages/Donors.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using System.Windows.Media.Imaging;
1313
using System.Windows.Shapes;
1414

15-
namespace SimTools_v4.Pages
15+
namespace SimTools
1616
{
1717
/// <summary>
1818
/// Interaction logic for Donors.xaml

‎Pages/MainWindow.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<ImageBrush ImageSource="/Images/button_normal.png"/>
124124
</Button.Background>
125125
</Button>
126-
<Button x:Name="ModToolsButton" Content="Mod Tools &gt;" HorizontalAlignment="Left" Margin="8,496,0,0" VerticalAlignment="Top" Width="159" Height="34" FontFamily="Tahoma" FontWeight="Bold" Click="TweakButton_Click" FontSize="11" ContextMenuOpening="TweakButton_Context" BorderBrush="{x:Null}">
126+
<Button x:Name="ModToolsButton" Content="Mod Tools &gt;" HorizontalAlignment="Left" Margin="8,496,0,0" VerticalAlignment="Top" Width="159" Height="34" FontFamily="Tahoma" FontWeight="Bold" Click="ThanksButton_Click" FontSize="11" BorderBrush="{x:Null}">
127127
<Button.Background>
128128
<ImageBrush ImageSource="/Images/button_normal.png"/>
129129
</Button.Background>
@@ -158,7 +158,7 @@
158158
<ImageBrush ImageSource="/Images/button_normal.png"/>
159159
</Button.Background>
160160
</Button>
161-
<Button x:Name="ThanksButton" Content="Special Thanks" HorizontalAlignment="Left" Margin="449,600,0,0" VerticalAlignment="Top" Width="146" Height="34" FontFamily="Tahoma" FontWeight="Bold" Click="TweakButton_Click" FontSize="11" ContextMenuOpening="TweakButton_Context" BorderBrush="{x:Null}">
161+
<Button x:Name="ThanksButton" Content="Special Thanks" HorizontalAlignment="Left" Margin="449,600,0,0" VerticalAlignment="Top" Width="146" Height="34" FontFamily="Tahoma" FontWeight="Bold" Click="ThanksButton_Click" FontSize="11" BorderBrush="{x:Null}">
162162
<Button.Background>
163163
<ImageBrush ImageSource="/Images/button_normal.png"/>
164164
</Button.Background>

‎Pages/MainWindow.xaml.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,11 @@ private void InfoButton_Click(object sender, RoutedEventArgs e)
739739
about.ShowDialog();
740740
}
741741

742+
private void ThanksButton_Click(object sender, RoutedEventArgs e)
743+
{
744+
new SpecialThanks { Owner = this }.ShowDialog();
745+
}
746+
742747
// ═══════════════════════════════════════════════════════════════════════
743748
// BUGFIX BUTTON
744749
// ═══════════════════════════════════════════════════════════════════════

‎Pages/SpecialThanks.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<Window x:Class="SimTools_v4.Pages.SpecialThanks"
1+
<Window x:Class="SimTools.SpecialThanks"
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"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:local="clr-namespace:SimTools_v4.Pages"
6+
xmlns:local="clr-namespace:SimTools"
77
mc:Ignorable="d"
8-
Title="Special Thanks" Height="532" Width="530" HorizontalAlignment="Left" VerticalAlignment="Top" ResizeMode="NoResize" WindowStyle="None" WindowStartupLocation="CenterScreen">
8+
Title="Special Thanks" Height="532" Width="530" HorizontalAlignment="Left" VerticalAlignment="Top" ResizeMode="NoResize" WindowStyle="None" WindowStartupLocation="CenterScreen" AllowsTransparency="True">
99
<Window.Background>
1010
<ImageBrush ImageSource="/Images/TS3_Box2.png"/>
1111
</Window.Background>
1212
<Grid>
1313
<TextBlock x:Name="MuchThanksText" HorizontalAlignment="Left" Margin="32,40,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="465" Height="369" FontFamily="SimSun" FontSize="10"><Run Text="The entire 'The Sims 3' Facebook group - Thank you for inspiring this suite of tools. So many of you had many issues over the years; and this tool aims to help in every way possible to put those issues to rest."/><LineBreak/><Run/><LineBreak/><Run Text="Anime_Boom - For their comprehensive tweak and performance guide published on Steam, most of which has been incorporated into this tool."/><LineBreak/><Run/><LineBreak/><Run Text="alfa1295 - For your incredible work on The Sims 3 GPU Addon software and bringing support for modern-day graphics cards."/><LineBreak/><Run/><LineBreak/><Run Text="Dmitry Zhutkov - For Regul Save Cleaner. Truly amazing bit of software. Our saves are safe!"/><LineBreak/><Run/><LineBreak/><Run Text="LazyDuchess - Many useful modifications to the game engine."/><LineBreak/><Run/><LineBreak/><Run Text="Chain_Reaction / Twallan - For nRaas and its dedicated community of TS3 modders. Several package and core mods overhauling scripts within the game."/><LineBreak/><Run/><LineBreak/><Run Text="Guifrog - Guifrog is a composer on OCRemix, whose theme is featured in this suite. It features melodies from The Sims 3 and The Sims 1. His profile can be found at https://ocremix.org/artist/9047/guifrog"/><LineBreak/><Run/><LineBreak/><Run Text="Blocky9032 &amp; JonySimmer - New Intros to bring TS3 into the modern age!"/><LineBreak/><Run/><LineBreak/><Run Text="Eli Sims - For her amazing work translating SimTools to French (Bonjour!)"/></TextBlock>
1414
<Button x:Name="CloseButton" Content="Button" HorizontalAlignment="Left" Margin="455,481,0,0" VerticalAlignment="Top" Width="25" Height="32" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{x:Null}" Click="CloseButton_Click"/>
15-
<Button x:Name="ViewDonors" Content="View Donors" HorizontalAlignment="Left" Margin="32,416,0,0" VerticalAlignment="Top" Width="154" Height="34" FontWeight="Bold" FontFamily="Tahoma">
15+
<Button x:Name="ViewDonors" Content="View Donors" Click="ViewDonors_Click" HorizontalAlignment="Left" Margin="32,416,0,0" VerticalAlignment="Top" Width="154" Height="34" FontWeight="Bold" FontFamily="Tahoma">
1616
<Button.Background>
1717
<ImageBrush ImageSource="/Images/button_normal.png"/>
1818
</Button.Background>

‎Pages/SpecialThanks.xaml.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using System.Windows.Media.Imaging;
1313
using System.Windows.Shapes;
1414

15-
namespace SimTools_v4.Pages
15+
namespace SimTools
1616
{
1717
/// <summary>
1818
/// Interaction logic for SpecialThanks.xaml
@@ -28,5 +28,10 @@ private void CloseButton_Click(object sender, RoutedEventArgs e)
2828
{
2929
Close();
3030
}
31+
32+
private void ViewDonors_Click(object sender, RoutedEventArgs e)
33+
{
34+
new Donors { Owner = this }.ShowDialog();
35+
}
3136
}
3237
}

‎build.counter‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4003
1+
4012

0 commit comments

Comments
 (0)