Merge pull request #63 from Milkitic/develop

some fixes
Milkitic · Nov 22, 2020 · 2d2f1cb · 2d2f1cb
2 parents e630bc9 + 05eccb1
commit 2d2f1cb
Show file tree

Hide file tree

Showing 7 changed files with 186 additions and 8 deletions.
diff --git a/OsuPlayer.Media.Audio/ObservablePlayController.cs b/OsuPlayer.Media.Audio/ObservablePlayController.cs
@@ -228,7 +228,7 @@ private async Task<bool> LoadAsync(bool isReading, bool playInstantly)
                 Execute.OnUiThread(() => MetaLoaded?.Invoke(context, _cts.Token));
 
                 // background
-                var defaultPath = Path.Combine(Domain.ResourcePath, "default.jpg");
+                var defaultPath = Path.Combine(Domain.ResourcePath, "official", "registration.jpg");
 
                 if (osuFile.Events.BackgroundInfo != null)
                 {

diff --git a/OsuPlayer.Wpf/OsuPlayer.Wpf.csproj b/OsuPlayer.Wpf/OsuPlayer.Wpf.csproj
@@ -612,6 +612,12 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="Resources\official\registration.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\official\LICENCE.md">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Resource Include="Resources\icon.png" />
     <Resource Include="Resources\Fonts\SourceHanSerifCn.ttf" />
     <Resource Include="Resources\Fonts\SourceSansPro-Black.ttf" />
@@ -719,9 +725,7 @@
     <Resource Include="Resources\fullscreen_s.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\default.jpg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="Resources\default.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\title.png" />

diff --git a/OsuPlayer.Wpf/Resources/official/LICENCE.md b/OsuPlayer.Wpf/Resources/official/LICENCE.md
diff --git a/OsuPlayer.Wpf/Resources/official/registration.jpg b/OsuPlayer.Wpf/Resources/official/registration.jpg
diff --git a/OsuPlayer.Wpf/UserControls/AnimationControl.xaml.cs b/OsuPlayer.Wpf/UserControls/AnimationControl.xaml.cs
@@ -51,7 +51,7 @@ private void UserControl_Initialized(object sender, EventArgs e)
         {
             _viewModel = (AnimationControlVm)DataContext;
 
-            var path = Path.Combine(Domain.ResourcePath, "default.jpg");
+            var path = Path.Combine(Domain.ResourcePath, "official", "registration.jpg");
             if (File.Exists(path))
             {
                 BackImage.Source = new BitmapImage(new Uri(path));
@@ -212,7 +212,7 @@ private async Task CloseVideoAsync()
                 _beatmapCtx.SetTimeHandle = async (time, play) =>
                     await _controller.Player.SkipTo(TimeSpan.FromMilliseconds(time)).ConfigureAwait(false);
             }
-           
+
             Execute.OnUiThread(() =>
             {
                 VideoElementBorder.Visibility = Visibility.Hidden;
@@ -315,7 +315,7 @@ async void OnVideoElementOnSeekingEnded(object sender, EventArgs e)
                 }
             };
         }
-        
+
         private async void OnMediaOpened(object sender, MediaOpenedEventArgs e)
         {
             VideoElementBorder.Visibility = Visibility.Visible;

diff --git a/OsuPlayer.Wpf/UserControls/WelcomeControl.xaml.cs b/OsuPlayer.Wpf/UserControls/WelcomeControl.xaml.cs
@@ -54,6 +54,7 @@ public ICommand SelectDbCommand
                         return;
                     }
 
+                    bool isSuccess = false;
                     try
                     {
                         GuideSyncing = true;
@@ -62,6 +63,7 @@ public ICommand SelectDbCommand
                         AppSettings.SaveDefault();
                         GuideSyncing = false;
                         GuideSelectedDb = true;
+                        isSuccess = true;
                     }
                     catch (Exception ex)
                     {
@@ -70,7 +72,13 @@ public ICommand SelectDbCommand
                         GuideSelectedDb = false;
                     }
 
-                    SkipCommand.Execute(null);
+                    if (isSuccess)
+                    {
+                        AppSettings.Default.General.FirstOpen = false;
+                        AppSettings.SaveDefault();
+                        FrontDialogOverlay.Default.RaiseOk();
+                    }
+
                     GuideSyncing = false;
                 });
             }

diff --git a/OsuPlayer.Wpf/Windows/MainWindow.xaml.cs b/OsuPlayer.Wpf/Windows/MainWindow.xaml.cs
@@ -175,6 +175,9 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
                     Width = 350,
                     ShowDialogButtons = false,
                     ShowTitleBar = false
+                }, (obj, args) =>
+                {
+                    SwitchSearch.IsChecked = true;
                 });
                 //WelcomeControl.Show();
                 //try