Browse Source

Swapped onboarding order

Krzysztof Krysiński 2 weeks ago
parent
commit
0219785220

+ 2 - 4
src/PixiEditor/ViewModels/UserPreferences/OnboardingViewModel.cs

@@ -49,13 +49,11 @@ internal class OnboardingViewModel : PixiObservableObject
 
 
     public ObservableCollection<FormStep> AllFormSteps { get; } = new()
     public ObservableCollection<FormStep> AllFormSteps { get; } = new()
     {
     {
-        new FormStep { Title = new LocalizedString("ONB_SELECT_PRIMARY_TOOLSET"), Step = 0 },
-        new FormStep { Title = new LocalizedString("LANGUAGE"), Step = 1 },
+        new FormStep { Title = new LocalizedString("LANGUAGE"), Step = 0 },
+        new FormStep { Title = new LocalizedString("ONB_SELECT_PRIMARY_TOOLSET"), Step = 1 },
         new FormStep { Title = new LocalizedString("ONB_SHORTCUTS"), Step = 2 },
         new FormStep { Title = new LocalizedString("ONB_SHORTCUTS"), Step = 2 },
         new FormStep { Title = new LocalizedString("ONB_ANALYTICS"), Step = 3 },
         new FormStep { Title = new LocalizedString("ONB_ANALYTICS"), Step = 3 },
-#if !FOUNDERS_PACK_REQUIRED
         new FormStep { Title = new LocalizedString("FOUNDERS_BUNDLE"), Step = 4 }
         new FormStep { Title = new LocalizedString("FOUNDERS_BUNDLE"), Step = 4 }
-#endif
     };
     };
 
 
     public RelayCommand NextFormStepCommand { get; }
     public RelayCommand NextFormStepCommand { get; }

+ 3 - 3
src/PixiEditor/Views/Dialogs/OnboardingDialog.axaml

@@ -163,7 +163,7 @@
                            ui:Translator.LocalizedString="{Binding FormStep.Title}" HorizontalAlignment="Center"
                            ui:Translator.LocalizedString="{Binding FormStep.Title}" HorizontalAlignment="Center"
                            VerticalAlignment="Center" />
                            VerticalAlignment="Center" />
                 <StackPanel Grid.Row="1"
                 <StackPanel Grid.Row="1"
-                            IsVisible="{Binding FormStep.Step, Converter={converters:IsEqualConverter}, ConverterParameter=0}"
+                            IsVisible="{Binding FormStep.Step, Converter={converters:IsEqualConverter}, ConverterParameter=1}"
                             HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="32"
                             HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="32"
                             Orientation="Horizontal">
                             Orientation="Horizontal">
                     <ScrollViewer VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto">
                     <ScrollViewer VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto">
@@ -212,7 +212,7 @@
                 <StackPanel Grid.Row="1"
                 <StackPanel Grid.Row="1"
                             HorizontalAlignment="Center" VerticalAlignment="Center"
                             HorizontalAlignment="Center" VerticalAlignment="Center"
                             Spacing="32"
                             Spacing="32"
-                            IsVisible="{Binding FormStep.Step, Converter={converters:IsEqualConverter}, ConverterParameter=1}">
+                            IsVisible="{Binding FormStep.Step, Converter={converters:IsEqualConverter}, ConverterParameter=0}">
                     <ComboBox Width="200" HorizontalAlignment="Center" Margin="0, -20, 0, 0"
                     <ComboBox Width="200" HorizontalAlignment="Center" Margin="0, -20, 0, 0"
                               ItemsSource="{Binding GeneralSettings.AvailableLanguages}"
                               ItemsSource="{Binding GeneralSettings.AvailableLanguages}"
                               SelectedItem="{Binding GeneralSettings.SelectedLanguage, Mode=TwoWay}">
                               SelectedItem="{Binding GeneralSettings.SelectedLanguage, Mode=TwoWay}">
@@ -229,7 +229,7 @@
                             </DataTemplate>
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
                     </ComboBox>
-                    <TextBlock DockPanel.Dock="Bottom" ui1:Hyperlink.Url="https://discord.gg/qSRMYmq"
+                    <TextBlock TextWrapping="Wrap" Padding="10, 0" DockPanel.Dock="Bottom" ui1:Hyperlink.Url="https://discord.gg/qSRMYmq"
                                ui:Translator.Key="LANGUAGE_INFO" />
                                ui:Translator.Key="LANGUAGE_INFO" />
                 </StackPanel>
                 </StackPanel>
                 <StackPanel Grid.Row="1"
                 <StackPanel Grid.Row="1"