diff --git a/Package/Package.appxmanifest b/Package/Package.appxmanifest
index 01b5323c..6de06453 100644
--- a/Package/Package.appxmanifest
+++ b/Package/Package.appxmanifest
@@ -11,7 +11,7 @@
+ Version="0.4.8.0" />
SD Launcher
diff --git a/Package/Package.wapproj b/Package/Package.wapproj
index 1ed499cb..50c70a78 100644
--- a/Package/Package.wapproj
+++ b/Package/Package.wapproj
@@ -61,7 +61,7 @@
SHA256
False
True
- x64
+ x86|x64
C:\
0
diff --git a/SDLauncher UWP/Dialogs/EncryptSettingsDialog.xaml b/SDLauncher UWP/Dialogs/EncryptSettingsDialog.xaml
new file mode 100644
index 00000000..70007026
--- /dev/null
+++ b/SDLauncher UWP/Dialogs/EncryptSettingsDialog.xaml
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/SDLauncher UWP/Dialogs/EncryptSettingsDialog.xaml.cs b/SDLauncher UWP/Dialogs/EncryptSettingsDialog.xaml.cs
new file mode 100644
index 00000000..3c0f686b
--- /dev/null
+++ b/SDLauncher UWP/Dialogs/EncryptSettingsDialog.xaml.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace SDLauncher_UWP.Dialogs
+{
+ public sealed partial class EncryptSettingsDialog : ContentDialog
+ {
+ public EncryptSettingsDialog()
+ {
+ this.InitializeComponent();
+ }
+
+ private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+ {
+ }
+
+ private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+ {
+ }
+ }
+}
diff --git a/SDLauncher UWP/Dialogs/Login.xaml b/SDLauncher UWP/Dialogs/Login.xaml
index f7865965..dba72351 100644
--- a/SDLauncher UWP/Dialogs/Login.xaml
+++ b/SDLauncher UWP/Dialogs/Login.xaml
@@ -16,7 +16,7 @@
IsStaggeringEnabled="True" />
-
+
@@ -107,7 +107,9 @@
-
+
+
+
-
+
+
+
@@ -585,5 +589,6 @@
+
\ No newline at end of file
diff --git a/SDLauncher UWP/Dialogs/Login.xaml.cs b/SDLauncher UWP/Dialogs/Login.xaml.cs
index eaede0a4..1fec7d81 100644
--- a/SDLauncher UWP/Dialogs/Login.xaml.cs
+++ b/SDLauncher UWP/Dialogs/Login.xaml.cs
@@ -176,14 +176,10 @@ private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
private void LoginFromCache(object sender, RoutedEventArgs e)
{
- bool isSelectionMode = false;
+ bool isSelectionMode = true;
foreach (var item in vars.Accounts)
{
- if (item.IsCheckboxVsible == Visibility.Visible)
- {
- isSelectionMode = true;
- }
- else
+ if (item.IsCheckboxVsible != Visibility.Visible)
{
isSelectionMode = false;
}
diff --git a/SDLauncher UWP/Helpers/SDLauncher.cs b/SDLauncher UWP/Helpers/SDLauncher.cs
index 33a3d0a4..d6b71fd5 100644
--- a/SDLauncher UWP/Helpers/SDLauncher.cs
+++ b/SDLauncher UWP/Helpers/SDLauncher.cs
@@ -247,9 +247,9 @@ public async Task LoadStore()
var result = await MessageBox.Show("Error", "Failed to load the data of the store, Retry", MessageBoxButtons.OkCancel);
if(result == MessageBoxResults.Ok)
{
+ TasksHelper.CompleteTask(taskID, false);
Status(Localized.Ready);
var s = await LoadStore();
- TasksHelper.CompleteTask(taskID,true);
return s;
}
else
diff --git a/SDLauncher UWP/Package.appxmanifest b/SDLauncher UWP/Package.appxmanifest
index 32892bbe..69d1f013 100644
--- a/SDLauncher UWP/Package.appxmanifest
+++ b/SDLauncher UWP/Package.appxmanifest
@@ -11,7 +11,7 @@
+ Version="0.4.7.0" />
diff --git a/SDLauncher UWP/SDLauncher UWP.csproj b/SDLauncher UWP/SDLauncher UWP.csproj
index 12047fd9..3d2548d9 100644
--- a/SDLauncher UWP/SDLauncher UWP.csproj
+++ b/SDLauncher UWP/SDLauncher UWP.csproj
@@ -132,6 +132,9 @@
+
+ EncryptSettingsDialog.xaml
+
Login.xaml
@@ -264,6 +267,10 @@
MSBuild:Compile
Designer
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/SDLauncher UWP/UserControls/TaskListView.xaml.cs b/SDLauncher UWP/UserControls/TaskListView.xaml.cs
index 51d8973e..4102ae75 100644
--- a/SDLauncher UWP/UserControls/TaskListView.xaml.cs
+++ b/SDLauncher UWP/UserControls/TaskListView.xaml.cs
@@ -23,10 +23,11 @@ namespace SDLauncher_UWP.UserControls
{
public sealed partial class TaskListView : UserControl
{
+ public event EventHandler ErrorTaskRecieved = delegate { };
public ObservableCollection TasksCompleted { get;private set; }
public ObservableCollection CurrentTasks { get;private set; }
private int WholeTaskCount = 0;
-
+ public int UnwatchedErrorTasksCount { get; private set; } = 0;
public TaskListView()
{
this.InitializeComponent();
@@ -34,6 +35,7 @@ public TaskListView()
this.CurrentTasks = new ObservableCollection();
RefreshTasks();
}
+ public void ClearUnwatchedErrorTasks() => this.UnwatchedErrorTasksCount = 0;
public int AddTask(string name,int? ID = null)
{
if (ID == null)
@@ -64,6 +66,8 @@ public bool CompleteTask(int id,bool success)
itm.DateAdded = DateTime.Now;
if (!success)
{
+ this.UnwatchedErrorTasksCount++;
+ this.ErrorTaskRecieved(this, new EventArgs());
itm.BorderBrush = new SolidColorBrush(Colors.Red);
}
else
diff --git a/SDLauncher UWP/Views/BaseLauncherPage.xaml.cs b/SDLauncher UWP/Views/BaseLauncherPage.xaml.cs
index 38f0d921..b5f282a4 100644
--- a/SDLauncher UWP/Views/BaseLauncherPage.xaml.cs
+++ b/SDLauncher UWP/Views/BaseLauncherPage.xaml.cs
@@ -552,6 +552,7 @@ private void navView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
if(itm.Content.ToString() == "ChangeLogs")
{
navViewFrame.Content = LogsPage;
+ LogsPage.UpdateLogs();
}
else
{
diff --git a/SDLauncher UWP/Views/MainPage.xaml b/SDLauncher UWP/Views/MainPage.xaml
index 2c3a0b4c..5aac6ded 100644
--- a/SDLauncher UWP/Views/MainPage.xaml
+++ b/SDLauncher UWP/Views/MainPage.xaml
@@ -71,8 +71,11 @@
-