Browse Source

founder's bundle onboarding wip

Krzysztof Krysiński 4 tháng trước cách đây
mục cha
commit
a3998e5748

+ 3 - 1
src/PixiEditor/Data/Localization/Languages/en.json

@@ -1061,5 +1061,7 @@
   "UPDATE": "Update",
   "AUTOSAVE_OPEN_FOLDER": "Open autosave folder",
    "AUTOSAVE_OPEN_FOLDER_DESCRIPTIVE": "Open the folder where autosaves are stored",
-  "AUTOSAVE_TOGGLE_DESCRIPTIVE": "Enable/disable autosave"
+  "AUTOSAVE_TOGGLE_DESCRIPTIVE": "Enable/disable autosave",
+  "FOUNDERS_BUNDLE": "Founder's Bundle",
+  "FOUNDERS_BUNDLE_SUBTEXT": "Support PixiEditor and get exclusive perks!"
 }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 4 - 0
src/PixiEditor/Images/FoundersBundle.svg


+ 0 - 4
src/PixiEditor/Initialization/ClassicDesktopEntry.cs

@@ -120,10 +120,6 @@ internal class ClassicDesktopEntry
         InitPlatform();
 
         ExtensionLoader extensionLoader = new ExtensionLoader(Paths.ExtensionPackagesPath, Paths.UserExtensionsPath);
-        //TODO: fetch from extension store
-        extensionLoader.AddOfficialExtension("pixieditor.supporterpack",
-            new OfficialExtensionData("supporter-pack.snk", AdditionalContentProduct.SupporterPack));
-        extensionLoader.AddOfficialExtension("pixieditor.beta", new OfficialExtensionData());
         if (!safeMode)
         {
             extensionLoader.LoadExtensions();

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

@@ -49,7 +49,8 @@ internal class OnboardingViewModel : PixiObservableObject
         new FormStep { Title = new LocalizedString("ONB_SELECT_PRIMARY_TOOLSET"), Step = 0 },
         new FormStep { Title = new LocalizedString("LANGUAGE"), Step = 1 },
         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 },
+        new FormStep { Title = new LocalizedString("FOUNDERS_BUNDLE"), Step = 4 }
     };
 
     public RelayCommand NextFormStepCommand { get; }
@@ -135,7 +136,7 @@ internal class OnboardingViewModel : PixiObservableObject
 
     public void NextFormStep()
     {
-        if (FormStep.Step == 3)
+        if (FormStep.Step == AllFormSteps.Count - 1)
         {
             NextPage();
             return;

+ 9 - 4
src/PixiEditor/Views/Dialogs/OnboardingDialog.axaml

@@ -59,14 +59,14 @@
         </StackPanel>
         <Grid
             HorizontalAlignment="Center"
-            Margin="0, 32"
+            Margin="0, 32, 0, 64"
             IsVisible="{Binding Page, Converter={converters:IsEqualConverter}, ConverterParameter=1}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <TextBlock Classes="h2"
+            <TextBlock Classes="h4"
                        Foreground="{DynamicResource ThemeForegroundBrush}"
                        ui:Translator.LocalizedString="{Binding FormStep.Title}" HorizontalAlignment="Center"
                        VerticalAlignment="Center" />
@@ -182,6 +182,11 @@
                                ui:Translator.Key="PRIVACY_POLICY" />
                 </TextBlock>
             </StackPanel>
+            <Grid Grid.Row="1"
+                  IsVisible="{Binding FormStep.Step, Converter={converters:IsEqualConverter}, ConverterParameter=4}">
+                <TextBlock Text="{ui:Translate Key=FOUNDERS_BUNDLE_SUBTEXT}" HorizontalAlignment="Center" />
+                <Svg VerticalAlignment="Center" Path="/Images/FoundersBundle.svg" Width="532" />
+            </Grid>
         </Grid>
         <DockPanel
             LastChildFill="True"
@@ -236,10 +241,10 @@
             IsVisible="{Binding Page, Converter={converters:IsEqualConverter}, ConverterParameter=2}"
             HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="32" Orientation="Vertical">
 
-            <TextBlock HorizontalAlignment="Center" ui:Translator.Key="ONB_ALL_SET" Classes="h3"/>
+            <TextBlock HorizontalAlignment="Center" ui:Translator.Key="ONB_ALL_SET" Classes="h3" />
             <TextBlock HorizontalAlignment="Center" Text="{DynamicResource icon-check}" Classes="pixi-icon"
                        Foreground="{DynamicResource ThemeBorderHighBrush}"
-                       FontSize="72"/>
+                       FontSize="72" />
             <Button
                 ui:Translator.Key="ONB_ALL_SET_BTN"
                 Background="{DynamicResource ThemeAccentBrush}"

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác