diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs
index 6821fec..572a4bc 100644
--- a/WeeXnes/Core/Globals.cs
+++ b/WeeXnes/Core/Globals.cs
@@ -16,7 +16,7 @@ namespace WeeXnes.Core
public static string encryptionKey = "8zf5#RdyQ]$4x4_";
public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes");
public static string SettingsFileName = "settings.ini";
- public static string version = "3.6.3";
+ public static string version = "3.6.4";
public static bool info_isRpcRunning = false;
public static bool info_RpcAutoStart;
public static string apiUrl = "http://weexnes.com:5169/";
diff --git a/WeeXnes/MVVM/View/SettingView.xaml.cs b/WeeXnes/MVVM/View/SettingView.xaml.cs
index c8fd784..df35d6d 100644
--- a/WeeXnes/MVVM/View/SettingView.xaml.cs
+++ b/WeeXnes/MVVM/View/SettingView.xaml.cs
@@ -318,7 +318,7 @@ namespace WeeXnes.MVVM.View
}
catch (Exception ex)
{
- Misc.Message message = new Misc.Message(ex.ToString());
+ Misc.CriticalMessage message = new Misc.CriticalMessage(ex.ToString());
message.Show();
}
}
diff --git a/WeeXnes/Misc/CriticalMessage.xaml b/WeeXnes/Misc/CriticalMessage.xaml
new file mode 100644
index 0000000..3aaee94
--- /dev/null
+++ b/WeeXnes/Misc/CriticalMessage.xaml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WeeXnes/Misc/CriticalMessage.xaml.cs b/WeeXnes/Misc/CriticalMessage.xaml.cs
new file mode 100644
index 0000000..4d48d44
--- /dev/null
+++ b/WeeXnes/Misc/CriticalMessage.xaml.cs
@@ -0,0 +1,26 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace WeeXnes.Misc
+{
+ public partial class CriticalMessage : Window
+ {
+ public CriticalMessage(string _message, string _title = "Message")
+ {
+ InitializeComponent();
+ MessageLabel.Content = _message;
+ this.Title = _title;
+ }
+
+ private void okButton_Click(object sender, RoutedEventArgs e)
+ {
+ this.Close();
+ }
+
+ private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e)
+ {
+ if (e.ChangedButton == MouseButton.Left)
+ this.DragMove();
+ }
+ }
+}
\ No newline at end of file
diff --git a/WeeXnes/Misc/Message.xaml b/WeeXnes/Misc/Message.xaml
index 4690f0d..f612030 100644
--- a/WeeXnes/Misc/Message.xaml
+++ b/WeeXnes/Misc/Message.xaml
@@ -7,10 +7,27 @@
mc:Ignorable="d"
Title="Message" Height="150" Width="300"
ResizeMode="NoResize"
- Background="#272537"
WindowStartupLocation="CenterScreen"
- SizeToContent="WidthAndHeight">
-
+ SizeToContent="WidthAndHeight"
+ Background="Transparent"
+ AllowsTransparency="True"
+ WindowStyle="None">
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -20,15 +37,17 @@
Name="MessageLabel"
Foreground="White"
VerticalAlignment="Center"
- HorizontalAlignment="Center"/>
+ HorizontalAlignment="Center"
+ Padding="100,20,100,20"/>
+ Click="okButton_Click"
+ Margin="0,0,0,20"/>
-
+
diff --git a/WeeXnes/Misc/Message.xaml.cs b/WeeXnes/Misc/Message.xaml.cs
index ba2f7df..6fb7918 100644
--- a/WeeXnes/Misc/Message.xaml.cs
+++ b/WeeXnes/Misc/Message.xaml.cs
@@ -30,5 +30,11 @@ namespace WeeXnes.Misc
{
this.Close();
}
+
+ private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e)
+ {
+ if (e.ChangedButton == MouseButton.Left)
+ this.DragMove();
+ }
}
}
diff --git a/WeeXnes/Misc/UpdateMessage.xaml b/WeeXnes/Misc/UpdateMessage.xaml
index 2ea9c04..f6fcb77 100644
--- a/WeeXnes/Misc/UpdateMessage.xaml
+++ b/WeeXnes/Misc/UpdateMessage.xaml
@@ -5,41 +5,73 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WeeXnes.Misc"
mc:Ignorable="d"
- Title="Message" Height="150" Width="300"
+ Title="Message" Height="158" Width="308"
ResizeMode="NoResize"
- Background="#272537"
+ Background="Transparent"
+ AllowsTransparency="True"
+ WindowStyle="None"
WindowStartupLocation="CenterScreen"
SizeToContent="WidthAndHeight">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WeeXnes/Misc/UpdateMessage.xaml.cs b/WeeXnes/Misc/UpdateMessage.xaml.cs
index d77ed8c..63d332e 100644
--- a/WeeXnes/Misc/UpdateMessage.xaml.cs
+++ b/WeeXnes/Misc/UpdateMessage.xaml.cs
@@ -3,6 +3,7 @@ using System.Diagnostics;
using System.IO;
using System.Net;
using System.Windows;
+using System.Windows.Input;
using WeeXnes.Core;
using Application = System.Windows.Forms.Application;
@@ -57,5 +58,11 @@ namespace WeeXnes.Misc
{
this.Close();
}
+
+ private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e)
+ {
+ if (e.ChangedButton == MouseButton.Left)
+ this.DragMove();
+ }
}
}
\ No newline at end of file
diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj
index 94ffb11..ff3c42f 100644
--- a/WeeXnes/WeeXnes.csproj
+++ b/WeeXnes/WeeXnes.csproj
@@ -61,6 +61,9 @@
+
+ CriticalMessage.xaml
+
UpdateMessage.xaml
@@ -82,6 +85,7 @@
MainWindow.xaml
Code
+