|
@@ -16,15 +16,15 @@ using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
|
|
|
|
|
|
|
|
namespace Ryujinx.Ava.UI.Applet
|
|
namespace Ryujinx.Ava.UI.Applet
|
|
|
{
|
|
{
|
|
|
- public partial class UserSelectorDialog : UserControl, INotifyPropertyChanged
|
|
|
|
|
|
|
+ public partial class ProfileSelectorDialog : UserControl
|
|
|
{
|
|
{
|
|
|
- public UserSelectorDialogViewModel ViewModel { get; set; }
|
|
|
|
|
|
|
+ public ProfileSelectorDialogViewModel ViewModel { get; set; }
|
|
|
|
|
|
|
|
- public UserSelectorDialog(UserSelectorDialogViewModel viewModel)
|
|
|
|
|
|
|
+ public ProfileSelectorDialog(ProfileSelectorDialogViewModel viewModel)
|
|
|
{
|
|
{
|
|
|
|
|
+ DataContext = ViewModel = viewModel;
|
|
|
|
|
+
|
|
|
InitializeComponent();
|
|
InitializeComponent();
|
|
|
- ViewModel = viewModel;
|
|
|
|
|
- DataContext = ViewModel;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void Grid_PointerEntered(object sender, PointerEventArgs e)
|
|
private void Grid_PointerEntered(object sender, PointerEventArgs e)
|
|
@@ -54,7 +54,7 @@ namespace Ryujinx.Ava.UI.Applet
|
|
|
if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
|
|
if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
|
|
|
{
|
|
{
|
|
|
ViewModel.SelectedUserId = userProfile.UserId;
|
|
ViewModel.SelectedUserId = userProfile.UserId;
|
|
|
- Logger.Info?.Print(LogClass.UI, $"Selected user: {userProfile.UserId}");
|
|
|
|
|
|
|
+ Logger.Info?.Print(LogClass.UI, $"Selected: {userProfile.UserId}", "ProfileSelector");
|
|
|
|
|
|
|
|
ObservableCollection<BaseModel> newProfiles = [];
|
|
ObservableCollection<BaseModel> newProfiles = [];
|
|
|
|
|
|
|
@@ -79,7 +79,7 @@ namespace Ryujinx.Ava.UI.Applet
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public static async Task<(UserId Id, bool Result)> ShowInputDialog(UserSelectorDialogViewModel viewModel)
|
|
|
|
|
|
|
+ public static async Task<(UserId Id, bool Result)> ShowInputDialog(ProfileSelectorDialogViewModel viewModel)
|
|
|
{
|
|
{
|
|
|
ContentDialog contentDialog = new()
|
|
ContentDialog contentDialog = new()
|
|
|
{
|
|
{
|
|
@@ -87,7 +87,7 @@ namespace Ryujinx.Ava.UI.Applet
|
|
|
PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
|
|
PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
|
|
|
SecondaryButtonText = string.Empty,
|
|
SecondaryButtonText = string.Empty,
|
|
|
CloseButtonText = LocaleManager.Instance[LocaleKeys.Cancel],
|
|
CloseButtonText = LocaleManager.Instance[LocaleKeys.Cancel],
|
|
|
- Content = new UserSelectorDialog(viewModel),
|
|
|
|
|
|
|
+ Content = new ProfileSelectorDialog(viewModel),
|
|
|
Padding = new Thickness(0)
|
|
Padding = new Thickness(0)
|
|
|
};
|
|
};
|
|
|
|
|
|