Skip to content

Commit 79c0da3

Browse files
ColoryrColoryr
committed
up 换图标
1 parent 54dbb73 commit 79c0da3

76 files changed

Lines changed: 507 additions & 239 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/ColorMC.Gui/ColorMC.Gui.csproj‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<None Remove="Resource\Icon\delete.svg" />
5757
<None Remove="Resource\Icon\down.svg" />
5858
<None Remove="Resource\Icon\edit.svg" />
59+
<None Remove="Resource\Icon\Emoticon\EmoticonFrown.svg" />
5960
<None Remove="Resource\Icon\filter.svg" />
6061
<None Remove="Resource\Icon\GameCount\svg1.svg" />
6162
<None Remove="Resource\Icon\GameCount\svg2.svg" />
@@ -80,6 +81,45 @@
8081
<None Remove="Resource\Icon\GameExport\item2.svg" />
8182
<None Remove="Resource\Icon\GameExport\item3.svg" />
8283
<None Remove="Resource\Icon\GameExport\item4.svg" />
84+
<None Remove="Resource\Icon\GroupIcon\Animation.svg" />
85+
<None Remove="Resource\Icon\GroupIcon\ArrowRightBottom.svg" />
86+
<None Remove="Resource\Icon\GroupIcon\AspectRatio.svg" />
87+
<None Remove="Resource\Icon\GroupIcon\Card.svg" />
88+
<None Remove="Resource\Icon\GroupIcon\CloudSync.svg" />
89+
<None Remove="Resource\Icon\GroupIcon\CodeBraces.svg" />
90+
<None Remove="Resource\Icon\GroupIcon\Cogs.svg" />
91+
<None Remove="Resource\Icon\GroupIcon\Console.svg" />
92+
<None Remove="Resource\Icon\GroupIcon\Controller.svg" />
93+
<None Remove="Resource\Icon\GroupIcon\DockWindow.svg" />
94+
<None Remove="Resource\Icon\GroupIcon\EmoticonConfused.svg" />
95+
<None Remove="Resource\Icon\GroupIcon\EmoticonExcited.svg" />
96+
<None Remove="Resource\Icon\GroupIcon\EmoticonHappy.svg" />
97+
<None Remove="Resource\Icon\GroupIcon\EmoticonNeutral.svg" />
98+
<None Remove="Resource\Icon\GroupIcon\EmoticonSad.svg" />
99+
<None Remove="Resource\Icon\GroupIcon\EmoticonWink.svg" />
100+
<None Remove="Resource\Icon\GroupIcon\FileEdit.svg" />
101+
<None Remove="Resource\Icon\GroupIcon\FolderEdit.svg" />
102+
<None Remove="Resource\Icon\GroupIcon\Guide.svg" />
103+
<None Remove="Resource\Icon\GroupIcon\Information.svg" />
104+
<None Remove="Resource\Icon\GroupIcon\Java.svg" />
105+
<None Remove="Resource\Icon\GroupIcon\Lan.svg" />
106+
<None Remove="Resource\Icon\GroupIcon\Launch.svg" />
107+
<None Remove="Resource\Icon\GroupIcon\LinkPlus.svg" />
108+
<None Remove="Resource\Icon\GroupIcon\Lock.svg" />
109+
<None Remove="Resource\Icon\GroupIcon\Marked.svg" />
110+
<None Remove="Resource\Icon\GroupIcon\Music.svg" />
111+
<None Remove="Resource\Icon\GroupIcon\Palette.svg" />
112+
<None Remove="Resource\Icon\GroupIcon\RocketLaunch.svg" />
113+
<None Remove="Resource\Icon\GroupIcon\ServerNetwork.svg" />
114+
<None Remove="Resource\Icon\GroupIcon\Swap.svg" />
115+
<None Remove="Resource\Icon\GroupIcon\TestTube.svg" />
116+
<None Remove="Resource\Icon\GroupIcon\Translate.svg" />
117+
<None Remove="Resource\Icon\GroupIcon\TrayArrowDown.svg" />
118+
<None Remove="Resource\Icon\GroupIcon\Tune.svg" />
119+
<None Remove="Resource\Icon\GroupIcon\Update.svg" />
120+
<None Remove="Resource\Icon\GroupIcon\View.svg" />
121+
<None Remove="Resource\Icon\GroupIcon\Wallpaper.svg" />
122+
<None Remove="Resource\Icon\GroupIcon\Web.svg" />
83123
<None Remove="Resource\Icon\guide.svg" />
84124
<None Remove="Resource\Icon\Input\button_a.svg" />
85125
<None Remove="Resource\Icon\Input\button_b.svg" />
@@ -218,6 +258,7 @@
218258
<AvaloniaResource Include="Resource\Icon\delete.svg" />
219259
<AvaloniaResource Include="Resource\Icon\down.svg" />
220260
<AvaloniaResource Include="Resource\Icon\edit.svg" />
261+
<AvaloniaResource Include="Resource\Icon\Emoticon\EmoticonFrown.svg" />
221262
<AvaloniaResource Include="Resource\Icon\filter.svg" />
222263
<AvaloniaResource Include="Resource\Icon\GameCount\svg1.svg" />
223264
<AvaloniaResource Include="Resource\Icon\GameCount\svg2.svg" />
@@ -243,6 +284,45 @@
243284
<AvaloniaResource Include="Resource\Icon\GameExport\item2.svg" />
244285
<AvaloniaResource Include="Resource\Icon\GameExport\item3.svg" />
245286
<AvaloniaResource Include="Resource\Icon\GameExport\item4.svg" />
287+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Animation.svg" />
288+
<AvaloniaResource Include="Resource\Icon\GroupIcon\ArrowRightBottom.svg" />
289+
<AvaloniaResource Include="Resource\Icon\GroupIcon\AspectRatio.svg" />
290+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Card.svg" />
291+
<AvaloniaResource Include="Resource\Icon\GroupIcon\CloudSync.svg" />
292+
<AvaloniaResource Include="Resource\Icon\GroupIcon\CodeBraces.svg" />
293+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Cogs.svg" />
294+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Console.svg" />
295+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Controller.svg" />
296+
<AvaloniaResource Include="Resource\Icon\GroupIcon\DockWindow.svg" />
297+
<AvaloniaResource Include="Resource\Icon\Emoticon\EmoticonConfused.svg" />
298+
<AvaloniaResource Include="Resource\Icon\Emoticon\EmoticonExcited.svg" />
299+
<AvaloniaResource Include="Resource\Icon\Emoticon\EmoticonHappy.svg" />
300+
<AvaloniaResource Include="Resource\Icon\Emoticon\EmoticonNeutral.svg" />
301+
<AvaloniaResource Include="Resource\Icon\Emoticon\EmoticonSad.svg" />
302+
<AvaloniaResource Include="Resource\Icon\Emoticon\EmoticonWink.svg" />
303+
<AvaloniaResource Include="Resource\Icon\GroupIcon\FileEdit.svg" />
304+
<AvaloniaResource Include="Resource\Icon\GroupIcon\FolderEdit.svg" />
305+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Guide.svg" />
306+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Information.svg" />
307+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Java.svg" />
308+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Lan.svg" />
309+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Launch.svg" />
310+
<AvaloniaResource Include="Resource\Icon\GroupIcon\LinkPlus.svg" />
311+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Lock.svg" />
312+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Marked.svg" />
313+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Music.svg" />
314+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Palette.svg" />
315+
<AvaloniaResource Include="Resource\Icon\GroupIcon\RocketLaunch.svg" />
316+
<AvaloniaResource Include="Resource\Icon\GroupIcon\ServerNetwork.svg" />
317+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Swap.svg" />
318+
<AvaloniaResource Include="Resource\Icon\GroupIcon\TestTube.svg" />
319+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Translate.svg" />
320+
<AvaloniaResource Include="Resource\Icon\GroupIcon\TrayArrowDown.svg" />
321+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Tune.svg" />
322+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Update.svg" />
323+
<AvaloniaResource Include="Resource\Icon\GroupIcon\View.svg" />
324+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Wallpaper.svg" />
325+
<AvaloniaResource Include="Resource\Icon\GroupIcon\Web.svg" />
246326
<AvaloniaResource Include="Resource\Icon\guide.svg" />
247327
<AvaloniaResource Include="Resource\Icon\Input\button_a.svg" />
248328
<AvaloniaResource Include="Resource\Icon\Input\button_b.svg" />

‎src/ColorMC.Gui/ColorMCGui.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static void Main(string[] args)
121121
GuiConfigUtils.Init();
122122

123123
//以管理员方式启动
124-
if (GuiConfigUtils.Config.ServerCustom.AdminLaunch && !ProcessUtils.IsRunAsAdmin())
124+
if (GuiConfigUtils.Config.LauncherFunction.AdminLaunch && !ProcessUtils.IsRunAsAdmin())
125125
{
126126
try
127127
{

‎src/ColorMC.Gui/Manager/ImageManager.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,12 @@ public static WindowIcon WindowIcon
9696
/// 最大化最小化图标
9797
/// </summary>
9898
public static readonly string[] MaxIcon = ["/Resource/Icon/Window/Maximize.svg", "/Resource/Icon/Window/Restore.svg"];
99-
99+
/// <summary>
100+
/// 表情图标
101+
/// </summary>
102+
public static readonly string[] EmoticonIcon = ["/Resource/Icon/Emoticon/EmoticonHappy.svg", "/Resource/Icon/Emoticon/EmoticonConfused.svg",
103+
"/Resource/Icon/Emoticon/EmoticonExcited.svg", "/Resource/Icon/Emoticon/EmoticonSad.svg", "/Resource/Icon/Emoticon/EmoticonWink.svg",
104+
"/Resource/Icon/Emoticon/EmoticonFrown.svg"];
100105
/// <summary>
101106
/// 缓存路径
102107
/// </summary>

‎src/ColorMC.Gui/Objs/Config/BuildConfigObj.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ public record ServerOptConfigObj
4949
public bool JoinServer { get; set; }
5050
public string MotdColor { get; set; }
5151
public string MotdBackColor { get; set; }
52-
public bool AdminLaunch { get; set; }
53-
public bool GameAdminLaunch { get; set; }
5452
}
5553

5654
public record ServerLockConfigObj
@@ -81,4 +79,12 @@ public record ServerMusicConfigObj
8179
public bool SlowVolume { get; set; }
8280
public bool MusicLoop { get; set; }
8381
public bool RunPause { get; set; }
82+
}
83+
84+
public record LauncherFunctionConfigObj
85+
{
86+
public bool FastLaunch { get; set; }
87+
public bool FastModrinth { get; set; }
88+
public bool AdminLaunch { get; set; }
89+
public bool GameAdminLaunch { get; set; }
8490
}

‎src/ColorMC.Gui/Objs/Config/GuiConfigObj.cs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,6 @@ public record ServerCustomSetting
156156
/// 登录模型实例
157157
/// </summary>
158158
public List<LockLoginSetting> LockLogins { get; set; }
159-
/// <summary>
160-
/// 管理员方式启动
161-
/// </summary>
162-
public bool AdminLaunch { get; set; }
163-
/// <summary>
164-
/// 游戏管理员方式启动
165-
/// </summary>
166-
public bool GameAdminLaunch { get; set; }
167159

168160
/// <summary>
169161
/// 是否使用自定义图标
@@ -293,6 +285,10 @@ public record CardSetting
293285
/// 上次启动卡片
294286
/// </summary>
295287
public bool Last { get; set; }
288+
/// <summary>
289+
/// 幸运方块
290+
/// </summary>
291+
public bool Block { get; set; }
296292
}
297293

298294
public record LauncherSetting
@@ -305,6 +301,14 @@ public record LauncherSetting
305301
/// 覆盖modrinth
306302
/// </summary>
307303
public bool FastModrinth { get; set; }
304+
/// <summary>
305+
/// 管理员方式启动
306+
/// </summary>
307+
public bool AdminLaunch { get; set; }
308+
/// <summary>
309+
/// 游戏管理员方式启动
310+
/// </summary>
311+
public bool GameAdminLaunch { get; set; }
308312
}
309313

310314
/// <summary>

‎src/ColorMC.Gui/Resource/Icon/Emoticon/EmoticonConfused.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/ColorMC.Gui/Resource/Icon/Emoticon/EmoticonExcited.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/ColorMC.Gui/Resource/Icon/Emoticon/EmoticonFrown.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/ColorMC.Gui/Resource/Icon/Emoticon/EmoticonHappy.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/ColorMC.Gui/Resource/Icon/Emoticon/EmoticonNeutral.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)