Skip to content

Commit

Permalink
change: app name to pack name
Browse files Browse the repository at this point in the history
  • Loading branch information
emako committed Sep 19, 2023
1 parent 894a690 commit 9b0f616
Show file tree
Hide file tree
Showing 82 changed files with 242 additions and 41 deletions.
4 changes: 3 additions & 1 deletion src/Common/Fischless.Globalization/Assets/Langs/en.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<s:String x:Key="__LeftParenthesis__">(</s:String>
<s:String x:Key="__RightParenthesis__">)</s:String>
<s:String x:Key="__Colon__" xml:space="preserve">: </s:String>
<s:String x:Key="__Yajirushi__">-></s:String>
<s:String x:Key="Loading">Loading</s:String>
<s:String x:Key="MessageBoxCaptionInfo">Info</s:String>
<s:String x:Key="MessageBoxCaptionWarn">Warn</s:String>
Expand All @@ -24,5 +23,8 @@
<s:String x:Key="Home">Home</s:String>
<s:String x:Key="GlobalSettings">Global Settings</s:String>
<s:String x:Key="CopyVersionInfo">Copy version information</s:String>
<s:String x:Key="Contact">Account</s:String>
<s:String x:Key="ReShade">ReShade</s:String>
<s:String x:Key="Fischless">Fischless</s:String>

</ResourceDictionary>
4 changes: 3 additions & 1 deletion src/Common/Fischless.Globalization/Assets/Langs/ja.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<s:String x:Key="__LeftParenthesis__">「</s:String>
<s:String x:Key="__RightParenthesis__">」</s:String>
<s:String x:Key="__Colon__">:</s:String>
<s:String x:Key="__Yajirushi__">⇒</s:String>
<s:String x:Key="Loading">ローディング</s:String>
<s:String x:Key="MessageBoxCaptionInfo">ヒント</s:String>
<s:String x:Key="MessageBoxCaptionWarn">警告</s:String>
Expand All @@ -24,5 +23,8 @@
<s:String x:Key="Home">ホームページ</s:String>
<s:String x:Key="GlobalSettings">グローバル設定</s:String>
<s:String x:Key="CopyVersionInfo">バージョン情報をコピー</s:String>
<s:String x:Key="Contact">アカウント</s:String>
<s:String x:Key="ReShade">幽夜浄土</s:String>
<s:String x:Key="Fischless">極夜の真夢</s:String>

</ResourceDictionary>
4 changes: 3 additions & 1 deletion src/Common/Fischless.Globalization/Assets/Langs/zh.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<s:String x:Key="__LeftParenthesis__">(</s:String>
<s:String x:Key="__RightParenthesis__">)</s:String>
<s:String x:Key="__Colon__">:</s:String>
<s:String x:Key="__Yajirushi__">⇒</s:String>
<s:String x:Key="Loading">载入中</s:String>
<s:String x:Key="MessageBoxCaptionInfo">提示</s:String>
<s:String x:Key="MessageBoxCaptionWarn">警告</s:String>
Expand All @@ -24,5 +23,8 @@
<s:String x:Key="Home">主页</s:String>
<s:String x:Key="GlobalSettings">全局设定</s:String>
<s:String x:Key="CopyVersionInfo">复制版本信息</s:String>
<s:String x:Key="Contact">角色账号</s:String>
<s:String x:Key="ReShade">幽夜净土</s:String>
<s:String x:Key="Fischless">极夜真梦</s:String>

</ResourceDictionary>
18 changes: 9 additions & 9 deletions src/Common/Fischless.Mapper/Fischless.Mapper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
<LangVersion>11.0</LangVersion>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="AutoMapper" Version="10.1.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="AutoMapper" Version="12.0.1" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>NETSTANDARD2_0</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<DefineConstants>NETSTANDARD2_1</DefineConstants>
</PropertyGroup>


<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="AutoMapper" Version="10.1.1" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>NETSTANDARD2_0</DefineConstants>
</PropertyGroup>

</Project>
2 changes: 2 additions & 0 deletions src/Desktop/Fischless.WindowCapture/WindowCaptureFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
public enum CaptureMode
{
BitBlt,
StretchBlt,
WindowsGraphicsCapture,
}

Expand All @@ -26,6 +27,7 @@ public static IWindowCapture Create(CaptureMode mode)
return mode switch
{
CaptureMode.BitBlt => new BitBlt.BitBltCapture(),
CaptureMode.StretchBlt => new StretchBlt.StretchBltCapture(),
CaptureMode.WindowsGraphicsCapture => new GraphicsCapture.GraphicsCapture(),
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
};
Expand Down
2 changes: 1 addition & 1 deletion src/Desktop/Fischless/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ResourceDictionary.MergedDictionaries>
<tb:TaskbarIcon x:Key="PART_Taskbar"
DoubleClickCommand="{Binding ShowOrHideCommand}"
IconSource="/Assets/Icons/SummerTime_Ball.ico"
IconSource="/Assets/Icons/i2Q2r-4cr2K2kT3cSkf-ke.ico"
ToolTipText="Fischless">
<tb:TaskbarIcon.DataContext>
<vm:NotifyIconViewModel />
Expand Down
5 changes: 3 additions & 2 deletions src/Desktop/Fischless/AppConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ namespace Fischless;

internal static class AppConfig
{
public static string? AppName => "Fischless";
public static string? AutoStartCommand = "-autostart";
public static string? AppName => Mui(PackName) ?? PackName;
public static string? PackName => "Fischless";
public static string? AutoStartCommand => "-autostart";
public static bool Preview => true;
public static string? AppVersion { get; private set; }
public static string LogFile { get; internal set; }
Expand Down
Binary file modified src/Desktop/Fischless/Assets/Icons/SummerTime_Ball.ico
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
for f in files:
fname, ext = os.path.splitext(f)
if ext == '.png':
print('public const string ' + fname + ' = "ms-appx:///Assets/Images/LocalAvatars/' + fname + ext + '";')
print('public const string ' + fname + ' = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/' + fname + ext + '";')
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static IApplicationBuilder UseLogger(this IApplicationBuilder app)
Directory.CreateDirectory(logFolder);
AppConfig.LogFile = Path.Combine(logFolder, $"Fischless_{DateTime.Now:yyMMdd_HHmmss}.log");
Log.Logger = new LoggerConfiguration()
.WriteTo.File(path: AppConfig.LogFile, outputTemplate: "{Timestamp:HH:mm:ss.fff}|{Level:u4}|{SourceContext}|{Message}{NewLine}{Exception}{NewLine}")
.WriteTo.File(path: AppConfig.LogFile, outputTemplate: "{Timestamp:HH:mm:ss.fff}|{Level:u4}|{SourceContext}|{Message}{NewLine}{Exception}")
.Enrich.FromLogContext()
.CreateLogger();
return app;
Expand Down
10 changes: 5 additions & 5 deletions src/Desktop/Fischless/Fischless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<LangVersion>11.0</LangVersion>
<StartupObject>Fischless.Program</StartupObject>
<Platforms>x64</Platforms>
<AssemblyVersion>0.0.1</AssemblyVersion>
<FileVersion>0.0.1</FileVersion>
<Version>$(VersionPrefix)0.0.1</Version>
<ApplicationIcon>Assets\Icons\SummerTime_Ball.ico</ApplicationIcon>
<AssemblyVersion>0.0.2</AssemblyVersion>
<FileVersion>0.0.2</FileVersion>
<Version>$(VersionPrefix)0.0.2</Version>
<ApplicationIcon>Assets\Icons\i2Q2r-4cr2K2kT3cSkf-ke.ico</ApplicationIcon>
</PropertyGroup>

<ItemGroup>
Expand All @@ -36,7 +36,7 @@
<PackageReference Include="IndexRange" Version="1.0.3" />
<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
<PackageReference Include="gong-wpf-dragdrop" Version="3.2.1" />
<PackageReference Include="Lnk" Version="1.3.4" />
<PackageReference Include="Lnk" Version="1.3.6" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Desktop/Fischless/Helpers/SpecialPathHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internal static class SpecialPathHelper

public static string GetFolder(string optionFolder = null!)
{
return Path.Combine(_localApplicationData, optionFolder ?? AppConfig.AppName);
return Path.Combine(_localApplicationData, optionFolder ?? AppConfig.PackName);
}

public static string GetPath(string? baseName = null)
Expand All @@ -26,6 +26,6 @@ public static string GetPath(string? baseName = null)

public static string GetTempPath(string baseName)
{
return Path.Combine(TempPath + AppConfig.AppName, baseName);
return Path.Combine(TempPath + AppConfig.PackName, baseName);
}
}
Loading

0 comments on commit 9b0f616

Please sign in to comment.