some fixing

This commit is contained in:
NicoAICP 2020-04-29 01:56:28 +02:00
parent 4304726557
commit 7e159f8cb9
9 changed files with 23 additions and 18 deletions

View file

@ -51,5 +51,5 @@ using System.Windows;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.2")]
[assembly: AssemblyFileVersion("1.0.0.2")]
[assembly: AssemblyVersion("1.0.0.3")]
[assembly: AssemblyFileVersion("1.0.0.3")]

View file

@ -334,7 +334,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
string url = mvm.GetURL("n64");
if (url == null || url == "") throw new Exception();
TitleKeys webbrowser = new TitleKeys(url);
TitleKeys webbrowser = new TitleKeys(url, "UWUVCI AIO - N64 Help");
try
{
webbrowser.Owner = mvm.mw;

View file

@ -316,7 +316,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
string url = mvm.GetURL("gba");
if (url == null || url == "") throw new Exception();
TitleKeys webbrowser = new TitleKeys(url);
TitleKeys webbrowser = new TitleKeys(url, "UWUVCI AIO - GBA Help");
try
{
webbrowser.Owner = mvm.mw;

View file

@ -423,7 +423,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
string url = mvm.GetURL("gcn");
if (url == null || url == "") throw new Exception();
TitleKeys webbrowser = new TitleKeys(url);
TitleKeys webbrowser = new TitleKeys(url, "UWUVCI AIO - GCN Help");
try
{
webbrowser.Owner = mvm.mw;

View file

@ -327,7 +327,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
string url = mvm.GetURL("tgcd");
if (url == null || url == "") throw new Exception();
TitleKeys webbrowser = new TitleKeys(url);
TitleKeys webbrowser = new TitleKeys(url, "UWUVCIO AIO - TGxCD Help");
try
{
webbrowser.Owner = mvm.mw;
@ -358,7 +358,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
string url = mvm.GetURL("tg16");
if (url == null || url == "") throw new Exception();
TitleKeys webbrowser = new TitleKeys(url);
TitleKeys webbrowser = new TitleKeys(url, "UWUVCI AIO - TGx16 Help");
try
{
webbrowser.Owner = mvm.mw;

View file

@ -304,7 +304,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
string url = mvm.GetURL(mvm.GameConfiguration.Console.ToString().ToLower());
if (url == null || url == "") throw new Exception();
TitleKeys webbrowser = new TitleKeys(url);
TitleKeys webbrowser = new TitleKeys(url, $"UWUVCIO AIO - {mvm.GameConfiguration.Console.ToString()} Help");
try
{
webbrowser.Owner = mvm.mw;

View file

@ -470,7 +470,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
{
string url = mvm.GetURL("wii");
if (url == null || url == "") throw new Exception();
TitleKeys webbrowser = new TitleKeys(url);
TitleKeys webbrowser = new TitleKeys(url, "UWUVCI AIO - Wii Help");
try
{
webbrowser.Owner = mvm.mw;

View file

@ -6,23 +6,17 @@
xmlns:local="clr-namespace:UWUVCI_AIO_WPF"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
Title="MAIN" Height="550" Width="1194.525" WindowStyle="None" WindowStartupLocation="CenterScreen" Foreground="White" MouseDown="MoveWindow" Background="LightGray" ResizeMode="NoResize" Icon="/a.ico" BorderBrush="#FF2196F3" BorderThickness="2,2,2,2" ShowInTaskbar="False">
Title="MAIN" Width="1194.525" WindowStyle="None" WindowStartupLocation="CenterOwner" Foreground="White" MouseDown="MoveWindow" Background="LightGray" ResizeMode="NoResize" Height="670" ShowInTaskbar="False">
<Window.Resources>
<Storyboard x:Key="MenuOpen"/>
<Storyboard x:Key="MenuClose"/>
</Window.Resources>
<Grid DataContext="{StaticResource mvm}">
<Grid Margin="0,70,0,0">
<Grid.RowDefinitions>
</Grid.RowDefinitions>
<TextBlock x:Name="tb" Margin="572,174,563,70" TextWrapping="Wrap" FontSize="20" Height="142" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" Foreground="Black" />
<WebBrowser HorizontalAlignment="Left" Height="476" VerticalAlignment="Top" Width="1191" Name="wb"/>
<WebBrowser HorizontalAlignment="Left" Height="600" VerticalAlignment="Top" Width="1190" Name="wb" Margin="5,0,0,0"/>
</Grid>
<Grid Height="70" VerticalAlignment="Top">
<Grid.Background>

View file

@ -35,7 +35,18 @@ namespace UWUVCI_AIO_WPF.UI.Windows
clsWebbrowser_Errors.SuppressscriptErrors(wb, true);
}
public TitleKeys(string url, string title)
{
InitializeComponent();
wb.Source = new Uri(url, UriKind.Absolute);
/*dynamic activeX = this.wb.GetType().InvokeMember("ActiveXInstance",
BindingFlags.GetProperty | BindingFlags.Instance | BindingFlags.NonPublic,
null, this.wb, new object[] { });
activeX.Silent = true;*/
clsWebbrowser_Errors.SuppressscriptErrors(wb, true);
tbTitleBar.Text = title;
}
private void MoveWindow(object sender, MouseButtonEventArgs e)
{
try