mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2026-06-05 20:09:15 +00:00
Merge branch ryujinx:master into master
This commit is contained in:
Babib3l
84
.github/workflows/canary.yml
vendored
84
.github/workflows/canary.yml
vendored
@@ -102,51 +102,49 @@ jobs:
|
|||||||
chmod +x Ryujinx.sh Ryujinx
|
chmod +x Ryujinx.sh Ryujinx
|
||||||
tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
|
tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
|
||||||
popd
|
popd
|
||||||
|
|
||||||
gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz"
|
gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz"
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
# If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool
|
- name: Build AppImage (Linux)
|
||||||
|
if: matrix.platform.os == 'ubuntu-latest'
|
||||||
# - name: Build AppImage (Linux)
|
run: |
|
||||||
# if: matrix.platform.os == 'ubuntu-latest'
|
BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
|
||||||
# run: |
|
PLATFORM_NAME="${{ matrix.platform.name }}"
|
||||||
# BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
|
|
||||||
# PLATFORM_NAME="${{ matrix.platform.name }}"
|
sudo apt install -y zsync desktop-file-utils appstream
|
||||||
#
|
|
||||||
# sudo apt install -y zsync desktop-file-utils appstream
|
mkdir -p tools
|
||||||
#
|
export PATH="$PATH:$(readlink -f tools)"
|
||||||
# mkdir -p tools
|
|
||||||
# export PATH="$PATH:$(readlink -f tools)"
|
# Setup appimagetool
|
||||||
#
|
wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
|
||||||
# # Setup appimagetool
|
chmod +x tools/appimagetool
|
||||||
# wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
|
chmod +x distribution/linux/appimage/build-appimage.sh
|
||||||
# chmod +x tools/appimagetool
|
|
||||||
# chmod +x distribution/linux/appimage/build-appimage.sh
|
# Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
|
||||||
#
|
if [ "$PLATFORM_NAME" = "linux-x64" ]; then
|
||||||
# # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
|
ARCH_NAME=x64
|
||||||
# if [ "$PLATFORM_NAME" = "linux-x64" ]; then
|
export ARCH=x86_64
|
||||||
# ARCH_NAME=x64
|
elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
|
||||||
# export ARCH=x86_64
|
ARCH_NAME=arm64
|
||||||
# elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
|
export ARCH=aarch64
|
||||||
# ARCH_NAME=arm64
|
else
|
||||||
# export ARCH=aarch64
|
echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
|
||||||
# else
|
exit 1
|
||||||
# echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
|
fi
|
||||||
# exit 1
|
|
||||||
# fi
|
export UFLAG="gh-releases-zsync|${{ secrets.RC_OWNER }}${{ secrets.RC_CANARY_NAME }}|latest|*-$ARCH_NAME.AppImage.zsync"
|
||||||
#
|
BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
|
||||||
# export UFLAG="gh-releases-zsync|${{ secrets.RC_OWNER }}${{ secrets.RC_CANARY_NAME }}|latest|*-$ARCH_NAME.AppImage.zsync"
|
|
||||||
# BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
|
pushd publish_appimage
|
||||||
#
|
mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
|
||||||
# pushd publish_appimage
|
mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
|
||||||
# mv Ryujinx.AppImage ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage
|
popd
|
||||||
# mv Ryujinx.AppImage.zsync ../release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
|
|
||||||
# popd
|
gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage"
|
||||||
#
|
gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
|
||||||
# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage"
|
shell: bash
|
||||||
# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
|
|
||||||
# shell: bash
|
|
||||||
|
|
||||||
macos_release:
|
macos_release:
|
||||||
name: Release MacOS universal
|
name: Release MacOS universal
|
||||||
|
|||||||
80
.github/workflows/release.yml
vendored
80
.github/workflows/release.yml
vendored
@@ -96,48 +96,46 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build AppImage (Linux)
|
||||||
|
if: matrix.platform.os == 'ubuntu-latest'
|
||||||
|
run: |
|
||||||
|
BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
|
||||||
|
PLATFORM_NAME="${{ matrix.platform.name }}"
|
||||||
|
|
||||||
|
sudo apt install -y zsync desktop-file-utils appstream
|
||||||
|
|
||||||
|
mkdir -p tools
|
||||||
|
export PATH="$PATH:$(readlink -f tools)"
|
||||||
|
|
||||||
|
# Setup appimagetool
|
||||||
|
wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
|
||||||
|
chmod +x tools/appimagetool
|
||||||
|
chmod +x distribution/linux/appimage/build-appimage.sh
|
||||||
|
|
||||||
|
# Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
|
||||||
|
if [ "$PLATFORM_NAME" = "linux-x64" ]; then
|
||||||
|
ARCH_NAME=x64
|
||||||
|
export ARCH=x86_64
|
||||||
|
elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
|
||||||
|
ARCH_NAME=arm64
|
||||||
|
export ARCH=aarch64
|
||||||
|
else
|
||||||
|
echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
|
||||||
|
BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
|
||||||
|
|
||||||
|
pushd publish_appimage
|
||||||
|
mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
|
||||||
|
mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
|
||||||
|
popd
|
||||||
|
|
||||||
# If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool
|
gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage"
|
||||||
|
gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
|
||||||
# - name: Build AppImage (Linux)
|
shell: bash
|
||||||
# if: matrix.platform.os == 'ubuntu-latest'
|
|
||||||
# run: |
|
|
||||||
# BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
|
|
||||||
# PLATFORM_NAME="${{ matrix.platform.name }}"
|
|
||||||
#
|
|
||||||
# sudo apt install -y zsync desktop-file-utils appstream
|
|
||||||
#
|
|
||||||
# mkdir -p tools
|
|
||||||
# export PATH="$PATH:$(readlink -f tools)"
|
|
||||||
#
|
|
||||||
# # Setup appimagetool
|
|
||||||
# wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
|
|
||||||
# chmod +x tools/appimagetool
|
|
||||||
# chmod +x distribution/linux/appimage/build-appimage.sh
|
|
||||||
#
|
|
||||||
# # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
|
|
||||||
# if [ "$PLATFORM_NAME" = "linux-x64" ]; then
|
|
||||||
# ARCH_NAME=x64
|
|
||||||
# export ARCH=x86_64
|
|
||||||
# elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
|
|
||||||
# ARCH_NAME=arm64
|
|
||||||
# export ARCH=aarch64
|
|
||||||
# else
|
|
||||||
# echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
#
|
|
||||||
# export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
|
|
||||||
# BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
|
|
||||||
#
|
|
||||||
# pushd publish_appimage
|
|
||||||
# mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
|
|
||||||
# mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
|
|
||||||
# popd
|
|
||||||
#
|
|
||||||
# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage"
|
|
||||||
# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync"
|
|
||||||
# shell: bash
|
|
||||||
|
|
||||||
macos_release:
|
macos_release:
|
||||||
name: Release MacOS universal
|
name: Release MacOS universal
|
||||||
|
|||||||
@@ -15545,26 +15545,26 @@
|
|||||||
{
|
{
|
||||||
"ID": "AmiiboOptionsShowAllLabel",
|
"ID": "AmiiboOptionsShowAllLabel",
|
||||||
"Translations": {
|
"Translations": {
|
||||||
"ar_SA": "إظهار كل أميبو",
|
"ar_SA": "",
|
||||||
"de_DE": "Zeige alle Amiibos",
|
"de_DE": "",
|
||||||
"el_GR": "Εμφάνιση όλων των Amiibo",
|
"el_GR": "",
|
||||||
"en_US": "Show All Amiibo",
|
"en_US": "Show incompatible Amiibo for this game",
|
||||||
"es_ES": "Mostrar todos los Amiibo",
|
"es_ES": "Mostrar Amiibo incompatibles con este juego",
|
||||||
"fr_FR": "Afficher Tous les Amiibo",
|
"fr_FR": "",
|
||||||
"he_IL": "הצג את כל האמיבואים",
|
"he_IL": "",
|
||||||
"it_IT": "Mostra tutti gli amiibo",
|
"it_IT": "",
|
||||||
"ja_JP": "すべての Amiibo を表示",
|
"ja_JP": "",
|
||||||
"ko_KR": "모든 Amiibo 표시",
|
"ko_KR": "",
|
||||||
"no_NO": "Vis alle Amiibo",
|
"no_NO": "",
|
||||||
"pl_PL": "Pokaż Wszystkie Amiibo",
|
"pl_PL": "",
|
||||||
"pt_BR": "Exibir Todos os Amiibos",
|
"pt_BR": "",
|
||||||
"ru_RU": "Показать все Amiibo",
|
"ru_RU": "",
|
||||||
"sv_SE": "Visa alla Amiibo",
|
"sv_SE": "",
|
||||||
"th_TH": "แสดง Amiibo ทั้งหมด",
|
"th_TH": "",
|
||||||
"tr_TR": "Tüm Amiibo'ları Göster",
|
"tr_TR": "",
|
||||||
"uk_UA": "Показати всі Amiibo",
|
"uk_UA": "",
|
||||||
"zh_CN": "显示所有 Amiibo",
|
"zh_CN": "",
|
||||||
"zh_TW": "顯示所有 Amiibo"
|
"zh_TW": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx*
|
|||||||
|
|
||||||
mkdir -p "$OUTDIR"
|
mkdir -p "$OUTDIR"
|
||||||
|
|
||||||
appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
|
appimagetool -n --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
|
||||||
-u "$UFLAG" \
|
-u "$UFLAG" \
|
||||||
AppDir "$OUTDIR"/Ryujinx.AppImage
|
AppDir "$OUTDIR"/Ryujinx.AppImage
|
||||||
|
|
||||||
|
|||||||
@@ -342,14 +342,24 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
{
|
{
|
||||||
_amiibos.Clear();
|
_amiibos.Clear();
|
||||||
|
|
||||||
|
List<AmiiboApi> amiiboSortedList;
|
||||||
|
|
||||||
|
// If no series selected, just display all available amiibos
|
||||||
if (_seriesSelectedIndex < 0)
|
if (_seriesSelectedIndex < 0)
|
||||||
{
|
{
|
||||||
return;
|
amiiboSortedList = _amiiboList
|
||||||
|
.OrderBy(amiibo => amiibo.AmiiboSeries)
|
||||||
|
.ThenBy(x => x.Name)
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
amiiboSortedList = _amiiboList
|
||||||
|
.Where(amiibo => amiibo.AmiiboSeries == _amiiboSeries[SeriesSelectedIndex])
|
||||||
|
.OrderBy(amiibo => amiibo.Name).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
List<AmiiboApi> amiiboSortedList = _amiiboList
|
|
||||||
.Where(amiibo => amiibo.AmiiboSeries == _amiiboSeries[SeriesSelectedIndex])
|
|
||||||
.OrderBy(amiibo => amiibo.Name).ToList();
|
|
||||||
|
|
||||||
for (int i = 0; i < amiiboSortedList.Count; i++)
|
for (int i = 0; i < amiiboSortedList.Count; i++)
|
||||||
{
|
{
|
||||||
@@ -386,7 +396,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
|
|
||||||
Usage = string.Empty;
|
Usage = string.Empty;
|
||||||
|
|
||||||
if (_amiiboSelectedIndex < 0)
|
if (_amiiboSelectedIndex < 0 || _amiibos.Count < 1)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,15 +31,11 @@
|
|||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Margin="8, 8, 7, 0"
|
Margin="8, 8, 7, 0"
|
||||||
ToolTip.Tip="{ext:WindowTitle Amiibo}" />
|
ToolTip.Tip="{ext:WindowTitle Amiibo}" />
|
||||||
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 100">
|
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 20">
|
||||||
<StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
|
<StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
<TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
|
<TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
|
||||||
<ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
|
<ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Margin="15, 0, 0, 0" Spacing="10" Orientation="Horizontal" >
|
|
||||||
<TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
|
|
||||||
<ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid Name="NormalControls" ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
|
<Grid Name="NormalControls" ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
|
||||||
@@ -47,19 +43,31 @@
|
|||||||
<TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
|
<TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
|
||||||
<ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
|
<ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Spacing="10" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
|
|
||||||
<TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
|
|
||||||
<ComboBox SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
<StackPanel Margin="20" Grid.Row="2">
|
<DockPanel Grid.Row="2">
|
||||||
<Image Source="{Binding AmiiboImage}" Height="350" Width="350" HorizontalAlignment="Center" />
|
<ListBox
|
||||||
<ScrollViewer MaxHeight="120" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"
|
DockPanel.Dock="Left"
|
||||||
Margin="20" VerticalAlignment="Top" HorizontalAlignment="Stretch">
|
Width="300"
|
||||||
<TextBlock TextWrapping="Wrap" Text="{Binding Usage}" HorizontalAlignment="Center"
|
Margin="20"
|
||||||
TextAlignment="Center" />
|
SelectionMode="Single"
|
||||||
</ScrollViewer>
|
ItemsSource="{Binding AmiiboList}"
|
||||||
</StackPanel>
|
SelectedIndex="{Binding AmiiboSelectedIndex}">
|
||||||
|
|
||||||
|
<ListBox.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<TextBlock Margin="10, 0, 0 ,0" Text="{Binding Name}" />
|
||||||
|
</DataTemplate>
|
||||||
|
</ListBox.ItemTemplate>
|
||||||
|
</ListBox>
|
||||||
|
<StackPanel Margin="20">
|
||||||
|
<Image Source="{Binding AmiiboImage}" Height="350" Width="150" HorizontalAlignment="Center" />
|
||||||
|
<ScrollViewer MaxHeight="120" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"
|
||||||
|
Margin="20" VerticalAlignment="Top" HorizontalAlignment="Stretch">
|
||||||
|
<TextBlock TextWrapping="Wrap" Text="{Binding Usage}" HorizontalAlignment="Center"
|
||||||
|
TextAlignment="Center" />
|
||||||
|
</ScrollViewer>
|
||||||
|
</StackPanel>
|
||||||
|
</DockPanel>
|
||||||
<Grid Grid.Row="3" ColumnDefinitions="Auto,Auto,*,Auto,Auto">
|
<Grid Grid.Row="3" ColumnDefinitions="Auto,Auto,*,Auto,Auto">
|
||||||
<CheckBox Margin="10" Grid.Column="0" VerticalContentAlignment="Center"
|
<CheckBox Margin="10" Grid.Column="0" VerticalContentAlignment="Center"
|
||||||
IsChecked="{Binding ShowAllAmiibo}"
|
IsChecked="{Binding ShowAllAmiibo}"
|
||||||
|
|||||||
Reference in New Issue
Block a user