Browse Source

Only show 'Update source' button when build with Debug configuration

CPKreuz 2 years ago
parent
commit
23d28d2eb1

+ 1 - 1
src/PixiEditor/Helpers/CrashHelper.cs

@@ -103,7 +103,7 @@ internal class CrashHelper
 
     public static async Task SendExceptionInfoToWebhook(Exception e, [CallerFilePath] string filePath = "<unknown>", [CallerMemberName] string memberName = "<unknown>")
     {
-        if (ViewModelMain.Current.DebugSubViewModel.IsDebugBuild)
+        if (DebugViewModel.IsDebugBuild)
             return;
         await SendReportTextToWebhook(CrashReport.Generate(e), $"{filePath}; Method {memberName}");
     }

+ 2 - 2
src/PixiEditor/ViewModels/SubViewModels/Main/DebugViewModel.cs

@@ -20,7 +20,7 @@ namespace PixiEditor.ViewModels.SubViewModels.Main;
 [Command.Group("PixiEditor.Debug", "DEBUG")]
 internal class DebugViewModel : SubViewModel<ViewModelMain>
 {
-    public bool IsDebugBuild { get; set; }
+    public static bool IsDebugBuild { get; set; }
 
     public bool IsDebugModeEnabled { get; set; }
 
@@ -247,7 +247,7 @@ internal class DebugViewModel : SubViewModel<ViewModelMain>
     }
 
     [Conditional("DEBUG")]
-    private void SetDebug() => IsDebugBuild = true;
+    private static void SetDebug() => IsDebugBuild = true;
 
     private void UpdateDebugMode(bool setting)
     {

+ 6 - 5
src/PixiEditor/Views/Dialogs/DebugDialogs/Localization/LocalizationDebugWindow.xaml

@@ -13,12 +13,13 @@
         xmlns:xaml="clr-namespace:PixiEditor.Models.Commands.XAML"
         xmlns:dialogs="clr-namespace:PixiEditor.Views.Dialogs"
         xmlns:globalization="clr-namespace:System.Globalization;assembly=System.Runtime"
+        xmlns:main="clr-namespace:PixiEditor.ViewModels.SubViewModels.Main"
         x:Name="popup"
         mc:Ignorable="d"
         Foreground="White"
         Title="LocalizationDebugWindow"
-        MinHeight="240" MinWidth="480"
-        Height="350" Width="500"
+        MinHeight="240" MinWidth="465"
+        Height="350" Width="465"
         FlowDirection="{helpers:Localization FlowDirection}"
         d:DataContext="{d:DesignInstance local:LocalizationDataContext}">
 
@@ -178,11 +179,11 @@
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition />
-                                <ColumnDefinition Width="5" />
-                                <ColumnDefinition />
+                                <ColumnDefinition Width="{Binding Source={x:Static main:DebugViewModel.IsDebugBuild}, Converter={converters:BoolToValueConverter FalseValue=Auto, TrueValue=*}}" />
                             </Grid.ColumnDefinitions>
                             <Button views:Translator.Key="APPLY" Command="{Binding ApplyLanguageCommand}" />
-                            <Button Grid.Column="2"  views:Translator.Key="UPDATE_SOURCE" Command="{Binding UpdateSourceCommand}"/>
+                            <Button Grid.Column="1" Margin="5,0,0,0"  views:Translator.Key="UPDATE_SOURCE" Command="{Binding UpdateSourceCommand}"
+                                    Visibility="{Binding Source={x:Static main:DebugViewModel.IsDebugBuild}, Converter={BoolToVisibilityConverter}}"/>
                         </Grid>
                     </StackPanel>
                 </Border>