Nattiden 1 год назад
Родитель
Сommit
2b7af3a5cc

+ 2 - 2
Project/libraries/Homepage/Light/LightFooter.xaml

@@ -6,11 +6,11 @@
     LogoScale="1.1" Logo="M11.93 8.5a4.002 4.002 0 0 1-7.86 0H.75a.75.75 0 0 1 0-1.5h3.32a4.002 4.002 0 0 1 7.86 0h3.32a.75.75 0 0 1 0 1.5Zm-1.43-.75a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z" />
     </StackPanel>
     <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Right" Margin="-4,0,0,0">
-    ${@IF|${beta}|
+    ${@IF|${args.mod}|
    <local:MyIconTextButton HorizontalAlignment="Left" Text="设置" ToolTip="新闻主页设置" EventType="打开帮助"
     EventData="${@Link|Preference}"
     LogoScale="1.1" Logo="M959 493.08L750.69 133.218c-7.559-11.362-18.92-18.92-32.183-18.92h-414.77a36.669 36.669 0 0 0-32.182 18.92L63.195 493.08a34.426 34.426 0 0 0 0 37.84l208.36 359.862c7.558 11.362 18.92 18.92 32.183 18.92h414.769a36.669 36.669 0 0 0 32.183-18.92L959 530.92a34.426 34.426 0 0 0 0-37.84z m-66.316 37.84L718.507 833.975c-7.607 11.361-18.969 18.92-32.183 18.92H335.872a36.669 36.669 0 0 1-32.183-18.92L127.561 530.92a34.426 34.426 0 0 1 0-37.84L303.69 190.025c7.558-11.361 18.92-18.92 32.183-18.92h350.354c13.264 0 26.527 7.559 32.183 18.92L892.684 493.08a34.377 34.377 0 0 1 0 37.84z M510.245 341.528a169.74 169.74 0 0 0-170.423 170.423 169.74 169.74 0 0 0 170.423 170.472A169.74 169.74 0 0 0 680.716 511.95a169.74 169.74 0 0 0-170.471-170.423z m0 284.087A113.957 113.957 0 0 1 396.629 512a113.957 113.957 0 0 1 113.616-113.615A113.957 113.957 0 0 1 623.86 512a113.957 113.957 0 0 1-113.615 113.615z"/>}
-    ${@IF|${beta-test}|
+    ${@IF|${args.beta}|
    <local:MyIconTextButton HorizontalAlignment="Left" Text="设置" ToolTip="新闻主页设置" EventType="打开帮助"
     EventData="${@Link|BetaNotice}"
     LogoScale="1.1" Logo="M959 493.08L750.69 133.218c-7.559-11.362-18.92-18.92-32.183-18.92h-414.77a36.669 36.669 0 0 0-32.182 18.92L63.195 493.08a34.426 34.426 0 0 0 0 37.84l208.36 359.862c7.558 11.362 18.92 18.92 32.183 18.92h414.769a36.669 36.669 0 0 0 32.183-18.92L959 530.92a34.426 34.426 0 0 0 0-37.84z m-66.316 37.84L718.507 833.975c-7.607 11.361-18.969 18.92-32.183 18.92H335.872a36.669 36.669 0 0 1-32.183-18.92L127.561 530.92a34.426 34.426 0 0 1 0-37.84L303.69 190.025c7.558-11.361 18.92-18.92 32.183-18.92h350.354c13.264 0 26.527 7.559 32.183 18.92L892.684 493.08a34.377 34.377 0 0 1 0 37.84z M510.245 341.528a169.74 169.74 0 0 0-170.423 170.423 169.74 169.74 0 0 0 170.423 170.472A169.74 169.74 0 0 0 680.716 511.95a169.74 169.74 0 0 0-170.471-170.423z m0 284.087A113.957 113.957 0 0 1 396.629 512a113.957 113.957 0 0 1 113.616-113.615A113.957 113.957 0 0 1 623.86 512a113.957 113.957 0 0 1-113.615 113.615z"/>}

+ 2 - 2
Project/libraries/Homepage/NewFooter.xaml

@@ -26,12 +26,12 @@
     </StackPanel>
     </StackPanel>
     <StackPanel HorizontalAlignment="Right" >
-    ${@IF|${beta}|
+    ${@IF|${args.mod}|
    <local:MyIconTextButton HorizontalAlignment="Left" Text="设置" ToolTip="新闻主页设置" EventType="打开帮助"
     EventData="${@Link|Preference}"
     LogoScale="1.1" Logo="M959 493.08L750.69 133.218c-7.559-11.362-18.92-18.92-32.183-18.92h-414.77a36.669 36.669 0 0 0-32.182 18.92L63.195 493.08a34.426 34.426 0 0 0 0 37.84l208.36 359.862c7.558 11.362 18.92 18.92 32.183 18.92h414.769a36.669 36.669 0 0 0 32.183-18.92L959 530.92a34.426 34.426 0 0 0 0-37.84z m-66.316 37.84L718.507 833.975c-7.607 11.361-18.969 18.92-32.183 18.92H335.872a36.669 36.669 0 0 1-32.183-18.92L127.561 530.92a34.426 34.426 0 0 1 0-37.84L303.69 190.025c7.558-11.361 18.92-18.92 32.183-18.92h350.354c13.264 0 26.527 7.559 32.183 18.92L892.684 493.08a34.377 34.377 0 0 1 0 37.84z M510.245 341.528a169.74 169.74 0 0 0-170.423 170.423 169.74 169.74 0 0 0 170.423 170.472A169.74 169.74 0 0 0 680.716 511.95a169.74 169.74 0 0 0-170.471-170.423z m0 284.087A113.957 113.957 0 0 1 396.629 512a113.957 113.957 0 0 1 113.616-113.615A113.957 113.957 0 0 1 623.86 512a113.957 113.957 0 0 1-113.615 113.615z"/>
     }
-    ${@IF|${beta-test}|
+    ${@IF|${args.beta}|
    <local:MyIconTextButton HorizontalAlignment="Left" Text="设置" ToolTip="新闻主页设置" EventType="打开帮助"
     EventData="${@Link|BetaNotice}"
     LogoScale="1.1" Logo="M959 493.08L750.69 133.218c-7.559-11.362-18.92-18.92-32.183-18.92h-414.77a36.669 36.669 0 0 0-32.182 18.92L63.195 493.08a34.426 34.426 0 0 0 0 37.84l208.36 359.862c7.558 11.362 18.92 18.92 32.183 18.92h414.769a36.669 36.669 0 0 0 32.183-18.92L959 530.92a34.426 34.426 0 0 0 0-37.84z m-66.316 37.84L718.507 833.975c-7.607 11.361-18.969 18.92-32.183 18.92H335.872a36.669 36.669 0 0 1-32.183-18.92L127.561 530.92a34.426 34.426 0 0 1 0-37.84L303.69 190.025c7.558-11.361 18.92-18.92 32.183-18.92h350.354c13.264 0 26.527 7.559 32.183 18.92L892.684 493.08a34.377 34.377 0 0 1 0 37.84z M510.245 341.528a169.74 169.74 0 0 0-170.423 170.423 169.74 169.74 0 0 0 170.423 170.472A169.74 169.74 0 0 0 680.716 511.95a169.74 169.74 0 0 0-170.471-170.423z m0 284.087A113.957 113.957 0 0 1 396.629 512a113.957 113.957 0 0 1 113.616-113.615A113.957 113.957 0 0 1 623.86 512a113.957 113.957 0 0 1-113.615 113.615z"/>

+ 3 - 2
Project/modules/homepage_preference.py

@@ -10,6 +10,7 @@ def true_that(obj:str):
 PREFERENCE_LIST=[
     'skin',
     'not_finished',
+    'mod',
     'beta',
     'domain'
 ]
@@ -19,12 +20,12 @@ if not DOMAIN.endswith('/'):
 
 @script('PreferenceUrl')
 def get_preferece_url(context:'Context', *_args, **_kwargs):
-    settings = context.setter.toProperties()
+    settings = context.setter.toProperties().get('args',{})
     url = DOMAIN
     if true_that(settings.get('LightEdition', False)):
         url += 'Light'
     args = []
-    args.append('beta=true')
+    args.append('mod')
     if true_that(settings.get('SkinNewra', False)):
         args.append('skin=newra')
     if true_that(settings.get('HideTranslating', False)):

+ 1 - 1
Project/modules/homepage_url.py

@@ -7,7 +7,7 @@ DOMAIN = pref_module.DOMAIN
 
 @script('Link')
 def link_script(page_name, context, *_args, **kwargs):
-    settings:dict = context.setter.toProperties()
+    settings:dict = context.setter.toProperties().get('args',{})
     settings_length = len(settings)
     if '.json' not in page_name:
         page_name += '.json'

+ 1 - 1
Project/pages/Preference/BetaNotice.xaml

@@ -21,7 +21,7 @@
             这些选项是<Bold>正在测试</Bold>的新功能,<Bold>可能不稳定</Bold>,也不代表最终成果,也可能随时取消。<Bold>但不会对你使用PCL的其它功能造成影响,也不会造成你的数据损坏、丢失。</Bold>
         </TextBlock>
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4">
-            由于PCL主页限制,<Bold>使用该功能需要将主页从“预设”改为“联网更新”</Bold>,稍后会提供链接地址,你可以选择自动更改(暂时不可用)或手动更改。
+            由于PCL主页限制,<Bold>使用该功能需要将主页从“预设”改为“联网更新”</Bold>,稍后会提供链接地址,你可以选择自动更改(需要 PCL 版本 2.10.6+)或手动更改。
         </TextBlock>
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,10">
             如果你遇到问题或者有改进建议可以在新闻主页的 GitHub 仓库中提出。

+ 23 - 8
Project/pages/Preference/SaveChanges.xaml

@@ -29,18 +29,33 @@
         自动保存
     </local:MyCard.Inlines>
     <StackPanel Margin="25,50,23,15">
+        ${@IF|${args.mod}|
+        <TextBlock Margin="0,0,0,4">
+            0.应用设置前需要将主页设置从预设改为联网更新。你需要点击下方按钮更改设置。
+        </local:TextBlock>
+        <local:MyButton Text="切换为联网更新" 
+                        EventType="修改设置"
+                        Height="40" Margin="20,10,20,10" EventData="UiCustomType|2"/>}
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4">
-            点击下方按钮会自动执行保存命令并重启PCL。
+            1.点击下方按钮保存你做的更改。
         </TextBlock>
-        <local:MyButton Text="技术原因暂不可用" IsEnabled="False"
-                        EventType="打开文件"
-                        Height="40" Margin="20,10,20,10" EventData="Powershell| -NoExit -Command"/>
+        <local:MyButton Text="保存更改"
+                        EventType="修改设置"
+                        Height="40" Margin="20,10,20,10">
+                        <local:MyButton.EventData>
+                            <Binding ElementName="LinkTextBox" Path="Text" StringFormat="UiCustomNet|{0}"/>
+                        </local:MyButton.EventData>
+        </local:MyButton>
+        <TextBlock TextWrapping="Wrap" Margin="0,0,0,4">
+            2.点击下方按钮返回主页。
+        </TextBlock>
+        <local:MyButton Text="返回主页"
+                        EventType="切换页面"
+                        Height="40" Margin="20,10,20,10" EventData="0|0">
+        </local:MyButton>
     </StackPanel>
 </local:MyCard>
-<local:MyCard Margin="0,0,0,15" CanSwap="False">
-    <local:MyCard.Inlines>
-        手动更改
-    </local:MyCard.Inlines>
+<local:MyCard Title="手动更改" Margin="0,0,0,15" CanSwap="False">
     <StackPanel Margin="25,40,23,15">
         <Grid  Margin="0,0,0,14">
             <Grid.ColumnDefinitions>

+ 1 - 1
Project/pages/VersionDetail.yml

@@ -1,3 +1,3 @@
 name: 版本详情
 cards:
-  - ${@IF|${@ExistCard|${ver}}|${ver}|404}|canswap=false|isswaped=false
+  - ${@IF|${@ExistCard|${args.ver}}|${args.ver}|404}|canswap=false|isswaped=false

+ 1 - 1
Project/structures/templates/Newra/VersionLatestCard.yml

@@ -5,7 +5,7 @@ filter:
   file_exten:
     - md
     - markdown
-  skin: newra
+  args.skin: newra
   latest: true
 override:
   title: 最新${version-type} - ${version-id}

+ 1 - 1
Project/structures/templates/Newra/VersionMarkdownCard.yml

@@ -5,4 +5,4 @@ filter:
   file_exten:
     - md
     - markdown
-  skin: newra
+  args.skin: newra