Skip to content

Commit

Permalink
feat: 缩放配置页面改名为缩放模式页面
Browse files Browse the repository at this point in the history
  • Loading branch information
@Blinue
Blinue committed Apr 23, 2024
1 parent 2fbc593 commit 161837c
Show file tree
Hide file tree
Showing 34 changed files with 939 additions and 915 deletions.
4 changes: 2 additions & 2 deletions src/Magpie.App/App.idl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Magpie.App {
#include "EffectParametersViewModel.idl"
#include "ScalingModeEffectItem.idl"
#include "ScalingModeItem.idl"
#include "ScalingConfigurationViewModel.idl"
#include "ScalingModesViewModel.idl"
#include "ProfileViewModel.idl"
#include "SettingsViewModel.idl"
#include "CandidateWindowItem.idl"
Expand All @@ -34,7 +34,7 @@ namespace Magpie.App {
#include "RootPage.idl"
#include "AboutPage.idl"
#include "HomePage.idl"
#include "ScalingConfigurationPage.idl"
#include "ScalingModesPage.idl"
#include "ProfilePage.idl"
#include "SettingsPage.idl"

Expand Down
2 changes: 1 addition & 1 deletion src/Magpie.App/EffectParametersViewModel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct ScalingModeFloatParameter : ScalingModeFloatParameterT<ScalingModeFloatPa
}

hstring ValueText() const noexcept {
return ScalingConfigurationPage::NumberFormatter().FormatDouble(_value);
return ScalingModesPage::NumberFormatter().FormatDouble(_value);
}

hstring Label() const noexcept {
Expand Down
24 changes: 12 additions & 12 deletions src/Magpie.App/Magpie.App.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@
<SubType>Code</SubType>
</ClInclude>
<ClInclude Include="ScalingModesService.h" />
<ClInclude Include="ScalingConfigurationViewModel.h">
<DependentUpon>ScalingConfigurationViewModel.idl</DependentUpon>
<ClInclude Include="ScalingModesViewModel.h">
<DependentUpon>ScalingModesViewModel.idl</DependentUpon>
<SubType>Code</SubType>
</ClInclude>
<ClInclude Include="ScalingMode.h" />
Expand All @@ -171,8 +171,8 @@
<DependentUpon>PageFrame.xaml</DependentUpon>
<SubType>Code</SubType>
</ClInclude>
<ClInclude Include="ScalingConfigurationPage.h">
<DependentUpon>ScalingConfigurationPage.xaml</DependentUpon>
<ClInclude Include="ScalingModesPage.h">
<DependentUpon>ScalingModesPage.xaml</DependentUpon>
<SubType>Code</SubType>
</ClInclude>
<ClInclude Include="ProfileService.h" />
Expand Down Expand Up @@ -317,8 +317,8 @@
<SubType>Code</SubType>
</ClCompile>
<ClCompile Include="ScalingModesService.cpp" />
<ClCompile Include="ScalingConfigurationViewModel.cpp">
<DependentUpon>ScalingConfigurationViewModel.idl</DependentUpon>
<ClCompile Include="ScalingModesViewModel.cpp">
<DependentUpon>ScalingModesViewModel.idl</DependentUpon>
<SubType>Code</SubType>
</ClCompile>
<ClCompile Include="ProfilePage.cpp">
Expand All @@ -338,8 +338,8 @@
<DependentUpon>PageFrame.xaml</DependentUpon>
<SubType>Code</SubType>
</ClCompile>
<ClCompile Include="ScalingConfigurationPage.cpp">
<DependentUpon>ScalingConfigurationPage.xaml</DependentUpon>
<ClCompile Include="ScalingModesPage.cpp">
<DependentUpon>ScalingModesPage.xaml</DependentUpon>
<SubType>Code</SubType>
</ClCompile>
<ClCompile Include="ProfileService.cpp" />
Expand Down Expand Up @@ -443,7 +443,7 @@
<None Include="ScalingModeItem.idl">
<SubType>Designer</SubType>
</None>
<None Include="ScalingConfigurationViewModel.idl">
<None Include="ScalingModesViewModel.idl">
<SubType>Designer</SubType>
</None>
<None Include="TextBlockHelper.idl">
Expand All @@ -455,8 +455,8 @@
<None Include="SettingsViewModel.idl">
<SubType>Designer</SubType>
</None>
<None Include="ScalingConfigurationPage.idl">
<DependentUpon>ScalingConfigurationPage.xaml</DependentUpon>
<None Include="ScalingModesPage.idl">
<DependentUpon>ScalingModesPage.xaml</DependentUpon>
<SubType>Code</SubType>
</None>
<None Include="ShortcutDialog.idl">
Expand Down Expand Up @@ -548,7 +548,7 @@
<Page Include="PageFrame.xaml">
<SubType>Designer</SubType>
</Page>
<Page Include="ScalingConfigurationPage.xaml">
<Page Include="ScalingModesPage.xaml">
<SubType>Designer</SubType>
</Page>
<Page Include="SettingsCard.Resource.xaml">
Expand Down
156 changes: 106 additions & 50 deletions src/Magpie.App/Resources.language-de.resw
View file

Large diffs are not rendered by default.

99 changes: 48 additions & 51 deletions src/Magpie.App/Resources.language-en-US.resw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,11 @@
<data name="Root_Profiles.Content" xml:space="preserve">
<value>Profiles</value>
</data>
<data name="Root_ScalingConfiguration.Content" xml:space="preserve">
<value>Scaling configuration</value>
<data name="Root_ScalingModes.Content" xml:space="preserve">
<value>Scaling modes</value>
</data>
<data name="ScalingConfiguration_PageFrame.Title" xml:space="preserve">
<value>Scaling configuration</value>
<data name="ScalingModes_PageFrame.Title" xml:space="preserve">
<value>Scaling modes</value>
</data>
<data name="Settings_Advanced.Header" xml:space="preserve">
<value>Advanced</value>
Expand Down Expand Up @@ -279,21 +279,18 @@
<data name="Settings_Launch.Header" xml:space="preserve">
<value>Launch</value>
</data>
<data name="ScalingConfiguration_General_Export.Text" xml:space="preserve">
<data name="ScalingModes_General_Export.Text" xml:space="preserve">
<value>Export</value>
</data>
<data name="ScalingConfiguration_General_Import.Text" xml:space="preserve">
<data name="ScalingModes_General_Import.Text" xml:space="preserve">
<value>Import</value>
</data>
<data name="ScalingConfiguration_General_ImportLegacy.Text" xml:space="preserve">
<data name="ScalingModes_General_ImportLegacy.Text" xml:space="preserve">
<value>Import ScaleModels.json</value>
</data>
<data name="ScalingConfiguration_General_MoreOptions.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<data name="ScalingModes_General_MoreOptions.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>More options</value>
</data>
<data name="ScalingConfiguration_ScalingModes.Header" xml:space="preserve">
<value>Scaling modes</value>
</data>
<data name="Settings_Launch_AlwaysRunAsAdmin.Description" xml:space="preserve">
<value>You need to run as administrator to use this setting</value>
</data>
Expand Down Expand Up @@ -330,115 +327,115 @@
<data name="About_OtherLinks_Repository.Text" xml:space="preserve">
<value>Github repository</value>
</data>
<data name="ScalingConfiguration_Parameters.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<data name="ScalingModes_Parameters.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Parameters</value>
</data>
<data name="ScalingConfiguration_ScalingModes_MoreOptions.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<data name="ScalingModes_MoreOptions.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>More options</value>
</data>
<data name="ScalingConfiguration_ScalingModes_MoreOptionsFlyout_Delete.Text" xml:space="preserve">
<data name="ScalingModes_MoreOptionsFlyout_Delete.Text" xml:space="preserve">
<value>Delete</value>
</data>
<data name="ScalingConfiguration_ScalingModes_MoreOptionsFlyout_MoveDown.Text" xml:space="preserve">
<data name="ScalingModes_MoreOptionsFlyout_MoveDown.Text" xml:space="preserve">
<value>Move down</value>
</data>
<data name="ScalingConfiguration_ScalingModes_MoreOptionsFlyout_MoveUp.Text" xml:space="preserve">
<data name="ScalingModes_MoreOptionsFlyout_MoveUp.Text" xml:space="preserve">
<value>Move up</value>
</data>
<data name="ScalingConfiguration_ScalingModes_Rename.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<data name="ScalingModes_Rename.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Rename</value>
</data>
<data name="ScalingConfiguration_ScalingModes_RenameFlyout_OK.Content" xml:space="preserve">
<data name="ScalingModes_RenameFlyout_OK.Content" xml:space="preserve">
<value>OK</value>
</data>
<data name="ScalingConfiguration_ScalingModes_RenameFlyout_Title.Text" xml:space="preserve">
<data name="ScalingModes_RenameFlyout_Title.Text" xml:space="preserve">
<value>Rename</value>
</data>
<data name="ScalingConfiguration_ScalingModes_AddEffect.Text" xml:space="preserve">
<data name="ScalingModes_AddEffect.Text" xml:space="preserve">
<value>Add effect</value>
</data>
<data name="ScalingConfiguration_ScalingModes_Delete.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<data name="ScalingModes_Delete.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Delete</value>
</data>
<data name="ScalingConfiguration_ScalingModes_DeleteFlyout_Delete.Text" xml:space="preserve">
<data name="ScalingModes_DeleteFlyout_Delete.Text" xml:space="preserve">
<value>Delete</value>
</data>
<data name="ScalingConfiguration_ScalingModes_DeleteFlyout_Description.Text" xml:space="preserve">
<data name="ScalingModes_DeleteFlyout_Description.Text" xml:space="preserve">
<value>It is being used by the following profiles:</value>
</data>
<data name="ScalingConfiguration_ScalingModes_DeleteFlyout_Title.Text" xml:space="preserve">
<data name="ScalingModes_DeleteFlyout_Title.Text" xml:space="preserve">
<value>Are you sure you want to delete this scaling mode?</value>
</data>
<data name="ScalingConfiguration_ScalingModes_DragNotSupported.Text" xml:space="preserve">
<data name="ScalingModes_DragNotSupported.Text" xml:space="preserve">
<value>Drag and drop is not supported when running as administrator</value>
</data>
<data name="ScalingConfiguration_ScalingModes_DragToReorder.Text" xml:space="preserve">
<data name="ScalingModes_DragToReorder.Text" xml:space="preserve">
<value>Drag to reorder</value>
</data>
<data name="ScalingConfiguration_ScalingModes_MoveDown.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<data name="ScalingModes_MoveDown.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Move down</value>
</data>
<data name="ScalingConfiguration_ScalingModes_MoveUp.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<data name="ScalingModes_MoveUp.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Move up</value>
</data>
<data name="ScalingConfiguration_ScalingModes_NewScalingMode.Text" xml:space="preserve">
<data name="ScalingModes_NewScalingMode.Text" xml:space="preserve">
<value>New scaling mode</value>
</data>
<data name="ScalingConfiguration_ScalingModes_NewScalingModeFlyout_Title.Text" xml:space="preserve">
<data name="ScalingModes_NewScalingModeFlyout_Title.Text" xml:space="preserve">
<value>New scaling mode</value>
</data>
<data name="ScalingConfiguration_ScalingModes_Scale.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<data name="ScalingModes_Scale.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Scale</value>
</data>
<data name="ScalingConfiguration_ScalingModes_NewScalingModeFlyout_CopyFrom.Text" xml:space="preserve">
<data name="ScalingModes_NewScalingModeFlyout_CopyFrom.Text" xml:space="preserve">
<value>Copy from</value>
</data>
<data name="ScalingConfiguration_ScalingModes_NewScalingModeFlyout_CopyFrom_None" xml:space="preserve">
<data name="ScalingModes_NewScalingModeFlyout_CopyFrom_None" xml:space="preserve">
<value>None</value>
</data>
<data name="ScalingConfiguration_ScalingModes_NewScalingModeFlyout_Create.Content" xml:space="preserve">
<data name="ScalingModes_NewScalingModeFlyout_Create.Content" xml:space="preserve">
<value>Create</value>
</data>
<data name="ScalingConfiguration_ScalingModes_NewScalingModeFlyout_Name.Text" xml:space="preserve">
<data name="ScalingModes_NewScalingModeFlyout_Name.Text" xml:space="preserve">
<value>Name</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_HeightFactor.Text" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_HeightFactor.Text" xml:space="preserve">
<value>Height (scaling factor)</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_HeightPixels.Text" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_HeightPixels.Text" xml:space="preserve">
<value>Height (pixels)</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_WidthFactor.Text" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_WidthFactor.Text" xml:space="preserve">
<value>Width (scaling factor)</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_WidthPixels.Text" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_WidthPixels.Text" xml:space="preserve">
<value>Width (pixels)</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type.Text" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type.Text" xml:space="preserve">
<value>Type</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type_Absolute" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type_Absolute" xml:space="preserve">
<value>Absolute</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type_Absolute_Description" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type_Absolute_Description" xml:space="preserve">
<value>Set the size after scaling</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type_Factor" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type_Factor" xml:space="preserve">
<value>Factor</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type_Factor_Description" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type_Factor_Description" xml:space="preserve">
<value>Set the scaling factor relative to the input image</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type_Fill" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type_Fill" xml:space="preserve">
<value>Fill</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type_Fill_Description" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type_Fill_Description" xml:space="preserve">
<value>Fills screen, image may be stretched</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type_Fit" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type_Fit" xml:space="preserve">
<value>Fit</value>
</data>
<data name="ScalingConfiguration_ScalingModes_ScaleFlyout_Type_Fit_Description" xml:space="preserve">
<data name="ScalingModes_ScaleFlyout_Type_Fit_Description" xml:space="preserve">
<value>Set the scaling factor after filling the screen with proportional scaling</value>
</data>
<data name="Profile_General.Header" xml:space="preserve">
Expand Down Expand Up @@ -507,7 +504,7 @@
<data name="Profile_MoreOptions_ReorderFlyout_Title.Text" xml:space="preserve">
<value>Reorder</value>
</data>
<data name="ScalingConfiguration_ParsingFailed.Title" xml:space="preserve">
<data name="ScalingModes_ParsingFailed.Title" xml:space="preserve">
<value>Parsing failed</value>
</data>
<data name="Profile_General_ScalingMode_None" xml:space="preserve">
Expand Down Expand Up @@ -715,10 +712,10 @@
<data name="Settings_General_RequireRestart_ActionButton.Content" xml:space="preserve">
<value>Restart Magpie</value>
</data>
<data name="ScalingConfiguration_ScalingModes_Description_UnknownEffect" xml:space="preserve">
<data name="ScalingModes_Description_UnknownEffect" xml:space="preserve">
<value>Unknown effect</value>
</data>
<data name="ScalingConfiguration_ScalingModes_HasUnkownEffects.Title" xml:space="preserve">
<data name="ScalingModes_HasUnkownEffects.Title" xml:space="preserve">
<value>Some effects cannot be parsed</value>
</data>
<data name="ExportDialog_Title" xml:space="preserve">
Expand Down
Loading

0 comments on commit 161837c

Please sign in to comment.