Commit 6917b7ab authored by Rene Hampölz's avatar Rene Hampölz 💻

Bug fixes

parent a549fb81
......@@ -28,10 +28,24 @@
Height="345" Width="800"
ShowTitleBar="False"
ShowInTaskbar="False">
ShowInTaskbar="False" Topmost="True" Closing="MetroWindow_Closing">
<Grid>
<Image x:Name="Image" HorizontalAlignment="Left" Margin="35,35,0,35" Width="200" Source="Assets\favicon.png"/>
<TextBlock HorizontalAlignment="Left" Margin="260,30,0,0" TextWrapping="Wrap" Text="{x:Static local:App.Name}" VerticalAlignment="Top" FontSize="36" FontWeight="Bold"/>
<TextBlock Margin="260,90,0,10" TextWrapping="WrapWithOverflow" FontSize="14" xml:space="preserve" HorizontalAlignment="Left" Width="466"><Hyperlink Foreground="White" Click="Website_Click"><TextBlock Text="{x:Static local:App.Name}"/></Hyperlink> wird entwickelt und gestaltet von <Hyperlink Foreground="White" Click="DeveloperWebsite_Click"><TextBlock Text="{x:Static local:App.Developer}"/></Hyperlink>.<LineBreak/><LineBreak/>Dieses Projekt benutzt das <Hyperlink Foreground="White" Click="MainProgramm_Click">Main Programm</Hyperlink> von <Hyperlink Foreground="White" Click="RHUtensils_Click">RH Utensils</Hyperlink>, für ein vereinfachtes Account Management, für eine vereinfachte Update auslieferung und für eine einfache darstellung des Programmes.<LineBreak/><LineBreak/>Weitere Informationen zum Source Code sowie zur Lizenzierung findest du<LineBreak/> fürs Main Programm auf der <Hyperlink Foreground="White" Click="MainProgramm_Click">GitLab Seite</Hyperlink> von RH Utensils<LineBreak/> für <TextBlock Text="{x:Static local:App.Name}"/> auf unserer <Hyperlink Foreground="White" Click="SourceCode_Click">Projekt Seite</Hyperlink><LineBreak/><LineBreak/>Main Programm Copyright © <TextBlock Text="{Binding Source={x:Static sys:DateTime.Now}, StringFormat=yyyy}"/> <Hyperlink Foreground="White" Click="HampisProjekte_Click">Hampis Projekte</Hyperlink><LineBreak/><TextBlock Text="{x:Static local:App.Name}"/> Copyright © <TextBlock Text="{Binding Source={x:Static sys:DateTime.Now}, StringFormat=yyyy}"/> <Hyperlink Foreground="White" Click="Copyright_Click"><TextBlock Text="{x:Static local:App.Copyright}"/></Hyperlink></TextBlock>
<TextBlock Margin="260,90,0,10" TextWrapping="WrapWithOverflow" FontSize="14" xml:space="preserve" HorizontalAlignment="Left" Width="466"><Hyperlink Foreground="White"><InlineUIContainer>
<TextBlock Text="{x:Static local:App.Name}"/>
</InlineUIContainer></Hyperlink><Run Text=" wird entwickelt und gestaltet von "/><Hyperlink Foreground="White"><InlineUIContainer>
<TextBlock Text="{x:Static local:App.Developer}"/>
</InlineUIContainer></Hyperlink><Run Text="."/><LineBreak/><LineBreak/><Run Text="Dieses Projekt benutzt das "/><Hyperlink Foreground="White"><Run Text="Main Programm"/></Hyperlink><Run Text=" von "/><Hyperlink Foreground="White"><Run Text="RH Utensils"/></Hyperlink><Run Text=", für ein vereinfachtes Account Management, für eine vereinfachte Update auslieferung und für eine einfache "/><Run Text="D"/><Run Text="arstellung des Programmes."/><LineBreak/><LineBreak/><Run Text="Weitere Informationen zum Source Code sowie zur Lizenzierung findest du"/><LineBreak/><Run Text=" → fürs Main Programm auf der "/><Hyperlink Foreground="White"><Run Text="GitLab Seite"/></Hyperlink><Run Text=" von RH Utensils"/><LineBreak/><Run Text=" → für "/><InlineUIContainer>
<TextBlock Text="{x:Static local:App.Name}"/>
</InlineUIContainer><Run Text=" auf unserer "/><Hyperlink Foreground="White"><Run Text="Projekt Seite"/></Hyperlink><LineBreak/><LineBreak/><Run Text="Main Programm Copyright © "/><InlineUIContainer>
<TextBlock Text="{Binding Source={x:Static sys:DateTime.Now}, StringFormat=yyyy}"/>
</InlineUIContainer><Run Text=" "/><Hyperlink Foreground="White"><Run Text="Hampis Projekte"/></Hyperlink><LineBreak/><InlineUIContainer>
<TextBlock Text="{x:Static local:App.Name}"/>
</InlineUIContainer><Run Text=" Copyright © "/><InlineUIContainer>
<TextBlock Text="{Binding Source={x:Static sys:DateTime.Now}, StringFormat=yyyy}"/>
</InlineUIContainer><Run Text=" "/><Hyperlink Foreground="White"><InlineUIContainer>
<TextBlock Text="{x:Static local:App.Copyright}"/>
</InlineUIContainer></Hyperlink></TextBlock>
</Grid>
</metro:MetroWindow>
......@@ -11,6 +11,8 @@ namespace Main
{
InitializeComponent();
Title = "Über " + App.Name;
if (App.Favicon != "")
{
try
......@@ -58,5 +60,10 @@ namespace Main
{
System.Diagnostics.Process.Start("https://hampoelz.net/");
}
private void MetroWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
MainWindow.isAbout = false;
}
}
}
......@@ -31,7 +31,7 @@
Deactivated="Window_Deactivated"
Height="500" Width="350"
Title="RH Utensils" MouseDown="MetroWindow_MouseDown">
Title="RH Utensils" MouseDown="MetroWindow_MouseDown" Closed="MetroWindow_Closed">
<Grid Name="Grid">
<Grid x:Name="Overlay" Panel.ZIndex="1000" VerticalAlignment="Top" Visibility="Collapsed">
......
......@@ -239,10 +239,22 @@ namespace Main
this.DragMove();
}
public static Boolean isAbout = false;
private void Button_Click(object sender, RoutedEventArgs e)
{
Window window = new About();
if (isAbout)
return;
window.Show();
isAbout = true;
}
private void MetroWindow_Closed(object sender, EventArgs e)
{
Application.Current.Shutdown();
}
}
}
No preview for this file type
#pragma checksum "..\..\About.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "193353D673389D0CBDF660BE9263B569D0EA232E"
#pragma checksum "..\..\About.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CD8DD1C1CCFE235A8525576232FFECB51C421EEC"
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
......@@ -86,71 +86,15 @@ namespace Main {
switch (connectionId)
{
case 1:
this.Image = ((System.Windows.Controls.Image)(target));
return;
case 2:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.Website_Click);
#line default
#line hidden
return;
case 3:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.DeveloperWebsite_Click);
#line default
#line hidden
return;
case 4:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.MainProgramm_Click);
#line default
#line hidden
return;
case 5:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.RHUtensils_Click);
#line 31 "..\..\About.xaml"
((Main.About)(target)).Closing += new System.ComponentModel.CancelEventHandler(this.MetroWindow_Closing);
#line default
#line hidden
return;
case 6:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.MainProgramm_Click);
#line default
#line hidden
return;
case 7:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.SourceCode_Click);
#line default
#line hidden
return;
case 8:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.HampisProjekte_Click);
#line default
#line hidden
return;
case 9:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.Copyright_Click);
#line default
#line hidden
case 2:
this.Image = ((System.Windows.Controls.Image)(target));
return;
}
this._contentLoaded = true;
......
#pragma checksum "..\..\About.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "193353D673389D0CBDF660BE9263B569D0EA232E"
#pragma checksum "..\..\About.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CD8DD1C1CCFE235A8525576232FFECB51C421EEC"
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
......@@ -86,71 +86,15 @@ namespace Main {
switch (connectionId)
{
case 1:
this.Image = ((System.Windows.Controls.Image)(target));
return;
case 2:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.Website_Click);
#line default
#line hidden
return;
case 3:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.DeveloperWebsite_Click);
#line default
#line hidden
return;
case 4:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.MainProgramm_Click);
#line default
#line hidden
return;
case 5:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.RHUtensils_Click);
#line 31 "..\..\About.xaml"
((Main.About)(target)).Closing += new System.ComponentModel.CancelEventHandler(this.MetroWindow_Closing);
#line default
#line hidden
return;
case 6:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.MainProgramm_Click);
#line default
#line hidden
return;
case 7:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.SourceCode_Click);
#line default
#line hidden
return;
case 8:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.HampisProjekte_Click);
#line default
#line hidden
return;
case 9:
#line 35 "..\..\About.xaml"
((System.Windows.Documents.Hyperlink)(target)).Click += new System.Windows.RoutedEventHandler(this.Copyright_Click);
#line default
#line hidden
case 2:
this.Image = ((System.Windows.Controls.Image)(target));
return;
}
this._contentLoaded = true;
......
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "15B35699CCF9C1EB290667BD99C5159DEB447615"
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "743315654DBF98D8993A095EA95C1F410EC006A2"
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
......@@ -172,6 +172,12 @@ namespace Main {
#line 34 "..\..\MainWindow.xaml"
((Main.MainWindow)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.MetroWindow_MouseDown);
#line default
#line hidden
#line 34 "..\..\MainWindow.xaml"
((Main.MainWindow)(target)).Closed += new System.EventHandler(this.MetroWindow_Closed);
#line default
#line hidden
return;
......
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "15B35699CCF9C1EB290667BD99C5159DEB447615"
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "743315654DBF98D8993A095EA95C1F410EC006A2"
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
......@@ -172,6 +172,12 @@ namespace Main {
#line 34 "..\..\MainWindow.xaml"
((Main.MainWindow)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.MetroWindow_MouseDown);
#line default
#line hidden
#line 34 "..\..\MainWindow.xaml"
((Main.MainWindow)(target)).Closed += new System.EventHandler(this.MetroWindow_Closed);
#line default
#line hidden
return;
......
......@@ -16,5 +16,5 @@ E:\Hampis Cloud\Hampis Projekte\Projekte\RH Utensils\Programme\Windows Desktop\M
156363998945
About.xaml;Login.xaml;Error.xaml;MainWindow.xaml;Menu.xaml;
True
False

FE:\Hampis Cloud\Hampis Projekte\Projekte\RH Utensils\Programme\Windows Desktop\Main\About.xaml;;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment