Skip to content

Commit 88c2d7c

Browse files
committed
Adjust download failed text, tweak MegaLoginView to use MEGA text logo
1 parent 6836f2a commit 88c2d7c

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed
13.7 KB
Loading

Wabbajack.App.Wpf/Util/InstallResultHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static string GetDescription(this InstallResult result)
2727
InstallResult.Errored => "The modlist installation has failed because of an unknown error. Check the log for more information.",
2828
InstallResult.GameMissing => "The modlist installation has failed because the game could not be found. Please make sure a valid copy of the game is installed.",
2929
InstallResult.GameInvalid => "The modlist installation has failed because not all required game files could be found. Verify all game files are present and retry installation.",
30-
InstallResult.DownloadFailed => "The modlist installation has failed because one or more required files could not be downloaded. Try manually placing these files in the downloads directory.",
30+
InstallResult.DownloadFailed => "The modlist installation has failed because one or more required files could not be sourced. Try manually sourcing these files below.",
3131
InstallResult.NotEnoughSpace => "The modlist installation has failed because not enough free space was available on the disk. Please free up enough space and retry the installation.",
3232
_ => ""
3333
};

Wabbajack.App.Wpf/Views/Interventions/MegaLoginView.xaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ic:SymbolIcon Symbol="Dismiss" FontSize="24" VerticalAlignment="Center" HorizontalAlignment="Right" />
3535
</Button>
3636

37-
<Image x:Name="MegaImage" Grid.Row="2" Source="pack://application:,,,/LoginManagers/Icons/mega.png" Width="64" Height="64" />
37+
<Image x:Name="MegaImage" Grid.Row="2" Source="pack://application:,,,/LoginManagers/Icons/mega-text.png" Width="Auto" Height="64" />
3838
<Grid Grid.Row="4" VerticalAlignment="Center">
3939
<Grid.ColumnDefinitions>
4040
<ColumnDefinition Width="*" />
@@ -57,6 +57,8 @@
5757
<RowDefinition Height="Auto" />
5858
<RowDefinition Height="16" />
5959
<RowDefinition Height="Auto" />
60+
<RowDefinition Height="8" />
61+
<RowDefinition Height="Auto" />
6062
</Grid.RowDefinitions>
6163

6264
<!-- Normal login -->
@@ -85,13 +87,17 @@
8587
VerticalAlignment="Center"/>
8688
</Grid>
8789
</Border>
90+
<TextBlock Grid.Row="12" Foreground="{StaticResource ForegroundBrush}" Opacity="0.66" >
91+
<ic:SymbolIcon Width="13" Height="13" FontSize="14" Symbol="Warning" VerticalAlignment="Center" Margin="0, 4, 2, 0" />
92+
<Run Text="Please note that 2FA logins will not work as they are currently unsupported." BaselineAlignment="Center" />
93+
</TextBlock>
8894
</Grid>
8995

9096
<TextBlock Grid.Column="2" Padding="16, 0, 16, 0" FontSize="24" VerticalAlignment="Center" Text="or..." Foreground="{StaticResource DisabledButtonForeground}" />
9197

9298
<Grid Grid.Column="3" Width="{Binding Converter={StaticResource MathConverter}, ConverterParameter=x/3, ElementName=AuthorFiles, Path=ActualWidth}">
9399
<!-- Normal login -->
94-
<local:WJButton x:Name="LoginAnonymouslyButton" Text="Login Anonymously" Icon="PersonArrowRight" Width="Auto" ButtonStyle="Mono" />
100+
<local:WJButton x:Name="LoginAnonymouslyButton" Text="Login anonymously" Icon="PersonArrowRight" Width="Auto" ButtonStyle="Color" />
95101
</Grid>
96102
</Grid>
97103
</Grid>

Wabbajack.App.Wpf/Views/Interventions/MegaLoginView.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public MegaLoginView()
1919
{
2020
InitializeComponent();
2121

22-
MegaImage.Source = BitmapFrame.Create(typeof(MegaLoginManager).Assembly.GetManifestResourceStream("Wabbajack.App.Wpf.LoginManagers.Icons.mega.png")!);
22+
MegaImage.Source = BitmapFrame.Create(typeof(MegaLoginManager).Assembly.GetManifestResourceStream("Wabbajack.App.Wpf.LoginManagers.Icons.mega-text.png")!);
2323

2424
this.WhenActivated(disposables =>
2525
{

Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
</ItemGroup>
4747

4848
<ItemGroup>
49+
<None Remove="LoginManagers\Icons\mega-text.png" />
4950
<None Remove="LoginManagers\Icons\mega.png" />
5051
<None Remove="Readme.md" />
5152
<None Remove="Resources\Fonts\Atkinson-Hyperlegible-Italic-102.ttf" />
@@ -130,6 +131,7 @@
130131
<None Remove="LoginManagers\Icons\lovers_lab.png" />
131132
<EmbeddedResource Include="LoginManagers\Icons\lovers_lab.png" />
132133
<None Remove="LoginManagers\Icons\vector_plexus.png" />
134+
<EmbeddedResource Include="LoginManagers\Icons\mega-text.png" />
133135
<EmbeddedResource Include="LoginManagers\Icons\mega.png" />
134136
<EmbeddedResource Include="LoginManagers\Icons\vector_plexus.png" />
135137

0 commit comments

Comments
 (0)