diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2023-01-11 00:20:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 06:20:19 +0100 |
| commit | 934b5a64e5638ae5228acb52faf48efadefdea8d (patch) | |
| tree | cc65eab75c5a9a7c3438de3302ab1f6cbcec1599 /Ryujinx.Ava/UI/Controls/UserSelector.axaml | |
| parent | cee667b491f87c48546f348bad8c6f16cdf6d628 (diff) | |
Ava GUI: User Profile Manager + Other Fixes (#4166)
* Fix redundancies
* Add back elses
* Loading Screen fixes
* Redesign User Profile Manager
- Backported long selection bar in Grid/List view not working
- Backported UserSelector is jank
* Fix SelectionIndicator
* Fix DataType
* Fix SaveManager bug
* Remove debug log
* Load saves on UIThread
* Reduce UI thread blocking
* Fix locale keys
* Use block namespaces
* Fix close button width
* Make UserProfile ordering consistent
* Alphabetical order
* Adjust layout, remove green circle for blue selector
* Fix some inconsistencies
* Fix no inital selected profile
* Adjust appearance of edit button
* Adjust SaveManager
* Remove redundant warning dialog
* Make firmware avatar selector clearer
* View redesign again :hero_depressed:
* Consistency adjustments
* Adjust margins
* Make `UserProfileImageSelector` consistent
* Make `UserFirmwareAvatarSelector` consistent
* Fix long grid view selector
* Switch case
* Remove long selection bar
Handled in #4178
* Consistency
* Started dialog titles
* Fixes
* Remaining titles
* Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml
Co-authored-by: Mary-nyan <thog@protonmail.com>
* Fix build
* Hide UserRecoverer if no LostProfiles are found
* UserEditor Avatar Placeholder
* Watermark + locale adjustment
* Border radius
* Remove unnecessary styles
* Fix firmware avatar image order
* Cleanup `ColorPickerButton`
* Make `UserId` copy/paste able
* Make `FirmwareAvatarSelector` 6 images wide
* Make selection bar better
* Unsaved changes dialogue
* Fix indentation
* Remove extra check
* Address suggestions
* Reorganise
- Remove unused views
- Rename views to match convention
- Fix weird namespacing
* Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* UserRecovererView empty placeholder
* Update Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Models/UserProfile.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Remove AddModel
* Update Ryujinx.Ava/Assets/Locales/en_US.json
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Fix bug
Co-authored-by: Mary-nyan <thog@protonmail.com>
Co-authored-by: Ac_K <Acoustik666@gmail.com>
Diffstat (limited to 'Ryujinx.Ava/UI/Controls/UserSelector.axaml')
| -rw-r--r-- | Ryujinx.Ava/UI/Controls/UserSelector.axaml | 145 |
1 files changed, 0 insertions, 145 deletions
diff --git a/Ryujinx.Ava/UI/Controls/UserSelector.axaml b/Ryujinx.Ava/UI/Controls/UserSelector.axaml deleted file mode 100644 index 002d27a0..00000000 --- a/Ryujinx.Ava/UI/Controls/UserSelector.axaml +++ /dev/null @@ -1,145 +0,0 @@ -<UserControl - x:Class="Ryujinx.Ava.UI.Controls.UserSelector" - xmlns="https://github.com/avaloniaui" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" - xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels" - xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" - d:DesignHeight="450" - MinWidth="500" - d:DesignWidth="800" - mc:Ignorable="d" - Focusable="True"> - <UserControl.Resources> - <helpers:BitmapArrayValueConverter x:Key="ByteImage" /> - </UserControl.Resources> - <Design.DataContext> - <viewModels:UserProfileViewModel /> - </Design.DataContext> - <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> - <Grid.RowDefinitions> - <RowDefinition /> - <RowDefinition Height="Auto" /> - </Grid.RowDefinitions> - <ListBox - Margin="5" - MaxHeight="300" - HorizontalAlignment="Stretch" - VerticalAlignment="Center" - DoubleTapped="ProfilesList_DoubleTapped" - Items="{Binding Profiles}" - SelectionChanged="SelectingItemsControl_SelectionChanged"> - <ListBox.ItemsPanel> - <ItemsPanelTemplate> - <flex:FlexPanel - HorizontalAlignment="Stretch" - VerticalAlignment="Stretch" - AlignContent="FlexStart" - JustifyContent="Center" /> - </ItemsPanelTemplate> - </ListBox.ItemsPanel> - <ListBox.ItemTemplate> - <DataTemplate> - <Grid> - <Border - Margin="2" - HorizontalAlignment="Stretch" - VerticalAlignment="Stretch" - ClipToBounds="True" - CornerRadius="5"> - <Grid Margin="0"> - <Grid.RowDefinitions> - <RowDefinition Height="Auto" /> - <RowDefinition Height="Auto" /> - </Grid.RowDefinitions> - <Image - Grid.Row="0" - Width="96" - Height="96" - Margin="0" - HorizontalAlignment="Stretch" - VerticalAlignment="Top" - Source="{Binding Image, Converter={StaticResource ByteImage}}" /> - <StackPanel - Grid.Row="1" - Height="30" - Margin="5" - HorizontalAlignment="Stretch" - VerticalAlignment="Stretch"> - <TextBlock - HorizontalAlignment="Stretch" - Text="{Binding Name}" - TextAlignment="Center" - TextWrapping="Wrap" /> - </StackPanel> - </Grid> - </Border> - <Border - Width="10" - Height="10" - Margin="5" - HorizontalAlignment="Left" - VerticalAlignment="Top" - Background="LimeGreen" - CornerRadius="5" - IsVisible="{Binding IsOpened}" /> - </Grid> - </DataTemplate> - </ListBox.ItemTemplate> - </ListBox> - <Grid - Grid.Row="1" - HorizontalAlignment="Center"> - <Grid.RowDefinitions> - <RowDefinition Height="Auto"/> - <RowDefinition Height="Auto"/> - <RowDefinition Height="Auto"/> - </Grid.RowDefinitions> - <Grid.ColumnDefinitions> - <ColumnDefinition Width="Auto"/> - <ColumnDefinition Width="Auto"/> - </Grid.ColumnDefinitions> - <Button - HorizontalAlignment="Stretch" - Grid.Row="0" - Grid.Column="0" - Margin="2" - Command="{Binding AddUser}" - Content="{locale:Locale UserProfilesAddNewProfile}" /> - <Button - HorizontalAlignment="Stretch" - Grid.Row="0" - Margin="2" - Grid.Column="1" - Command="{Binding EditUser}" - Content="{locale:Locale UserProfilesEditProfile}" - IsEnabled="{Binding IsSelectedProfiledEditable}" /> - <Button - HorizontalAlignment="Stretch" - Grid.Row="1" - Grid.Column="0" - Margin="2" - Content="{locale:Locale UserProfilesManageSaves}" - Command="{Binding ManageSaves}" /> - <Button - HorizontalAlignment="Stretch" - Grid.Row="1" - Grid.Column="1" - Margin="2" - Command="{Binding DeleteUser}" - Content="{locale:Locale UserProfilesDeleteSelectedProfile}" - IsEnabled="{Binding IsSelectedProfileDeletable}" /> - <Button - HorizontalAlignment="Stretch" - Grid.Row="2" - Grid.ColumnSpan="2" - Grid.Column="0" - Margin="2" - Command="{Binding RecoverLostAccounts}" - Content="{locale:Locale UserProfilesRecoverLostAccounts}" /> - </Grid> - </Grid> -</UserControl>
\ No newline at end of file |
