Skip to content

Manic EMU is an all-in-one retro game emulator for iOS. It packs powerful features while keeping a clean, sleek UI and delivering buttery-smooth gameplay.

Swift

Add TriggerPro and others improvements

Daiunocdb960d99ff9
diff --git a/Cores/DeltaCore/DeltaCore/Model/Inputs/StandardGameControllerInput.swift b/Cores/DeltaCore/DeltaCore/Model/Inputs/StandardGameControllerInput.swift
index 0c6d9703..14dbdb9d 100644
--- a/Cores/DeltaCore/DeltaCore/Model/Inputs/StandardGameControllerInput.swift
+++ b/Cores/DeltaCore/DeltaCore/Model/Inputs/StandardGameControllerInput.swift
@@ -43,8 +43,15 @@ public enum StandardGameControllerInput: String, Codable
case blowing
case palette
case swapDisk
- case toggleAnalog
case retroAchievements
+ case airPlayScaling
+ case airPlayLayout
+ case toggleAnalog
+ case gameplayManuals
+ case triggerPro
+ case fastForward2x
+ case fastForward3x
+ case fastForward4x
case up
case down
diff --git a/Cores/DeltaCore/DeltaCore/UI/Controller/ButtonsDynamicEffectView.swift b/Cores/DeltaCore/DeltaCore/UI/Controller/ButtonsDynamicEffectView.swift
index 60b1ef25..9fc606a0 100644
--- a/Cores/DeltaCore/DeltaCore/UI/Controller/ButtonsDynamicEffectView.swift
+++ b/Cores/DeltaCore/DeltaCore/UI/Controller/ButtonsDynamicEffectView.swift
@@ -197,6 +197,17 @@ public class DynamicEffectView: UIView {
init(item: ControllerSkin.Item) {
self.item = item
super.init(frame: CGRect.zero)
+
+ isAccessibilityElement = true
+ switch item.kind {
+ case .button:
+ accessibilityLabel = "button" + item.inputs.allInputs.reduce("", { $0 + " " + $1.stringValue })
+ case .dPad:
+ accessibilityLabel = "dPad" + item.inputs.allInputs.reduce("", { $0 + " " + $1.stringValue })
+ default:
+ break
+ }
+ accessibilityTraits = .button
}
required init?(coder aDecoder: NSCoder) {
diff --git a/Cores/DeltaCore/DeltaCore/UI/Controller/ControllerView.swift b/Cores/DeltaCore/DeltaCore/UI/Controller/ControllerView.swift
index 1eee23ad..73f733ab 100644
--- a/Cores/DeltaCore/DeltaCore/UI/Controller/ControllerView.swift
+++ b/Cores/DeltaCore/DeltaCore/UI/Controller/ControllerView.swift
@@ -844,17 +844,17 @@ extension ControllerView: ControllerReceiverProtocol
/// UIKeyInput
// Becoming first responder doesn't steal keyboard focus from other apps in split view unless the first responder conforms to UIKeyInput.
// So, we conform ControllerView to UIKeyInput and provide stub method implementations.
-extension ControllerView: UIKeyInput
-{
- public var hasText: Bool {
- return false
- }
-
- public func insertText(_ text: String)
- {
- }
-
- public func deleteBackward()
- {
- }
-}
+//extension ControllerView: UIKeyInput
+//{
+// public var hasText: Bool {
+// return false
+// }
+//
+// public func insertText(_ text: String)
+// {
+// }
+//
+// public func deleteBackward()
+// {
+// }
+//}
diff --git a/Cores/Libretro/runloop.c b/Cores/Libretro/runloop.c
index 4a9ffa8f..cfca5836 100644
--- a/Cores/Libretro/runloop.c
+++ b/Cores/Libretro/runloop.c
@@ -4432,13 +4432,24 @@ void runloop_set_frame_limit(
(av_info->timing.fps * fastforward_ratio));
}
+/* 外部定义的自定义快进速率,来自 ui_cocoatouch.m */
+extern float get_custom_fastforward_ratio(void);
+
float runloop_get_fastforward_ratio(
settings_t *settings,
struct retro_fastforwarding_override *fastmotion_override)
{
+ /* 优先级1: 检查自定义快进速率(来自外部API调用) */
+ float custom_ratio = get_custom_fastforward_ratio();
+ if (custom_ratio > 0.0f)
+ return custom_ratio;
+
+ /* 优先级2: 检查核心的 fastmotion_override */
if ( fastmotion_override->fastforward
&& (fastmotion_override->ratio >= 0.0f))
return fastmotion_override->ratio;
+
+ /* 优先级3: 使用设置中的默认快进速率 */
return settings->floats.fastforward_ratio;
}
diff --git a/Cores/Libretro/ui/drivers/ui_cocoatouch.m b/Cores/Libretro/ui/drivers/ui_cocoatouch.m
index be56ffb7..784042b0 100644
--- a/Cores/Libretro/ui/drivers/ui_cocoatouch.m
+++ b/Cores/Libretro/ui/drivers/ui_cocoatouch.m
@@ -1044,11 +1044,24 @@ static BOOL RespectSilentMode = false;
- (void)resume {
if (!LibretroInitial) { return; }
+
+ // 保存当前的快进状态
+ float currentFastforwardRate = g_custom_fastforward_ratio;
+ BOOL isFastforwarding = (g_custom_fastforward_ratio > 0.0f);
+
rarch_start_draw_observer();
command_event(CMD_EVENT_RESUME, NULL);
if (needToLoadStatePath) {
[self loadGame:self.gamePath corePath:self.corePath completion:nil];
+
+ // 恢复快进状态(如果之前处于快进模式)
+ if (isFastforwarding) {
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ [self fastForward:currentFastforwardRate];
+ });
+ }
+
if (needToLoadStateDelay > 0) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(needToLoadStateDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self loadState:needToLoadStatePath];
@@ -1058,6 +1071,11 @@ static BOOL RespectSilentMode = false;
[self loadState:needToLoadStatePath];
needToLoadStatePath = nil;
}
+ } else if (isFastforwarding) {
+ // 如果没有需要加载的存档,但是之前处于快进状态,恢复快进
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ [self fastForward:currentFastforwardRate];
+ });
}
}
@@ -1420,57 +1438,115 @@ extern void manic_input_analog_event(unsigned port, unsigned stick_id, float x_v
return content_load_state(path.UTF8String, false, false);
}
+// 存储自定义的快进速率,避免被配置重载覆盖
+static float g_custom_fastforward_ratio = 0.0f;
+
- (void)fastForward:(float)rate {
settings_t *settings = config_get_ptr();
if (!settings) {
return;
}
+
runloop_state_t *runloop_st = runloop_state_get_ptr();
input_driver_state_t *input_st = input_state_get_ptr();
audio_driver_state_t *audio_st = audio_state_get_ptr();
- if (rate <= 1) {
- //恢复速度
- settings->floats.fastforward_ratio = 1.0f;
- // 1. 清除快进标志
+ video_driver_state_t *video_st = video_state_get_ptr();
+
+ if (!runloop_st || !input_st || !audio_st || !video_st) {
+ return;
+ }
+
+ bool audio_fastforward_mute = settings->bools.audio_fastforward_mute;
+ bool frame_time_counter_reset_after_ffwd = settings->bools.frame_time_counter_reset_after_fastforwarding;
+
+ if (rate <= 1.0f) {
+ // ===== 恢复正常速度 =====
+
+ // 1. 恢复 fastforward ratio 到用户配置或 1.0
+ g_custom_fastforward_ratio = 0.0f;
+
+ // 2. 清除快进标志
runloop_st->flags &= ~RUNLOOP_FLAG_FASTMOTION;
- // 2. 清除非阻塞输入
+
+ // 3. 清除非阻塞输入标志
input_st->flags &= ~INP_FLAG_NONBLOCKING;
- // 3. 更新帧率限制
+
+ // 4. 设置 fastforward_after_frames,用于平滑过渡
+ runloop_st->fastforward_after_frames = 1;
+
+ // 5. 恢复音频状态(取消静音)
+ if (audio_fastforward_mute) {
+ audio_st->flags &= ~AUDIO_FLAG_MUTED;
+ }
+
+ // 6. 使用 driver_set_nonblock_state() 统一设置驱动非阻塞状态
+ // 这个函数会自动处理音频和视频驱动的非阻塞状态,以及 chunk_size
+ driver_set_nonblock_state();
+
+ // 7. 重置视频帧时间计数器(如果需要)
+ if (frame_time_counter_reset_after_ffwd && video_st) {
+ video_st->frame_time_count = 0;
+ }
+
+ // 8. 更新帧率限制为正常速度
command_event(CMD_EVENT_SET_FRAME_LIMIT, NULL);
- // 4. 恢复音频缓冲区大小
- audio_st->chunk_size = AUDIO_CHUNK_SIZE_BLOCKING;
- // 5. 恢复音频阻塞模式
- if (audio_st->current_audio && audio_st->context_audio_data)
- audio_st->current_audio->set_nonblock_state(audio_st->context_audio_data, false);
+
} else {
- //快进
- // 1. 设置快进比例
- settings->floats.fastforward_ratio = rate;
+ // ===== 启用快进 =====
+
+ // 1. 保存自定义快进速率
+ g_custom_fastforward_ratio = rate;
+
// 2. 设置快进标志
runloop_st->flags |= RUNLOOP_FLAG_FASTMOTION;
- // 3. 设置非阻塞输入
+
+ // 3. 设置非阻塞输入标志
input_st->flags |= INP_FLAG_NONBLOCKING;
- // 4. 更新帧率限制
+
+ // 4. 根据设置决定是否静音音频
+ if (audio_fastforward_mute) {
+ audio_st->flags |= AUDIO_FLAG_MUTED;
+ } else {
+ audio_st->flags &= ~AUDIO_FLAG_MUTED;
+ }
+
+ // 5. 使用 driver_set_nonblock_state() 统一设置驱动非阻塞状态
+ driver_set_nonblock_state();
+
+ // 6. 更新帧率限制为快进速率
command_event(CMD_EVENT_SET_FRAME_LIMIT, NULL);
- // 5. 设置音频缓冲区大小
- audio_st->chunk_size = AUDIO_CHUNK_SIZE_NONBLOCKING;
- // 6. 设置音频非阻塞模式
- if (audio_st->current_audio && audio_st->context_audio_data)
- audio_st->current_audio->set_nonblock_state(audio_st->context_audio_data, true);
}
}
+// 获取当前应该使用的快进速率
+// 这个函数会在 runloop 中被调用,用于获取实际的快进倍率
+float get_custom_fastforward_ratio(void) {
+ return g_custom_fastforward_ratio;
+}
+
- (void)reload {
[self reloadByKeepState: NO];
}
static NSString *_Nullable needToLoadStatePath = nil;
- (void)reloadByKeepState:(BOOL)keepState {
+ // 保存当前的快进状态
+ float currentFastforwardRate = g_custom_fastforward_ratio;
+ BOOL isFastforwarding = (g_custom_fastforward_ratio > 0.0f);
+
if (keepState) {
[self saveState:^(NSString * _Nullable path) {
if (iterate_observer) {
//游戏运行状态 直接加载存档
[self loadGame:self.gamePath corePath:self.corePath completion:nil];
+
+ // 恢复快进状态(如果之前处于快进模式)
+ if (isFastforwarding) {
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ [self fastForward:currentFastforwardRate];
+ });
+ }
+
if (needToLoadStateDelay > 0) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(needToLoadStateDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self loadState:path];
@@ -1485,6 +1561,13 @@ static NSString *_Nullable needToLoadStatePath = nil;
}];
} else {
[self loadGame:self.gamePath corePath:self.corePath completion:nil];
+
+ // 恢复快进状态(如果之前处于快进模式)
+ if (isFastforwarding) {
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ [self fastForward:currentFastforwardRate];
+ });
+ }
}
}
diff --git a/ManicEmu/Libretro/LibretroConfig.xcconfig b/ManicEmu/Libretro/LibretroConfig.xcconfig
index a8959cff..374f354f 100644
--- a/ManicEmu/Libretro/LibretroConfig.xcconfig
+++ b/ManicEmu/Libretro/LibretroConfig.xcconfig
@@ -118,7 +118,7 @@ OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DHAVE_ONLINE_UPDATER
OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DHAVE_OPENGLES
OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DHAVE_OPENGLES3
OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DIOS
-OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DPACKAGE_VERSION=\"1.7.2\"
+OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DPACKAGE_VERSION=\"1.7.3\"
OTHER_CFLAGS_IOS_TVOS_SHARE = $(inherited) -DRARCH_MOBILE
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) $(OTHER_CFLAGS_IOS_TVOS_SHARE)
diff --git a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
index 4ecd34d6..3c84e6a1 100644
--- a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
+++ b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
@@ -104,6 +104,7 @@
574ABEBC2E609FE60045F76E /* GBA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 574ABEBB2E609FE30045F76E /* GBA.swift */; };
574ABEC42E60A3C30045F76E /* vbam.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 574ABE952E6020880045F76E /* vbam.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
574ABEC52E60A3C90045F76E /* mgba.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 574ABE942E6020880045F76E /* mgba.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ 57526B7E2EADEED0003F91BD /* FDS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57526B7D2EADEECD003F91BD /* FDS.swift */; };
5754D8882E274AA5001EA5ED /* OnlinePlaySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5754D8872E274A9D001EA5ED /* OnlinePlaySettingViewController.swift */; };
5754D88B2E274AC7001EA5ED /* OnlinePlaySettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5754D88A2E274AB9001EA5ED /* OnlinePlaySettingView.swift */; };
5754D88F2E274B27001EA5ED /* DSOnlinePlaySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5754D88E2E274B1A001EA5ED /* DSOnlinePlaySettingCell.swift */; };
@@ -680,6 +681,22 @@
57D029192E6C9C5200BF1F9D /* CheevosProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D029182E6C9C4000BF1F9D /* CheevosProgressView.swift */; };
57D0BC0A2E1AD2BE008C3049 /* N64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D0BC092E1AD2BB008C3049 /* N64.swift */; };
57D0BC0F2E1AD35D008C3049 /* mupen64plus.next.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57D0BC0D2E1AD31A008C3049 /* mupen64plus.next.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ 57D7CF362EA5DBA800F41540 /* Trigger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF332EA5DB9C00F41540 /* Trigger.swift */; };
+ 57D7CF3F2EA7355900F41540 /* TriggerProListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF3E2EA7354500F41540 /* TriggerProListViewController.swift */; };
+ 57D7CF462EA7357900F41540 /* TriggerProListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF432EA7357200F41540 /* TriggerProListView.swift */; };
+ 57D7CF4B2EA736C900F41540 /* TriggerProListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF492EA736BB00F41540 /* TriggerProListCell.swift */; };
+ 57D7CF592EA78B2B00F41540 /* TriggerProPreviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF572EA78B1700F41540 /* TriggerProPreviewController.swift */; };
+ 57D7CF5E2EA792E100F41540 /* AddTriggerButtonController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF5C2EA792C500F41540 /* AddTriggerButtonController.swift */; };
+ 57D7CF622EA792FB00F41540 /* AddTriggerButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF612EA792F900F41540 /* AddTriggerButtonView.swift */; };
+ 57D7CF732EA882E000F41540 /* AddTriggerButtonStyleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF712EA882CA00F41540 /* AddTriggerButtonStyleCell.swift */; };
+ 57D7CF792EA882ED00F41540 /* AddTriggerMappingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF762EA882E400F41540 /* AddTriggerMappingCell.swift */; };
+ 57D7CF7F2EA882F900F41540 /* AddTriggerActionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF7A2EA882F000F41540 /* AddTriggerActionCell.swift */; };
+ 57D7CF862EA88AC100F41540 /* TriggerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF842EA88ABA00F41540 /* TriggerButton.swift */; };
+ 57D7CF8B2EA8C8A000F41540 /* TriggerProMappingListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF8A2EA8C8A000F41540 /* TriggerProMappingListView.swift */; };
+ 57D7CF902EA8DB7800F41540 /* TriggerProActionSettingViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF8E2EA8DB6200F41540 /* TriggerProActionSettingViews.swift */; };
+ 57D7CF952EA8E7EE00F41540 /* TriggerProView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF932EA8E7E100F41540 /* TriggerProView.swift */; };
+ 57D7CF9D2EA9D23500F41540 /* TriggerProListBlankSlateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CF9B2EA9D22900F41540 /* TriggerProListBlankSlateView.swift */; };
+ 57D7CFC22EAA1B5E00F41540 /* ShadowLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 57D7CFC12EAA1B5E00F41540 /* ShadowLabel.m */; };
57DA89132D82B0C20074052A /* SmartCodable in Frameworks */ = {isa = PBXBuildFile; productRef = 57DA89122D82B0C20074052A /* SmartCodable */; };
57DA89322D8328510074052A /* CKAccountStatusExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57DA89312D8328420074052A /* CKAccountStatusExtensions.swift */; };
57DCE7A12E0C434C0079E3AA /* mednafen.saturn.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57DCE79D2E0C43310079E3AA /* mednafen.saturn.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -965,6 +982,7 @@
574ABE952E6020880045F76E /* vbam.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vbam.libretro.framework; path = ../Cores/vbam.libretro.framework; sourceTree = SOURCE_ROOT; };
574ABE982E6021520045F76E /* GBC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GBC.swift; sourceTree = "<group>"; };
574ABEBB2E609FE30045F76E /* GBA.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GBA.swift; sourceTree = "<group>"; };
+ 57526B7D2EADEECD003F91BD /* FDS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FDS.swift; sourceTree = "<group>"; };
5754D8872E274A9D001EA5ED /* OnlinePlaySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnlinePlaySettingViewController.swift; sourceTree = "<group>"; };
5754D88A2E274AB9001EA5ED /* OnlinePlaySettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnlinePlaySettingView.swift; sourceTree = "<group>"; };
5754D88E2E274B1A001EA5ED /* DSOnlinePlaySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DSOnlinePlaySettingCell.swift; sourceTree = "<group>"; };
@@ -1704,6 +1722,23 @@
57D029182E6C9C4000BF1F9D /* CheevosProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheevosProgressView.swift; sourceTree = "<group>"; };
57D0BC092E1AD2BB008C3049 /* N64.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = N64.swift; sourceTree = "<group>"; };
57D0BC0D2E1AD31A008C3049 /* mupen64plus.next.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mupen64plus.next.libretro.framework; path = ../Cores/mupen64plus.next.libretro.framework; sourceTree = SOURCE_ROOT; };
+ 57D7CF332EA5DB9C00F41540 /* Trigger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Trigger.swift; sourceTree = "<group>"; };
+ 57D7CF3E2EA7354500F41540 /* TriggerProListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerProListViewController.swift; sourceTree = "<group>"; };
+ 57D7CF432EA7357200F41540 /* TriggerProListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerProListView.swift; sourceTree = "<group>"; };
+ 57D7CF492EA736BB00F41540 /* TriggerProListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerProListCell.swift; sourceTree = "<group>"; };
+ 57D7CF572EA78B1700F41540 /* TriggerProPreviewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerProPreviewController.swift; sourceTree = "<group>"; };
+ 57D7CF5C2EA792C500F41540 /* AddTriggerButtonController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTriggerButtonController.swift; sourceTree = "<group>"; };
+ 57D7CF612EA792F900F41540 /* AddTriggerButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTriggerButtonView.swift; sourceTree = "<group>"; };
+ 57D7CF712EA882CA00F41540 /* AddTriggerButtonStyleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTriggerButtonStyleCell.swift; sourceTree = "<group>"; };
+ 57D7CF762EA882E400F41540 /* AddTriggerMappingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTriggerMappingCell.swift; sourceTree = "<group>"; };
+ 57D7CF7A2EA882F000F41540 /* AddTriggerActionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTriggerActionCell.swift; sourceTree = "<group>"; };
+ 57D7CF842EA88ABA00F41540 /* TriggerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerButton.swift; sourceTree = "<group>"; };
+ 57D7CF8A2EA8C8A000F41540 /* TriggerProMappingListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerProMappingListView.swift; sourceTree = "<group>"; };
+ 57D7CF8E2EA8DB6200F41540 /* TriggerProActionSettingViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerProActionSettingViews.swift; sourceTree = "<group>"; };
+ 57D7CF932EA8E7E100F41540 /* TriggerProView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerProView.swift; sourceTree = "<group>"; };
+ 57D7CF9B2EA9D22900F41540 /* TriggerProListBlankSlateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerProListBlankSlateView.swift; sourceTree = "<group>"; };
+ 57D7CFC02EAA1B5E00F41540 /* ShadowLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShadowLabel.h; sourceTree = "<group>"; };
+ 57D7CFC12EAA1B5E00F41540 /* ShadowLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShadowLabel.m; sourceTree = "<group>"; };
57DA89312D8328420074052A /* CKAccountStatusExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CKAccountStatusExtensions.swift; sourceTree = "<group>"; };
57DCE79D2E0C43310079E3AA /* mednafen.saturn.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mednafen.saturn.libretro.framework; path = ../Cores/mednafen.saturn.libretro.framework; sourceTree = SOURCE_ROOT; };
57DCE7D62E0D2EEB0079E3AA /* ThreeDSAdvancedSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreeDSAdvancedSettingViewController.swift; sourceTree = "<group>"; };
@@ -3855,6 +3890,52 @@
path = Models;
sourceTree = "<group>";
};
+ 57D7CF292EA5DB7B00F41540 /* TriggerPro */ = {
+ isa = PBXGroup;
+ children = (
+ 57D7CF422EA7356D00F41540 /* Views */,
+ 57D7CF3B2EA7352A00F41540 /* ViewControllers */,
+ 57D7CF312EA5DB9400F41540 /* Models */,
+ );
+ path = TriggerPro;
+ sourceTree = "<group>";
+ };
+ 57D7CF312EA5DB9400F41540 /* Models */ = {
+ isa = PBXGroup;
+ children = (
+ 57D7CF332EA5DB9C00F41540 /* Trigger.swift */,
+ );
+ path = Models;
+ sourceTree = "<group>";
+ };
+ 57D7CF3B2EA7352A00F41540 /* ViewControllers */ = {
+ isa = PBXGroup;
+ children = (
+ 57D7CF5C2EA792C500F41540 /* AddTriggerButtonController.swift */,
+ 57D7CF572EA78B1700F41540 /* TriggerProPreviewController.swift */,
+ 57D7CF3E2EA7354500F41540 /* TriggerProListViewController.swift */,
+ );
+ path = ViewControllers;
+ sourceTree = "<group>";
+ };
+ 57D7CF422EA7356D00F41540 /* Views */ = {
+ isa = PBXGroup;
+ children = (
+ 57D7CF9B2EA9D22900F41540 /* TriggerProListBlankSlateView.swift */,
+ 57D7CF932EA8E7E100F41540 /* TriggerProView.swift */,
+ 57D7CF8E2EA8DB6200F41540 /* TriggerProActionSettingViews.swift */,
+ 57D7CF8A2EA8C8A000F41540 /* TriggerProMappingListView.swift */,
+ 57D7CF842EA88ABA00F41540 /* TriggerButton.swift */,
+ 57D7CF7A2EA882F000F41540 /* AddTriggerActionCell.swift */,
+ 57D7CF762EA882E400F41540 /* AddTriggerMappingCell.swift */,
+ 57D7CF712EA882CA00F41540 /* AddTriggerButtonStyleCell.swift */,
+ 57D7CF612EA792F900F41540 /* AddTriggerButtonView.swift */,
+ 57D7CF492EA736BB00F41540 /* TriggerProListCell.swift */,
+ 57D7CF432EA7357200F41540 /* TriggerProListView.swift */,
+ );
+ path = Views;
+ sourceTree = "<group>";
+ };
57DCE7E62E0D9F170079E3AA /* QuickTableViewController */ = {
isa = PBXGroup;
children = (
@@ -3971,6 +4052,7 @@
57F0D8402DE2CD7500760F57 /* Cores */ = {
isa = PBXGroup;
children = (
+ 57526B7D2EADEECD003F91BD /* FDS.swift */,
57A481692E7F05CD001D4598 /* NDS.swift */,
5771C28A2E6986BE0062EDE0 /* DC.swift */,
574ABEBB2E609FE30045F76E /* GBA.swift */,
@@ -4094,6 +4176,8 @@
57DF840B2D61B3D500AA0AAB /* BlankSlateCollectionView.swift */,
57B6ECEB2D79E19B002E619C /* BlankSlateTableView.swift */,
57DE104D2D6088BE00CDD82A /* BlankPlaceholderView.swift */,
+ 57D7CFC02EAA1B5E00F41540 /* ShadowLabel.h */,
+ 57D7CFC12EAA1B5E00F41540 /* ShadowLabel.m */,
);
path = Views;
sourceTree = "<group>";
@@ -4116,6 +4200,7 @@
57F1A9362D7D701500D0CC93 /* AirPlay */,
57047A062D85215400C62FF6 /* Purchase */,
5720E7702E54103100EC0DA5 /* RetroAchievements */,
+ 57D7CF292EA5DB7B00F41540 /* TriggerPro */,
);
path = Business;
sourceTree = "<group>";
@@ -5015,12 +5100,15 @@
57AD35EA2D7DEB9D0092FD03 /* WebViewController.swift in Sources */,
579076F02D8AAC2900ED90FB /* TransparentHoleView.swift in Sources */,
577006832D438E2A00762E8F /* GamesViewController.swift in Sources */,
+ 57D7CF732EA882E000F41540 /* AddTriggerButtonStyleCell.swift in Sources */,
57F632AD2D6FEC32007270E8 /* WebDavServiceProvider.swift in Sources */,
570F59102DC5BB03007BFD92 /* ThemeColorCollectionViewCell.swift in Sources */,
57B6ECCD2D798425002E619C /* CheatTypeExtensions.swift in Sources */,
5754D88B2E274AC7001EA5ED /* OnlinePlaySettingView.swift in Sources */,
57913B452D5ED78C004D51AA /* GameInfoDetailReusableView.swift in Sources */,
+ 57D7CF792EA882ED00F41540 /* AddTriggerMappingCell.swift in Sources */,
579076E32D8A990700ED90FB /* FunctionButtonContainerView.swift in Sources */,
+ 57D7CF462EA7357900F41540 /* TriggerProListView.swift in Sources */,
577006572D410D7F00762E8F /* BrowserItemCollectionViewCell.swift in Sources */,
5770055A2D3CC36B00762E8F /* Game.swift in Sources */,
5713303E2D914C2F0043C28A /* CreamAssetExtensions.swift in Sources */,
@@ -5033,8 +5121,10 @@
A52C1D86257F91550029B15B /* BaseViewController.swift in Sources */,
A5DE1F6C256BDD250099425B /* HomeViewController.swift in Sources */,
A519A38A256FCA50008AD6CE /* StringExtensions.swift in Sources */,
+ 57D7CFC22EAA1B5E00F41540 /* ShadowLabel.m in Sources */,
A58C3F4B248E3DB50099E068 /* Constants.swift in Sources */,
57CC354C2DBF216C00DF7418 /* ControllerSkinExtensions.swift in Sources */,
+ 57D7CF7F2EA882F900F41540 /* AddTriggerActionCell.swift in Sources */,
575A39D22DCD2F9C00B28FC2 /* GameCoverSearchViewController.swift in Sources */,
57BFBE902DD435C900AABF98 /* PSP.swift in Sources */,
57CC33E52DBE157400DF7418 /* SkinPreviewViewController.swift in Sources */,
@@ -5084,10 +5174,12 @@
57AD35EC2D7DEF360092FD03 /* SheerExtensions.swift in Sources */,
57B6EBDB2D758819002E619C /* GameSaveMatchGameView.swift in Sources */,
574789BC2D4F8769006F0D99 /* SectionIndexView.swift in Sources */,
+ 57D7CF9D2EA9D23500F41540 /* TriggerProListBlankSlateView.swift in Sources */,
57913B402D5ED4C1004D51AA /* GameInfoViewController.swift in Sources */,
574789BD2D4F8769006F0D99 /* SectionIndexViewItemIndicator.swift in Sources */,
57CCB3FF2D69B4050036476B /* ContextMenuButton.swift in Sources */,
576F0E052D88006300D2A1BA /* GameSavePurchaseGuideView.swift in Sources */,
+ 57D7CF592EA78B2B00F41540 /* TriggerProPreviewController.swift in Sources */,
570F591C2DC70843007BFD92 /* Theme.swift in Sources */,
574789BE2D4F8769006F0D99 /* SectionIndexViewItem.swift in Sources */,
57F1A9392D7D704300D0CC93 /* AirPlayViewController.swift in Sources */,
@@ -5103,6 +5195,7 @@
A52C1D89257F96C90029B15B /* UIViewControllerExtensions.swift in Sources */,
57DE0FF82D5F456700CDD82A /* CheatCodeViewController.swift in Sources */,
5713300F2D90FF820043C28A /* BaseView.swift in Sources */,
+ 57D7CF902EA8DB7800F41540 /* TriggerProActionSettingViews.swift in Sources */,
57655C262DF6BCF3003E4A6E /* PlatformSelectionView.swift in Sources */,
577005552D3CC25700762E8F /* FilesImporter.swift in Sources */,
576A7DA82E3B4B1400008E35 /* PS1.swift in Sources */,
@@ -5116,10 +5209,12 @@
574789912D4CD185006F0D99 /* GameEditToolBar.swift in Sources */,
57CCB35D2D65DB200036476B /* GameSaveEmptyCollectionViewCell.swift in Sources */,
577005612D3CD3AC00762E8F /* UTTypeExtensions.swift in Sources */,
+ 57D7CF952EA8E7EE00F41540 /* TriggerProView.swift in Sources */,
5706B0372DFBEC1E0066122E /* SG1000.swift in Sources */,
57CCB3CD2D6775080036476B /* Database.swift in Sources */,
5726FED82D71B63E00041AD5 /* CacheManager.swift in Sources */,
577005B52D3E6F3000762E8F /* AddImportServiceView.swift in Sources */,
+ 57D7CF362EA5DBA800F41540 /* Trigger.swift in Sources */,
57EC6AA62D801F56002920F0 /* GamesListBlankSlateView.swift in Sources */,
57F6327C2D6EA8D3007270E8 /* DropGlowEffectView.swift in Sources */,
5771C1AA2E62077A0062EDE0 /* MobyGamesKit.swift in Sources */,
@@ -5142,6 +5237,7 @@
57E8B18D2E2553CE00F93E60 /* HomeMenuImage.swift in Sources */,
57DCE7FF2E0D9F300079E3AA /* NavigationRow.swift in Sources */,
57DCE8002E0D9F300079E3AA /* TapActionRow.swift in Sources */,
+ 57D7CF4B2EA736C900F41540 /* TriggerProListCell.swift in Sources */,
57DCE8012E0D9F300079E3AA /* DetailText.swift in Sources */,
5720E7ED2E547FE100EC0DA5 /* AchievementsProfile.swift in Sources */,
57DCE8022E0D9F300079E3AA /* SwitchRow.swift in Sources */,
@@ -5150,6 +5246,7 @@
57DCE8042E0D9F300079E3AA /* Deprecated.swift in Sources */,
57E8B1022E2366DC00F93E60 /* BIOSItem.swift in Sources */,
5754D88F2E274B27001EA5ED /* DSOnlinePlaySettingCell.swift in Sources */,
+ 57D7CF5E2EA792E100F41540 /* AddTriggerButtonController.swift in Sources */,
57DCE8052E0D9F300079E3AA /* RowCompatible.swift in Sources */,
57DCE8062E0D9F300079E3AA /* OptionRow.swift in Sources */,
57DCE8072E0D9F300079E3AA /* Icon.swift in Sources */,
@@ -5186,6 +5283,7 @@
5720E8112E559EE600EC0DA5 /* RetroAchievementCountView.swift in Sources */,
577005B92D3E71BC00762E8F /* ImportService.swift in Sources */,
570622EC2D7BD2FE004F09E7 /* FilterManager.swift in Sources */,
+ 57D7CF622EA792FB00F41540 /* AddTriggerButtonView.swift in Sources */,
57B6EC652D77F832002E619C /* SettingItemCollectionViewCell.swift in Sources */,
57F1A9252D7D36D200D0CC93 /* GameViewExtensions.swift in Sources */,
570F59DC2DC9D52C007BFD92 /* ThemeManager.swift in Sources */,
@@ -5204,6 +5302,7 @@
57F0D8422DE2CD8D00760F57 /* NES.swift in Sources */,
579C114B2D1D0B1900CFD1F5 /* ApplicationSceneDelegate.swift in Sources */,
570622E62D7B334E004F09E7 /* FilterSelectionView.swift in Sources */,
+ 57D7CF3F2EA7355900F41540 /* TriggerProListViewController.swift in Sources */,
576F0E072D8806B500D2A1BA /* GameSavePurchaseGuideReusableView.swift in Sources */,
B2C97B502A09F3DE00053A4C /* UIimageExtensions.swift in Sources */,
577006092D3F980400762E8F /* LowestHaderReusableView.swift in Sources */,
@@ -5234,6 +5333,7 @@
57B6EBF32D769910002E619C /* ProHUDExtentions.swift in Sources */,
57BA59B52E3F13D100110849 /* LibretroCoreExtensions.swift in Sources */,
577006892D438F1100762E8F /* GameListView.swift in Sources */,
+ 57D7CF862EA88AC100F41540 /* TriggerButton.swift in Sources */,
57F632FE2D718236007270E8 /* SettingsListView.swift in Sources */,
5744C6CF2E360AF00088081A /* UIControllerKit.swift in Sources */,
57CC35802DC0684500DF7418 /* DownloadManageView.swift in Sources */,
@@ -5251,6 +5351,7 @@
57B6ECEC2D79E19E002E619C /* BlankSlateTableView.swift in Sources */,
5720D1C32DBA01990090C0F6 /* MappingTipView.swift in Sources */,
57E0C19E2D562F8600962555 /* GamesToolView.swift in Sources */,
+ 57D7CF8B2EA8C8A000F41540 /* TriggerProMappingListView.swift in Sources */,
57DF847A2D62E98100AA0AAB /* NSAttributedStringExtensions.swift in Sources */,
576F0DA52D85CD3A00D2A1BA /* FeaturesCell.swift in Sources */,
57CC33BA2DBCD90700DF7418 /* AuxiliaryLineView.swift in Sources */,
@@ -5267,6 +5368,7 @@
57E9632A2D6B01450022914C /* ImportFileCollectionViewCell.swift in Sources */,
A3A043BA2E9CF350006442C2 /* GameplayManualsView.swift in Sources */,
A3A043C42E9D3956006442C2 /* GameplayManualsViewController.swift in Sources */,
+ 57526B7E2EADEED0003F91BD /* FDS.swift in Sources */,
579213532D95314800E88819 /* BaseNavigationController.swift in Sources */,
57E0CC532D8EACC70027FB8C /* ResourcesKit.swift in Sources */,
5770069A2D44B9B500762E8F /* GamesNavigationView.swift in Sources */,
@@ -5599,7 +5701,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 575A3A422DCEE9F300B28FC2 /* Config-SideloadRelease.xcconfig */;
buildSettings = {
- ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color";
+ ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color AppIcon_Halloween";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -5959,7 +6061,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 579AB9D52E6C1118000868CB /* Config-SideloadDebug.xcconfig */;
buildSettings = {
- ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color";
+ ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color AppIcon_Halloween";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -6490,7 +6592,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 57E0363F2DBBE17100B222E1 /* Config-DebugSimulator.xcconfig */;
buildSettings = {
- ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color";
+ ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color AppIcon_Halloween";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -6971,7 +7073,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 57F456CF2DA98BB8007203AF /* Config-DevRelease.xcconfig */;
buildSettings = {
- ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color";
+ ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color AppIcon_Halloween";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -7412,7 +7514,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = B2C97B562A0A420E00053A4C /* Config-Debug.xcconfig */;
buildSettings = {
- ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color";
+ ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color AppIcon_Halloween";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -7659,7 +7761,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = B2C97B572A0A423B00053A4C /* Config-Release.xcconfig */;
buildSettings = {
- ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color";
+ ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "AppIcon_Dark AppIcon_Retro AppIcon_Color AppIcon_Halloween";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
diff --git a/ManicEmu/ManicEmu.xcodeproj/xcshareddata/xcschemes/ManicEmu.xcscheme b/ManicEmu/ManicEmu.xcodeproj/xcshareddata/xcschemes/ManicEmu.xcscheme
index c03c91b3..7f1a2d96 100644
--- a/ManicEmu/ManicEmu.xcodeproj/xcshareddata/xcschemes/ManicEmu.xcscheme
+++ b/ManicEmu/ManicEmu.xcodeproj/xcshareddata/xcschemes/ManicEmu.xcscheme
@@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
- buildConfiguration = "Debug"
+ buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/AppIcon_Halloween.appiconset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/AppIcon_Halloween.appiconset/Contents.json
new file mode 100644
index 00000000..85b0eeb1
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/AppIcon_Halloween.appiconset/Contents.json
@@ -0,0 +1,14 @@
+{
+ "images" : [
+ {
+ "filename" : "appicon_halloween.png",
+ "idiom" : "universal",
+ "platform" : "ios",
+ "size" : "1024x1024"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/AppIcon_Halloween.appiconset/appicon_halloween.png b/ManicEmu/ManicEmu/Resources/Assets.xcassets/AppIcon_Halloween.appiconset/appicon_halloween.png
new file mode 100644
index 00000000..2ad024f1
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/AppIcon_Halloween.appiconset/appicon_halloween.png differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/Contents.json
new file mode 100644
index 00000000..114d21cc
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/[email protected]
new file mode 100644
index 00000000..fd9d7549
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/[email protected]
new file mode 100644
index 00000000..dfb2c32c
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/appicon_halloween.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/Contents.json
new file mode 100644
index 00000000..a4a57c0b
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/Contents.json
@@ -0,0 +1,54 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..7c4c9d55
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..cbc35e44
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..1f746f24
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected]
new file mode 100644
index 00000000..05435f75
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/brand/fds_group_brand.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/Contents.json
new file mode 100644
index 00000000..80efe50c
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/[email protected]
new file mode 100644
index 00000000..7dc0194e
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/[email protected]
new file mode 100644
index 00000000..6b457a2a
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_h.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/Contents.json
new file mode 100644
index 00000000..3f422c51
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/[email protected]
new file mode 100644
index 00000000..00be3b47
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/[email protected]
new file mode 100644
index 00000000..0d6a87e5
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/cover/fds_cover_v.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/Contents.json
new file mode 100644
index 00000000..67a80ede
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/[email protected]
new file mode 100644
index 00000000..c72efea3
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/[email protected]
new file mode 100644
index 00000000..f1a323a3
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_bg.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/Contents.json
new file mode 100644
index 00000000..b8f6ba5c
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/[email protected]
new file mode 100644
index 00000000..1c3b6f36
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/[email protected]
new file mode 100644
index 00000000..d56273a7
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_classic_button.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/Contents.json
new file mode 100644
index 00000000..cf5ea189
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/[email protected]
new file mode 100644
index 00000000..b442d8a6
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/[email protected] b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/[email protected]
new file mode 100644
index 00000000..a9268c16
Binary files /dev/null and b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Images/triggerPro_flat_button.imageset/[email protected] differ
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.symbolset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.symbolset/Contents.json
new file mode 100644
index 00000000..6c561ec5
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "custom.clock.arrow.trianglehead.counterclockwise.rotate.90.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.symbolset/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.svg b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.symbolset/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.svg
new file mode 100644
index 00000000..12b1ef1d
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.symbolset/custom.clock.arrow.trianglehead.counterclockwise.rotate.90.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.defaults {-sfsymbols-wiggle-style:counterClockwise;-sfsymbols-rotates-clockwise:false}
+
+.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-always-rotates:true;-sfsymbols-layer-tags:-6fe394bf3bc19a8d clock.arrow.trianglehead.counterclockwise.rotate.90}
+.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-6fe394bf3bc19a8d clock.arrow.trianglehead.counterclockwise.rotate.90}
+
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-always-rotates:true;-sfsymbols-layer-tags:-6fe394bf3bc19a8d clock.arrow.trianglehead.counterclockwise.rotate.90}
+.multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-6fe394bf3bc19a8d clock.arrow.trianglehead.counterclockwise.rotate.90}
+
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-always-rotates:true;-sfsymbols-layer-tags:-6fe394bf3bc19a8d clock.arrow.trianglehead.counterclockwise.rotate.90}
+.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6fe394bf3bc19a8d clock.arrow.trianglehead.counterclockwise.rotate.90}
+
+.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
+</style>
+ <g id="Notes">
+ <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
+ <g transform="matrix(0.2 0 0 0.2 263 1933)">
+ <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
+ <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
+ <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
+ <g transform="matrix(0.2 0 0 0.2 776 1933)">
+ <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
+ </g>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
+ <g transform="matrix(0.2 0 0 0.2 1289 1933)">
+ <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
+ <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
+ <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from custom.clock.arrow.trianglehead.counterclockwise.rotate.90</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
+ </g>
+ <g id="Guides">
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
+ <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
+ <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
+ <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
+ <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2982.23" x2="2982.23" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2884.57" x2="2884.57" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1496.11" x2="1496.11" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Regular-S" style="fill:none;stroke:#FF3B30;stroke-width:0.5;opacity:1.0;" x1="1403.58" x2="1403.58" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="603.773" x2="603.773" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Ultralight-S" style="fill:none;stroke:#FF3B30;stroke-width:0.5;opacity:1.0;" x1="515.649" x2="515.649" y1="600.785" y2="720.121"/>
+ </g>
+ <g id="Symbols">
+ <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539L20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188C41.6016-7.42188 35.5469-9.91211 30.127-14.5996C26.8555-17.4805 22.5098-18.4082 19.3359-15.2832C16.5527-12.5 16.6992-8.34961 20.166-4.54102C26.2695 2.19727 38.8184 6.73828 48.8281 6.73828ZM5.0293-43.7988C1.66016-43.7988 0.830078-40.3809 2.63672-38.1348L13.1348-24.9023C14.2578-23.4375 16.5039-23.4375 17.6758-24.9023L28.125-38.1348C29.8828-40.3809 29.1016-43.7988 25.7812-43.7988Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M48.8281-56.543C46.7773-56.543 45.0684-54.834 45.0684-52.7832L45.0684-33.2031C45.0684-32.2754 45.4102-31.3477 46.0938-30.4199L54.4922-19.3848C56.0059-17.3828 58.1543-17.041 60.1074-18.3594C61.8652-19.5312 62.0117-21.875 60.6445-23.7305L46.8262-42.4316L52.5879-24.8047L52.5879-52.7832C52.5879-54.834 50.8789-56.543 48.8281-56.543Z"/>
+ </g>
+ <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539L14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148C35.8398-3.27148 26.6113-8.25195 20.8496-15.8691C19.4824-17.6758 17.3828-18.2129 15.5762-17.0898C13.8184-16.0156 13.2812-13.5254 14.7949-11.6211C22.0703-1.9043 33.5449 4.15039 46.2402 4.15039ZM2.39258-42.8711C-0.683594-42.8711-1.41602-40.7715 0.244141-38.4277L8.93555-26.0742C10.3027-24.1699 12.3535-24.1699 13.6719-26.0742L22.3633-38.4766C23.9746-40.7715 23.2422-42.8711 20.2148-42.8711Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M46.2402-58.0078C44.3359-58.0078 42.7734-56.4453 42.7734-54.4922L42.7734-32.8125C42.7734-31.8848 43.0664-31.0547 43.75-30.0781L53.0273-17.8711C54.4922-15.9668 56.543-15.625 58.3496-16.8457C60.0098-17.9688 60.1562-20.1172 58.7891-21.9238L45.7031-39.6973L49.7559-27.1973L49.7559-54.4922C49.7559-56.4453 48.1934-58.0078 46.2402-58.0078Z"/>
+ </g>
+ <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539L9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438C31.1626-0.274438 19.6636-7.38917 13.8111-17.7309C13.4429-18.2661 12.7964-18.4399 12.2158-18.1797C11.7295-17.8774 11.5557-17.2036 11.9341-16.5708C18.1197-5.6279 30.23 1.97072 44.0606 1.97072ZM0.984874-41.645C-0.320315-41.645-0.825688-40.7261 0.0625014-39.5176L8.02735-28.1177C8.71339-27.0761 9.67434-27.0761 10.357-28.1177L18.3218-39.4756C19.2066-40.7261 18.7012-41.645 17.3994-41.645Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M44.0606-56.0552C43.1553-56.0552 42.501-55.3555 42.501-54.4922L42.501-33.1304C42.501-32.2026 42.7031-31.7812 43.1143-31.3042L52.3916-19.0972C53.1299-18.1011 54.2271-18.1225 54.8531-18.7075C55.4234-19.1948 55.6153-20.0718 54.9292-20.9702L44.7949-34.7022L45.6236-32.0561L45.6236-54.4922C45.6236-55.3555 44.9239-56.0552 44.0606-56.0552Z"/>
+ </g>
+ </g>
+</svg>
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.document.on.document.symbolset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.document.on.document.symbolset/Contents.json
new file mode 100644
index 00000000..349c71a3
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.document.on.document.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "custom.document.on.document.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.document.on.document.symbolset/custom.document.on.document.svg b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.document.on.document.symbolset/custom.document.on.document.svg
new file mode 100644
index 00000000..b25790aa
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.document.on.document.symbolset/custom.document.on.document.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+.monochrome-1 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+.monochrome-2 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+.multicolor-1:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+.multicolor-2:tintColor {-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+.hierarchical-1:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+.hierarchical-2:primary {-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6064a6e7812ffd0 document.on.document}
+
+.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
+</style>
+ <g id="Notes">
+ <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
+ <g transform="matrix(0.2 0 0 0.2 263 1933)">
+ <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
+ <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
+ <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
+ <g transform="matrix(0.2 0 0 0.2 776 1933)">
+ <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
+ </g>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
+ <g transform="matrix(0.2 0 0 0.2 1289 1933)">
+ <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
+ <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
+ <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from custom.document.on.document</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
+ </g>
+ <g id="Guides">
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
+ <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
+ <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
+ <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
+ <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2986.33" x2="2986.33" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2880.47" x2="2880.47" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1498.99" x2="1498.99" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1400.7" x2="1400.7" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="607.426" x2="607.426" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="511.996" x2="511.996" y1="600.785" y2="720.121"/>
+ </g>
+ <g id="Symbols">
+ <g id="Black-S" transform="matrix(1 0 0 1 2880.47 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M30.5664-71.2891L30.5664-21.3867C30.5664-11.8164 36.2305-6.15234 45.8008-6.15234L80.8594-6.15234C90.4297-6.15234 96.0938-11.8164 96.0938-21.3867L96.0938-48.0469C96.0938-54.6387 94.5801-58.9355 90.8203-62.793L72.8516-81.2012C69.2871-84.8145 64.7461-86.5234 58.8379-86.5234L45.8008-86.5234C36.2305-86.5234 30.5664-80.8594 30.5664-71.2891ZM44.7266-23.6328L44.7266-69.043C44.7266-71.2891 45.6055-72.3633 48.0469-72.3633L59.668-72.3633L59.668-60.5957C59.668-54.3945 63.916-50.1465 70.1172-50.1465L81.9336-50.1465L81.9336-23.6328C81.9336-21.3867 81.0547-20.3125 78.6133-20.3125L48.0469-20.3125C45.6055-20.3125 44.7266-21.3867 44.7266-23.6328ZM69.4336-61.6699L69.4336-68.7012L78.2227-59.9121L71.1914-59.9121C70.0195-59.9121 69.4336-60.498 69.4336-61.6699Z"/>
+ <path class="monochrome-1 monochrome-2 multicolor-1:tintColor multicolor-2:tintColor hierarchical-1:primary hierarchical-2:primary SFSymbolsPreviewWireframe" d="M9.76562 0.878906C9.76562 10.4492 15.4297 16.1133 25 16.1133L60.0586 16.1133C69.6289 16.1133 75.293 10.4492 75.293 0.878906L75.293-26.4648C75.293-32.666 74.2676-36.3281 70.3613-40.2344L51.2695-59.3262C47.3633-63.2324 43.7012-64.2578 37.5-64.2578L25-64.2578C15.4297-64.2578 9.76562-58.5938 9.76562-49.0234Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M23.9258-1.36719L23.9258-46.7773C23.9258-49.0234 24.8047-50.0977 27.2461-50.0977L35.1074-50.0977L35.1074-35.4004C35.1074-26.6113 39.1113-22.6074 47.9004-22.6074L61.1328-22.6074L61.1328-1.36719C61.1328 0.878906 60.2539 1.95312 57.8125 1.95312L27.2461 1.95312C24.8047 1.95312 23.9258 0.878906 23.9258-1.36719ZM48.6816-33.3496C46.8262-33.3496 45.8496-34.3262 45.8496-36.1816L45.8496-48.3398L60.8398-33.3496Z"/>
+ </g>
+ <g id="Regular-S" transform="matrix(1 0 0 1 1400.7 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M28.3203-71.2891L28.3203-18.75C28.3203-10.4004 32.373-6.29883 40.5762-6.29883L76.2207-6.29883C84.4238-6.29883 88.5254-10.4492 88.5254-18.75L88.5254-48.9258C88.5254-54.248 87.4512-57.6172 84.3262-60.8398L66.0156-79.541C63.0371-82.6172 59.4727-83.7402 54.834-83.7402L40.5762-83.7402C32.373-83.7402 28.3203-79.5898 28.3203-71.2891ZM35.3516-18.8477L35.3516-71.1914C35.3516-74.707 37.2559-76.709 40.9668-76.709L57.5684-76.709L57.5684-57.8613C57.5684-53.2227 59.8633-50.9277 64.4531-50.9277L81.4453-50.9277L81.4453-18.8477C81.4453-15.332 79.541-13.3301 75.8789-13.3301L40.918-13.3301C37.2559-13.3301 35.3516-15.332 35.3516-18.8477ZM63.8672-58.9355L63.8672-73.4863L79.7363-57.2266L65.5762-57.2266C64.3555-57.2266 63.8672-57.7148 63.8672-58.9355Z"/>
+ <path class="monochrome-1 monochrome-2 multicolor-1:tintColor multicolor-2:tintColor hierarchical-1:primary hierarchical-2:primary SFSymbolsPreviewWireframe" d="M9.76562 0.683594C9.76562 9.0332 13.8184 13.1348 22.0215 13.1348L57.666 13.1348C65.8691 13.1348 69.9707 8.98438 69.9707 0.683594L69.9707-28.4668C69.9707-33.8867 69.3848-36.1816 66.0156-39.6484L45.752-60.3516C42.5781-63.623 39.9414-64.3066 35.2539-64.3066L22.0215-64.3066C13.8184-64.3066 9.76562-60.1562 9.76562-51.8555Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M16.7969 0.585938L16.7969-51.7578C16.7969-55.2734 18.7012-57.2754 22.4121-57.2754L34.082-57.2754L34.082-35.5957C34.082-30.4688 36.6699-27.9297 41.748-27.9297L62.8906-27.9297L62.8906 0.585938C62.8906 4.10156 60.9863 6.10352 57.3242 6.10352L22.3633 6.10352C18.7012 6.10352 16.7969 4.10156 16.7969 0.585938ZM42.5781-34.4727C41.2109-34.4727 40.625-35.0586 40.625-36.4258L40.625-55.9082L61.5723-34.4727Z"/>
+ </g>
+ <g id="Ultralight-S" transform="matrix(1 0 0 1 511.996 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M28.2749-71.9248L28.2749-16.1616C28.2749-9.62842 31.7373-6.1626 38.2603-6.1626L75.6758-6.1626C82.1987-6.1626 85.6646-9.63184 85.6646-16.1616L85.6646-51.1055C85.6646-52.8858 85.1807-54.2569 83.5542-55.9356L59.6583-79.8135C58.042-81.4365 56.6572-81.9238 54.8794-81.9238L38.2603-81.9238C31.8281-81.9238 28.2749-78.4546 28.2749-71.9248ZM30.4927-16.2593L30.4927-71.8271C30.4927-76.8413 33.169-79.706 38.3784-79.706L56.5693-79.706L56.5693-56.6807C56.5693-53.1318 58.1377-51.7905 61.4561-51.7905L83.4433-51.7905L83.4433-16.2593C83.4433-11.0635 80.7671-8.38041 75.561-8.38041L38.375-8.38041C33.169-8.38041 30.4927-11.0635 30.4927-16.2593ZM58.7359-56.7105L58.7359-77.664L82.3701-53.9571L61.4439-53.9571C59.4966-53.9571 58.7359-54.7632 58.7359-56.7105Z"/>
+ <path class="monochrome-1 monochrome-2 multicolor-1:tintColor multicolor-2:tintColor hierarchical-1:primary hierarchical-2:primary SFSymbolsPreviewWireframe" d="M9.76562 1.41015C9.76562 7.94337 13.228 11.4092 19.751 11.4092L57.1665 11.4092C63.6895 11.4092 67.1553 7.98536 67.1553 1.41015L67.1553-31.6455C67.1553-34.3408 66.6602-35.6367 65.0166-37.2871L40.0757-62.2134C38.4458-63.8501 37.1714-64.3521 34.4819-64.3521L19.751-64.3521C13.3189-64.3521 9.76562-60.8828 9.76562-54.353Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M11.9834 1.31249L11.9834-54.2554C11.9834-59.2695 14.6597-62.1342 19.8692-62.1342L36.3071-62.1342L36.3071-37.6846C36.3071-34.1015 38.123-32.5615 41.4302-32.5615L64.9341-32.5615L64.9341 1.31249C64.9341 6.50828 62.2578 9.19138 57.0518 9.19138L19.8657 9.19138C14.6597 9.19138 11.9834 6.50828 11.9834 1.31249ZM41.5791-34.7451C39.3491-34.7451 38.4907-35.6035 38.4907-37.8335L38.4907-60.6308L64.3423-34.7451Z"/>
+ </g>
+ </g>
+</svg>
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.photo.badge.plus.fill.symbolset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.photo.badge.plus.fill.symbolset/Contents.json
new file mode 100644
index 00000000..b0c04478
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.photo.badge.plus.fill.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "custom.photo.badge.plus.fill.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.photo.badge.plus.fill.symbolset/custom.photo.badge.plus.fill.svg b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.photo.badge.plus.fill.symbolset/custom.photo.badge.plus.fill.svg
new file mode 100644
index 00000000..5c8038c5
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.photo.badge.plus.fill.symbolset/custom.photo.badge.plus.fill.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-7398ba4a56678c9a photo.badge.plus.fill photo.fill}
+.monochrome-1 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-7398ba4a56678c9a photo.badge.plus.fill photo.fill}
+.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+.monochrome-4 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-7398ba4a56678c9a photo.badge.plus.fill photo.fill}
+.multicolor-1:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-7398ba4a56678c9a photo.badge.plus.fill photo.fill}
+.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+.multicolor-3:systemGreenColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+.multicolor-4:white {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-7398ba4a56678c9a photo.badge.plus.fill photo.fill}
+.hierarchical-1:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-7398ba4a56678c9a photo.badge.plus.fill photo.fill}
+.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+.hierarchical-4:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-7398ba4a56678c9a _badge photo.badge.plus.fill plus}
+
+.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
+</style>
+ <g id="Notes">
+ <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
+ <g transform="matrix(0.2 0 0 0.2 263 1933)">
+ <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
+ <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
+ <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
+ <g transform="matrix(0.2 0 0 0.2 776 1933)">
+ <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
+ </g>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
+ <g transform="matrix(0.2 0 0 0.2 1289 1933)">
+ <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
+ <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
+ <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from custom.photo.badge.plus.fill</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
+ </g>
+ <g id="Guides">
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
+ <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
+ <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
+ <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
+ <line id="right-margin-Black-S" style="fill:none;stroke:#FF3B30;stroke-width:0.5;opacity:1.0;" x1="2989.45" x2="2989.45" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2877.35" x2="2877.35" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Regular-S" style="fill:none;stroke:#FF3B30;stroke-width:0.5;opacity:1.0;" x1="1504.9" x2="1504.9" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1394.79" x2="1394.79" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Ultralight-S" style="fill:none;stroke:#FF3B30;stroke-width:0.5;opacity:1.0;" x1="613.72" x2="613.72" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="505.702" x2="505.702" y1="600.785" y2="720.121"/>
+ </g>
+ <g id="Symbols">
+ <g id="Black-S" transform="matrix(1 0 0 1 2877.35 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M27.8809-11.2305C25.4395-11.2305 23.9258-12.7441 23.9258-15.1855L23.9258-21.582L30.3223-27.1973C31.9336-28.6133 33.2031-29.2969 35.2051-29.2969C36.9629-29.2969 38.7695-28.5645 40.3809-27.1484L47.3633-20.8984L64.5508-36.2793C66.2598-37.793 68.1641-38.4766 70.2148-38.4766C72.168-38.4766 74.2188-37.7441 75.8301-36.2305L88.1836-24.8535L88.1836-15.2344C88.1836-12.7441 86.2793-11.2305 84.2285-11.2305ZM25 2.92969L87.1094 2.92969C96.6797 2.92969 102.344-2.73438 102.344-12.3047L102.344-58.1055C102.344-67.6758 96.6797-73.3398 87.1094-73.3398L25-73.3398C15.4297-73.3398 9.76562-67.6758 9.76562-58.1055L9.76562-12.3047C9.76562-2.73438 15.4297 2.92969 25 2.92969Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M45.1172-35.4492C39.6484-35.4492 35.1562-39.9414 35.1562-45.4102C35.1562-50.8301 39.6484-55.3711 45.1172-55.3711C50.5371-55.3711 55.0293-50.8301 55.0293-45.4102C55.0293-39.9414 50.5371-35.4492 45.1172-35.4492Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M95.3125 15.1367C110.254 15.1367 122.607 2.73438 122.607-12.207C122.607-27.1484 110.254-39.4531 95.3125-39.4531C80.3711-39.4531 68.0176-27.1484 68.0176-12.207C68.0176 2.73438 80.3711 15.1367 95.3125 15.1367Z"/>
+ <path class="monochrome-3 multicolor-3:systemGreenColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M95.3125 8.78906C106.787 8.78906 116.26-0.78125 116.26-12.207C116.26-23.6328 106.787-33.1055 95.3125-33.1055C83.8379-33.1055 74.3652-23.6328 74.3652-12.207C74.3652-0.78125 83.8379 8.78906 95.3125 8.78906Z"/>
+ <path class="monochrome-4 multicolor-4:white hierarchical-4:primary SFSymbolsPreviewWireframe" d="M95.3125 1.85547C92.9688 1.85547 91.4062 0.292969 91.4062-2.00195L91.4062-8.25195L85.2539-8.25195C82.959-8.25195 81.3477-9.81445 81.3477-12.1582C81.3477-14.502 82.8613-16.0645 85.2539-16.0645L91.4062-16.0645L91.4062-22.168C91.4062-24.4629 92.9688-26.0742 95.3125-26.0742C97.6562-26.0742 99.2188-24.5605 99.2188-22.168L99.2188-16.0645L105.42-16.0645C107.715-16.0645 109.277-14.502 109.277-12.1582C109.277-9.81445 107.715-8.25195 105.42-8.25195L99.2188-8.25195L99.2188-2.00195C99.2188 0.292969 97.6562 1.85547 95.3125 1.85547Z"/>
+ </g>
+ <g id="Regular-S" transform="matrix(1 0 0 1 1394.79 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M22.4121-6.68945C18.8965-6.68945 16.7969-8.74023 16.7969-12.3047L16.7969-14.7949L27.9297-24.6094C29.5898-26.0742 31.3965-26.8066 33.1055-26.8066C34.9609-26.8066 36.9141-26.0742 38.623-24.5605L45.9961-17.9199L64.209-34.1797C66.0645-35.8398 68.1152-36.5723 70.3125-36.5723C72.3633-36.5723 74.5117-35.791 76.2695-34.1309L93.3105-18.1641L93.3105-12.207C93.3105-8.74023 91.1621-6.68945 87.793-6.68945ZM22.2168 0.390625L87.8906 0.390625C96.2402 0.390625 100.342-3.71094 100.342-11.9141L100.342-58.4961C100.342-66.6992 96.2402-70.8008 87.8906-70.8008L22.2168-70.8008C13.916-70.8008 9.76562-66.6992 9.76562-58.4961L9.76562-11.9141C9.76562-3.71094 13.916 0.390625 22.2168 0.390625Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M39.1602-34.1309C33.8867-34.1309 29.5898-38.4277 29.5898-43.6523C29.5898-48.877 33.8867-53.2227 39.1602-53.2227C44.3359-53.2227 48.6328-48.877 48.6328-43.6523C48.6328-38.4277 44.3359-34.1309 39.1602-34.1309Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M96.8262 13.1836C110.693 13.1836 122.266 1.66016 122.266-12.207C122.266-26.123 110.791-37.5977 96.8262-37.5977C82.9102-37.5977 71.4355-26.123 71.4355-12.207C71.4355 1.75781 82.8613 13.1836 96.8262 13.1836Z"/>
+ <path class="monochrome-3 multicolor-3:systemGreenColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M96.8262 7.4707C107.52 7.4707 116.553-1.46484 116.553-12.207C116.553-22.998 107.666-31.8848 96.8262-31.8848C86.0352-31.8848 77.1484-22.998 77.1484-12.207C77.1484-1.36719 86.0352 7.4707 96.8262 7.4707Z"/>
+ <path class="monochrome-4 multicolor-4:white hierarchical-4:primary SFSymbolsPreviewWireframe" d="M96.8262 0.0488281C95.3125 0.0488281 94.3359-0.976562 94.3359-2.49023L94.3359-9.66797L87.1582-9.66797C85.5957-9.66797 84.6191-10.6934 84.6191-12.207C84.6191-13.7207 85.5957-14.7461 87.1582-14.7461L94.3359-14.7461L94.3359-21.9238C94.3359-23.4375 95.3125-24.4141 96.8262-24.4141C98.3887-24.4141 99.3652-23.4375 99.3652-21.9238L99.3652-14.7461L106.543-14.7461C108.057-14.7461 109.082-13.7207 109.082-12.207C109.082-10.6934 108.057-9.66797 106.543-9.66797L99.3652-9.66797L99.3652-2.49023C99.3652-0.976562 98.3887 0.0488281 96.8262 0.0488281Z"/>
+ </g>
+ <g id="Ultralight-S" transform="matrix(1 0 0 1 505.702 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M19.5059-3.78323C14.8096-3.78323 11.9834-6.56056 11.9834-11.3057L11.9834-12.8423L26.4312-25.1089C28.2275-26.6645 30.0796-27.5332 31.7886-27.5332C33.6441-27.5332 35.5972-26.6645 37.397-25.0146L44.3613-18.6011L62.8013-34.4976C64.9746-36.3394 67.2979-37.3442 69.3589-37.3442C71.5913-37.3442 73.9668-36.3359 76.0879-34.4487L96.0351-16.6655L96.0351-11.2988C96.0351-6.56056 93.2056-3.78323 88.5195-3.78323ZM19.7647-1.65282L88.2539-1.65282C94.7871-1.65282 98.2529-5.20946 98.2529-11.6416L98.2529-58.8594C98.2529-65.2915 94.7871-68.8482 88.2539-68.8482L19.7647-68.8482C13.2349-68.8482 9.76562-65.3823 9.76562-58.8594L9.76562-11.6416C9.76562-5.11864 13.2349-1.65282 19.7647-1.65282Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M35.3911-34.812C30.3902-34.812 26.3203-38.8818 26.3203-43.8794C26.3203-48.8315 30.3902-52.9502 35.3911-52.9502C40.3399-52.9502 44.4097-48.8315 44.4097-43.8794C44.4097-38.8818 40.3399-34.812 35.3911-34.812Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M97.1895 9.18753C108.877 9.18753 118.542-0.428694 118.542-12.1616C118.542-23.898 108.929-33.5108 97.1895-33.5108C85.4985-33.5108 75.8403-23.8526 75.8403-12.1616C75.8403-0.421858 85.4951 9.18753 97.1895 9.18753Z"/>
+ <path class="monochrome-3 multicolor-3:systemGreenColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M97.1895 6.10841C107.202 6.10841 115.463-2.10058 115.463-12.1616C115.463-22.2261 107.257-30.4317 97.1895-30.4317C87.2158-30.4317 78.9194-22.1807 78.9194-12.1616C78.9194-2.09374 87.2158 6.10841 97.1895 6.10841Z"/>
+ <path class="monochrome-4 multicolor-4:white hierarchical-4:primary SFSymbolsPreviewWireframe" d="M97.1895-0.26904C96.2207-0.26904 95.6982-0.931153 95.6982-1.80909L95.6982-10.6216L86.8403-10.6216C86.0044-10.6216 85.3003-11.1929 85.3003-12.1616C85.3003-13.1304 86.0044-13.6563 86.8403-13.6563L95.6982-13.6563L95.6982-22.4687C95.6982-23.3013 96.2207-24.0054 97.1895-24.0054C98.1616-24.0054 98.7295-23.3013 98.7295-22.4687L98.7295-13.6563L107.497-13.6563C108.375-13.6563 109.037-13.1304 109.037-12.1616C109.037-11.1929 108.375-10.6216 107.497-10.6216L98.7295-10.6216L98.7295-1.80909C98.7295-0.931153 98.1616-0.26904 97.1895-0.26904Z"/>
+ </g>
+ </g>
+</svg>
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.xmark.triangle.circle.square.symbolset/Contents.json b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.xmark.triangle.circle.square.symbolset/Contents.json
new file mode 100644
index 00000000..1178bd20
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.xmark.triangle.circle.square.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "custom.xmark.triangle.circle.square.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.xmark.triangle.circle.square.symbolset/custom.xmark.triangle.circle.square.svg b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.xmark.triangle.circle.square.symbolset/custom.xmark.triangle.circle.square.svg
new file mode 100644
index 00000000..22619069
--- /dev/null
+++ b/ManicEmu/ManicEmu/Resources/Assets.xcassets/Symbols/custom.xmark.triangle.circle.square.symbolset/custom.xmark.triangle.circle.square.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:3;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.monochrome-1 {-sfsymbols-motion-group:2;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.monochrome-2 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+
+.multicolor-0:tintColor {-sfsymbols-motion-group:3;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.multicolor-1:tintColor {-sfsymbols-motion-group:2;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.multicolor-2:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+
+.hierarchical-0:primary {-sfsymbols-motion-group:3;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.hierarchical-1:primary {-sfsymbols-motion-group:2;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.hierarchical-2:primary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-46c0560074c558e0 xmark.triangle.circle.square}
+
+.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
+</style>
+ <g id="Notes">
+ <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
+ <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
+ <g transform="matrix(0.2 0 0 0.2 263 1933)">
+ <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
+ <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
+ </g>
+ <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
+ <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
+ <g transform="matrix(0.2 0 0 0.2 776 1933)">
+ <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
+ </g>
+ <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
+ <g transform="matrix(0.2 0 0 0.2 1289 1933)">
+ <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
+ </g>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
+ <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
+ <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from custom.xmark.triangle.circle.square</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
+ <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
+ </g>
+ <g id="Guides">
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
+ <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
+ <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
+ <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
+ <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
+ </g>
+ <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
+ <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
+ <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2982.15" x2="2982.15" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2884.65" x2="2884.65" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1495.52" x2="1495.52" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1404.17" x2="1404.17" y1="600.785" y2="720.121"/>
+ <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="603.414" x2="603.414" y1="600.785" y2="720.121"/>
+ <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="516.008" x2="516.008" y1="600.785" y2="720.121"/>
+ </g>
+ <g id="Symbols">
+ <g id="Black-S" transform="matrix(1 0 0 1 2884.65 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M63.8672 3.07617L74.3164 3.07617C83.1055 3.07617 87.1094-0.927734 87.1094-9.7168L87.1094-20.166C87.1094-28.9551 83.1055-32.959 74.3164-32.959L63.8672-32.959C55.0781-32.959 51.0742-28.9551 51.0742-20.166L51.0742-9.7168C51.0742-0.927734 55.0781 3.07617 63.8672 3.07617ZM63.7695-7.66602C62.4023-7.66602 61.8164-8.25195 61.8164-9.61914L61.8164-20.2637C61.8164-21.6309 62.4023-22.2168 63.7695-22.2168L74.4141-22.2168C75.7812-22.2168 76.3672-21.6309 76.3672-20.2637L76.3672-9.61914C76.3672-8.25195 75.7812-7.66602 74.4141-7.66602Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M28.418 3.80859C38.7207 3.80859 47.0703-4.54102 47.0703-14.8438C47.0703-25.1465 38.7207-33.4961 28.418-33.4961C18.1152-33.4961 9.76562-25.1465 9.76562-14.8438C9.76562-4.54102 18.1152 3.80859 28.418 3.80859ZM28.418-6.93359C24.0723-6.93359 20.5078-10.498 20.5078-14.8438C20.5078-19.1895 24.0723-22.7539 28.418-22.7539C32.7637-22.7539 36.3281-19.1895 36.3281-14.8438C36.3281-10.498 32.7637-6.93359 28.418-6.93359Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M61.6211-37.6953L77.5391-37.6953C86.2793-37.6953 90.1367-44.4336 86.1816-51.6602L77.2461-68.0176C73.8281-74.1699 65.3809-74.3164 61.9629-68.0664L52.9785-51.6602C49.0234-44.4336 52.8809-37.6953 61.6211-37.6953ZM64.4043-48.4375C63.6719-48.4375 63.3301-48.9746 63.7207-49.6582L68.8477-59.7168C69.2871-60.498 69.873-60.498 70.3125-59.7168L75.4395-49.6582C75.8301-48.9746 75.4883-48.4375 74.7559-48.4375Z"/>
+ <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M35.9375-40.1855C38.2324-37.8906 41.2598-38.2324 43.3594-40.332C45.3613-42.334 45.7031-45.5078 43.5059-47.7539L21.4355-69.873C19.2383-72.0703 15.8691-71.6797 13.9648-69.7266C11.9141-67.7246 11.6211-64.502 13.8184-62.3047ZM21.3379-40.1855L43.457-62.3047C45.6543-64.502 45.3613-67.7246 43.3105-69.7266C41.4062-71.6797 38.0371-72.0703 35.8398-69.873L13.7695-47.7539C11.5723-45.5078 11.9141-42.334 13.916-40.332C16.0156-38.2324 19.043-37.8906 21.3379-40.1855Z"/>
+ </g>
+ <g id="Regular-S" transform="matrix(1 0 0 1 1404.17 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M56.6406-0.0976562L73.5352-0.0976562C78.7598-0.0976562 81.3477-2.73438 81.3477-8.10547L81.3477-24.6094C81.3477-29.9316 78.7598-32.5684 73.5352-32.5684L56.6406-32.5684C51.416-32.5684 48.8281-29.9316 48.8281-24.6094L48.8281-8.10547C48.8281-2.73438 51.416-0.0976562 56.6406-0.0976562ZM56.7383-6.20117C55.5664-6.20117 54.9805-6.83594 54.9805-8.05664L54.9805-24.5605C54.9805-25.8301 55.5664-26.4648 56.7383-26.4648L73.4863-26.4648C74.6094-26.4648 75.1953-25.8301 75.1953-24.5605L75.1953-8.05664C75.1953-6.83594 74.6094-6.20117 73.4863-6.20117Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M26.416 0.390625C35.5957 0.390625 43.0664-7.03125 43.0664-16.2598C43.0664-25.4395 35.5957-32.8613 26.416-32.8613C17.1875-32.8613 9.76562-25.4395 9.76562-16.2598C9.76562-7.03125 17.1875 0.390625 26.416 0.390625ZM26.416-5.71289C20.6055-5.71289 15.8691-10.4492 15.8691-16.2598C15.8691-22.0703 20.6055-26.7578 26.416-26.7578C32.2266-26.7578 36.9141-22.0703 36.9141-16.2598C36.9141-10.4492 32.2266-5.71289 26.416-5.71289Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M52.5879-40.1367L77.5879-40.1367C81.1035-40.1367 82.5684-43.1641 80.8594-46.2402L68.7012-67.7246C66.8945-70.8984 63.2812-70.8984 61.4746-67.7246L49.3652-46.2402C47.6562-43.2617 49.0234-40.1367 52.5879-40.1367ZM56.3477-45.752C55.9082-45.752 55.7617-46.0449 55.957-46.4355L64.6973-61.9629C64.9414-62.3047 65.2344-62.3047 65.4785-61.9629L74.2676-46.4355C74.4629-46.0449 74.3164-45.752 73.877-45.752Z"/>
+ <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M36.2793-40.8203C37.4512-39.6484 39.3555-39.7949 40.4785-40.918C41.6504-42.0898 41.7969-43.9941 40.625-45.166L16.4062-69.3359C15.2832-70.459 13.3789-70.3613 12.2559-69.1895C11.084-68.0664 10.9863-66.1133 12.1094-64.9902ZM16.4551-40.8203L40.6738-64.9902C41.7969-66.1133 41.6504-68.0664 40.5273-69.1895C39.4043-70.3613 37.4512-70.459 36.3281-69.3359L12.1582-45.166C10.9863-43.9941 11.084-42.0898 12.3047-40.918C13.4277-39.7949 15.2832-39.6484 16.4551-40.8203Z"/>
+ </g>
+ <g id="Ultralight-S" transform="matrix(1 0 0 1 516.008 696)">
+ <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M52.6446-2.54979L72.5361-2.54979C75.8535-2.54979 77.6241-4.09667 77.6241-7.69678L77.6241-27.5156C77.6241-31.1577 75.8535-32.6592 72.5361-32.6592L52.6446-32.6592C49.3272-32.6592 47.5112-31.1577 47.5112-27.5156L47.5112-7.69678C47.5112-4.09667 49.3272-2.54979 52.6446-2.54979ZM52.7422-4.70265C50.5713-4.70265 49.6675-5.56446 49.6675-7.78418L49.6675-27.4214C49.6675-29.6445 50.5713-30.5063 52.7422-30.5063L72.3965-30.5063C74.6094-30.5063 75.4678-29.6445 75.4678-27.4214L75.4678-7.78418C75.4678-5.56446 74.6094-4.70265 72.3965-4.70265Z"/>
+ <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M25.4624-1.92527C34.0972-1.92527 41.1138-8.93846 41.1138-17.6221C41.1138-26.2568 34.0972-33.27 25.4624-33.27C16.7788-33.27 9.76562-26.2568 9.76562-17.6221C9.76562-8.93846 16.7788-1.92527 25.4624-1.92527ZM25.4624-4.07814C17.9717-4.07814 11.9185-10.1314 11.9185-17.6221C11.9185-25.0674 17.9717-31.1172 25.4624-31.1172C32.9077-31.1172 38.9575-25.0674 38.9575-17.6221C38.9575-10.1314 32.9077-4.07814 25.4624-4.07814Z"/>
+ <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M51.044-39.7734L74.0005-39.7734C77.0166-39.7734 77.9366-42.2105 76.6817-44.4693L65.1138-65.7266C63.8521-68.1738 61.2378-68.1284 59.9307-65.7266L48.4116-44.4693C47.1567-42.1719 48.0698-39.7734 51.044-39.7734ZM51.398-41.8921C50.2774-41.8921 49.813-42.6392 50.3262-43.6201L61.5186-64.188C62.126-65.2109 62.9639-65.2109 63.5259-64.188L74.7217-43.6201C75.2349-42.6392 74.7705-41.8921 73.6953-41.8921Z"/>
+ <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M37.46-41.1382C37.8599-40.7383 38.5381-40.7031 38.9346-41.145C39.3799-41.5449 39.3902-42.2232 38.9448-42.6685L13.4546-68.1099C13.0127-68.5518 12.3799-68.5449 11.938-68.0996C11.4927-67.7031 11.4858-67.0215 11.9277-66.625ZM13.458-41.1382L38.9483-66.625C39.3902-67.0215 39.3799-67.7031 38.938-68.0996C38.5415-68.5449 37.8599-68.5518 37.4634-68.1099L11.9312-42.6685C11.4858-42.2232 11.4927-41.5449 11.9414-41.145C12.3379-40.7031 13.0127-40.7383 13.458-41.1382Z"/>
+ </g>
+ </g>
+</svg>
diff --git a/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig b/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
index 614a01c9..8d7f86f4 100644
--- a/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
+++ b/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
@@ -11,5 +11,5 @@
// https://help.apple.com/xcode/#/dev745c5c974
APP_BUNDLE_IDENTIFIER = com.aoshuang.manicemu
-APP_BUILD_VERSION = 1
-APP_VERSION = 1.7.2
+APP_BUILD_VERSION = 2
+APP_VERSION = 1.7.3
diff --git a/ManicEmu/ManicEmu/Resources/Info.plist b/ManicEmu/ManicEmu/Resources/Info.plist
index 6e397e46..6253cda3 100644
--- a/ManicEmu/ManicEmu/Resources/Info.plist
+++ b/ManicEmu/ManicEmu/Resources/Info.plist
@@ -58,6 +58,18 @@
<string>public.aoshuang.game.nes</string>
</array>
</dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>FDS Game</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>public.aoshuang.game.fds</string>
+ </array>
+ </dict>
<dict>
<key>CFBundleTypeName</key>
<string>SNES Game</string>
@@ -587,12 +599,32 @@
<array>
<string>nes</string>
<string>fc</string>
- <string>fds</string>
<string>unf</string>
<string>unif</string>
</array>
</dict>
</dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>FDS Game</string>
+ <key>UTTypeIconFiles</key>
+ <array>
+ <string>file_icon.png</string>
+ </array>
+ <key>UTTypeIdentifier</key>
+ <string>public.aoshuang.game.fds</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>fds</string>
+ </array>
+ </dict>
+ </dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
diff --git a/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings
index 9521dd90..2f1fd14a 100644
--- a/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings
@@ -517,12 +517,12 @@
"ImportMissingFile" = "فشل استيراد %@: الملف %@ مفقود";
"MultiDiscBuilder" = "مساعد الأقراص المتعددة";
-"MultiDiscBuilderDesc" = "ينشئ ملفات .m3u قابلة للتبديل لألعاب متعددة الأقراص (.cue/.bin أو .chd). تخطى هذا إذا كان لديك ملف .m3u - استورده مباشرة عبر استيراد اللعبة";
+"MultiDiscBuilderDesc" = "ينشئ ملفات .m3u قابلة للتبديل لألعاب متعددة الأقراص (.cue(.bin) .cdi أو .chd). تخطى هذا إذا كان لديك ملف .m3u - استورده مباشرة عبر استيراد اللعبة";
"M3uFileShare" = "مشاركة ملف .m3u";
"M3uFileImport" = "إضافة إلى المكتبة";
"MultiDiscAddFile" = "إضافة ملف %@";
-"MultiDiscImportErrorConflict" = "خطأ: لا يمكن خلط ملفات .cue و .chd";
-"MultiDiscImportErrorMissing" = "خطأ: لم يتم العثور على ملفات .cue أو .chd";
+"MultiDiscImportErrorConflict" = "خطأ: لا يمكن خلط ملفات .cue .cdi و .chd";
+"MultiDiscImportErrorMissing" = "خطأ: لم يتم العثور على ملفات .cue .cdi أو .chd";
"GenerateM3uFailed" = "فشل إنشاء ملف .m3u";
"MultiDiscCloseAlert" = "تم إنشاء ملف .m3u. أغلق هذه الصفحة بعد استيراده إلى مكتبتك";
"MultiDiscContinueClose" = "متابعة الإغلاق";
@@ -703,3 +703,39 @@
"FDSAlert" = "هذا الخيار متاح فقط لألعاب FDS.";
"DiskSideChange" = "قلب القرص";
"EjectDisk" = "إخراج القرص";
+
+"TriggerProDesc" = "إنشاء وإدارة أزرار مخصصة متقدمة";
+"AddButton" = "إضافة زر";
+"ButtonStyle" = "نمط الزر";
+"Mapping" = "تعيين";
+"Action" = "الإجراء";
+"Classic" = "كلاسيكي";
+"Flat" = "مسطح";
+"Custom" = "مخصص";
+"Size" = "الحجم";
+"Opacity" = "الشفافية";
+"CornerRadius" = "نصف قطر الزاوية";
+"Simple" = "بسيط";
+"Hold" = "استمرار";
+"Combo" = "كومبو";
+"RepeatTrigger" = "تكثير المشغل";
+"RepeatInterval" = "فاصل التكرار";
+"AutoStop" = "توقف تلقائي";
+"HoldDuration" = "مدة الاستمرار";
+"PressDurationPerKey" = "مدة الضغط لكل مفتاح";
+"IntervalPerKey" = "الفاصل لكل مفتاح";
+"AddTriggerPro" = "إضافة TriggerPro";
+"SwitchPreviewSkin" = "تبديل سكين المعاينة";
+"SimpleActionDesc" = "انقر على زر TriggerPro لتفعيل جميع المفاتيح المعينة مرة واحدة فورًا";
+"HoldActionDesc" = "انقر على زر TriggerPro للاستمرار في الضغط على المفاتيح المعينة. انقر مرة أخرى للإفلات";
+"ComboActionDesc" = "انقر على زر TriggerPro لتفعيل المفاتيح المعينة بالتسلسل - مثالي للكومبو بنمط الأركيد";
+"NoMappingAlert" = "هذا الزر لا يحتوي حاليًا على أي تعيين ولن ينفذ أي إجراء. هل أنت متأكد من أنك تريد إغلاقه؟";
+"TriggerProName" = "اسم TriggerPro";
+"Position" = "الموضع";
+"ButtonInfo" = "معلومات الزر";
+"NoTriggerPro" = "لم يتم العثور على إعدادات TriggerPro. يمكنك الانتقال إلى الإعدادات أو الضغط مطولاً على خيار TriggerPro في قائمة اللعبة لإنشاء واحد";
+"ManageTriggerPro" = "إدارة TriggerPro";
+"EnableTriggerPro" = "تمكين TriggerPro";
+"DisableTriggerPro" = "تعطيل TriggerPro";
+"ActivateHold" = "تفعيل الاستمرار: %@";
+"DeactivateHold" = "إلغاء الاستمرار: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings
index d639b55f..b4cae708 100644
--- a/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings
@@ -542,12 +542,12 @@ Prem el botó del control...";
"ImportMissingFile" = "Error important %@: Falta fitxer %@";
"MultiDiscBuilder" = "Ajudant multidisc";
-"MultiDiscBuilderDesc" = "Crea fitxers .m3u intercanviables per jocs multidisc (.cue/.bin o .chd). Omet si ja tens .m3u - importa'l directament via Importar Joc";
+"MultiDiscBuilderDesc" = "Crea fitxers .m3u intercanviables per jocs multidisc (.cue(.bin) .cdi o .chd). Omet si ja tens .m3u - importa'l directament via Importar Joc";
"M3uFileShare" = "Compartir fitxer .m3u";
"M3uFileImport" = "Afegir a biblioteca";
"MultiDiscAddFile" = "Afegir fitxer %@";
-"MultiDiscImportErrorConflict" = "Error: No es poden barrejar .cue i .chd";
-"MultiDiscImportErrorMissing" = "Error: No s'han trobat fitxers .cue/.chd";
+"MultiDiscImportErrorConflict" = "Error: No es poden barrejar .cue .cdi i .chd";
+"MultiDiscImportErrorMissing" = "Error: No s'han trobat fitxers .cue/.cdi/.chd";
"GenerateM3uFailed" = "Error generant .m3u";
"MultiDiscCloseAlert" = "Fitxer .m3u generat. Tanca després d'importar";
"MultiDiscContinueClose" = "Tancar";
@@ -728,3 +728,39 @@ Prem el botó del control...";
"FDSAlert" = "Aquesta opció només està disponible per a jocs FDS.";
"DiskSideChange" = "Gira el Disc";
"EjectDisk" = "Expulsa el Disc";
+
+"TriggerProDesc" = "Crea i gestiona botons personalitzats avançats";
+"AddButton" = "Afegeix botó";
+"ButtonStyle" = "Estil del botó";
+"Mapping" = "Mapatge";
+"Action" = "Acció";
+"Classic" = "Clàssic";
+"Flat" = "Pla";
+"Custom" = "Personalitzat";
+"Size" = "Mida";
+"Opacity" = "Opacitat";
+"CornerRadius" = "Radi de la cantonada";
+"Simple" = "Simple";
+"Hold" = "Manté";
+"Combo" = "Combo";
+"RepeatTrigger" = "Repeteix el disparador";
+"RepeatInterval" = "Interval de repetició";
+"AutoStop" = "Aturada automàtica";
+"HoldDuration" = "Durada de la retenció";
+"PressDurationPerKey" = "Durada de la pressió per tecla";
+"IntervalPerKey" = "Interval per tecla";
+"AddTriggerPro" = "Afegeix TriggerPro";
+"SwitchPreviewSkin" = "Canvia l'aparença de previsualització";
+"SimpleActionDesc" = "Toqueu el botó TriggerPro per activar instantàniament totes les tecles mapades alhora";
+"HoldActionDesc" = "Toqueu el botó TriggerPro per mantenir les tecles mapades premudes. Toqueu de nou per alliberar";
+"ComboActionDesc" = "Toqueu el botó TriggerPro per activar les tecles mapades en seqüència - perfecte per a combos d'estil arcade";
+"NoMappingAlert" = "Aquest botó no té cap mapatge actualment i no realitzarà cap acció. Esteu segur que voleu tancar-lo?";
+"TriggerProName" = "Nom del TriggerPro";
+"Position" = "Posició";
+"ButtonInfo" = "Informació del botó";
+"NoTriggerPro" = "No s'ha trobat cap configuració de TriggerPro. Podeu anar a Configuració o mantenir premuda l'opció TriggerPro al Menú del Joc per crear-ne una";
+"ManageTriggerPro" = "Gestiona TriggerPro";
+"EnableTriggerPro" = "Habilita TriggerPro";
+"DisableTriggerPro" = "Deshabilita TriggerPro";
+"ActivateHold" = "Activa la retenció: %@";
+"DeactivateHold" = "Cancel·la la retenció: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings
index f58063a6..2a6f32b8 100644
--- a/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings
@@ -538,12 +538,12 @@ Stiskněte tlačítko ovladače...";
"ImportMissingFile" = "Chyba při importu %@: Soubor %@ nebyl nalezen";
"MultiDiscBuilder" = "Pomocník pro více disků";
-"MultiDiscBuilderDesc" = "Vytváří vyměnitelné .m3u soubory pro hry na více discích (.cue/.bin nebo .chd). Přeskočte, pokud již .m3u máte – importujte přímo přes Import her";
+"MultiDiscBuilderDesc" = "Vytváří vyměnitelné .m3u soubory pro hry na více discích (.cue(.bin) .cdi nebo .chd). Přeskočte, pokud již .m3u máte – importujte přímo přes Import her";
"M3uFileShare" = "Sdílet .m3u soubor";
"M3uFileImport" = "Přidat do knihovny";
"MultiDiscAddFile" = "Přidat soubor %@";
-"MultiDiscImportErrorConflict" = "Chyba: Nelze kombinovat .cue a .chd soubory";
-"MultiDiscImportErrorMissing" = "Chyba: Nenalezeny .cue/.chd soubory";
+"MultiDiscImportErrorConflict" = "Chyba: Nelze kombinovat .cue .cdi a .chd soubory";
+"MultiDiscImportErrorMissing" = "Chyba: Nenalezeny .cue/.cdi/.chd soubory";
"GenerateM3uFailed" = "Chyba při vytváření .m3u";
"MultiDiscCloseAlert" = ".m3u vytvořen. Po importu zavřete";
"MultiDiscContinueClose" = "Zavřít";
@@ -724,3 +724,39 @@ Stiskněte tlačítko ovladače...";
"FDSAlert" = "Tato volba je dostupná pouze pro hry FDS.";
"DiskSideChange" = "Otočit disk";
"EjectDisk" = "Vysunout disk";
+
+"TriggerProDesc" = "Vytvářejte a spravujte pokročilá vlastní tlačítka";
+"AddButton" = "Přidat tlačítko";
+"ButtonStyle" = "Styl tlačítka";
+"Mapping" = "Mapování";
+"Action" = "Akce";
+"Classic" = "Klasický";
+"Flat" = "Plochý";
+"Custom" = "Vlastní";
+"Size" = "Velikost";
+"Opacity" = "Neprůhlednost";
+"CornerRadius" = "Poloměr rohu";
+"Simple" = "Jednoduchý";
+"Hold" = "Podržení";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Opakovat spouštěč";
+"RepeatInterval" = "Interval opakování";
+"AutoStop" = "Automatické zastavení";
+"HoldDuration" = "Doba podržení";
+"PressDurationPerKey" = "Doba stisku na klávesu";
+"IntervalPerKey" = "Interval na klávesu";
+"AddTriggerPro" = "Přidat TriggerPro";
+"SwitchPreviewSkin" = "Přepnout skin náhledu";
+"SimpleActionDesc" = "Klepněte na tlačítko TriggerPro pro okamžité spuštění všech mapovaných kláves najednou";
+"HoldActionDesc" = "Klepněte na tlačítko TriggerPro pro podržení mapovaných kláves. Klepněte znovu pro uvolnění";
+"ComboActionDesc" = "Klepněte na tlačítko TriggerPro pro spuštění mapovaných kláves v pořadí - ideální pro arkády";
+"NoMappingAlert" = "Toto tlačítko nemá žádné mapování a neprovede žádnou akci. Opravdu jej chcete zavřít?";
+"TriggerProName" = "Název TriggerPro";
+"Position" = "Pozice";
+"ButtonInfo" = "Informace o tlačítku";
+"NoTriggerPro" = "Nebyla nalezena žádná konfigurace TriggerPro. Můžete přejít do Nastavení nebo podržet volbu TriggerPro v Herní nabídce pro vytvoření";
+"ManageTriggerPro" = "Spravovat TriggerPro";
+"EnableTriggerPro" = "Povolit TriggerPro";
+"DisableTriggerPro" = "Zakázat TriggerPro";
+"ActivateHold" = "Aktivovat podržení: %@";
+"DeactivateHold" = "Zrušit podržení: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings
index 8e89ad09..85bbe7ae 100644
--- a/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings
@@ -540,12 +540,12 @@ Tryk på controller-knappen...";
"ImportMissingFile" = "Kunne ikke importere %@: Mangler fil %@";
"MultiDiscBuilder" = "Multidisk-værktøj";
-"MultiDiscBuilderDesc" = "Opretter skiftbare .m3u-filer til multidisk-spil (.cue/.bin eller .chd). Spring over hvis du allerede har .m3u - importer direkte via Spilimport";
+"MultiDiscBuilderDesc" = "Opretter skiftbare .m3u-filer til multidisk-spil (.cue(.bin) .cdi eller .chd). Spring over hvis du allerede har .m3u - importer direkte via Spilimport";
"M3uFileShare" = "Del .m3u-fil";
"M3uFileImport" = "Tilføj til bibliotek";
"MultiDiscAddFile" = "Tilføj %@-fil";
-"MultiDiscImportErrorConflict" = "Fejl: Bland ikke .cue og .chd";
-"MultiDiscImportErrorMissing" = "Fejl: Ingen .cue/.chd-filer";
+"MultiDiscImportErrorConflict" = "Fejl: Bland ikke .cue .cdi og .chd";
+"MultiDiscImportErrorMissing" = "Fejl: Ingen .cue/.cdi/.chd-filer";
"GenerateM3uFailed" = "Kunne ikke generere .m3u";
"MultiDiscCloseAlert" = ".m3u oprettet. Luk efter import";
"MultiDiscContinueClose" = "Luk";
@@ -726,3 +726,39 @@ Tryk på controller-knappen...";
"FDSAlert" = "Denne indstilling er kun tilgængelig for FDS-spil.";
"DiskSideChange" = "Vend Disk";
"EjectDisk" = "Udkast Disk";
+
+"TriggerProDesc" = "Opret og administrer avancerede brugerdefinerede knapper";
+"AddButton" = "Tilføj knap";
+"ButtonStyle" = "Knappestil";
+"Mapping" = "Mapping";
+"Action" = "Handling";
+"Classic" = "Klassisk";
+"Flat" = "Flad";
+"Custom" = "Brugerdefineret";
+"Size" = "Størrelse";
+"Opacity" = "Uigennemsigtighed";
+"CornerRadius" = "Hjørneradius";
+"Simple" = "Enkel";
+"Hold" = "Hold";
+"Combo" = "Kombination";
+"RepeatTrigger" = "Gentag udløser";
+"RepeatInterval" = "Gentagelsesinterval";
+"AutoStop" = "Auto stop";
+"HoldDuration" = "Holdetid";
+"PressDurationPerKey" = "Tryktid per tast";
+"IntervalPerKey" = "Interval per tast";
+"AddTriggerPro" = "Tilføj TriggerPro";
+"SwitchPreviewSkin" = "Skift forhåndsvisningsskin";
+"SimpleActionDesc" = "Tryk på TriggerPro-knappen for øjeblikkeligt at udløse alle mappede taster på én gang";
+"HoldActionDesc" = "Tryk på TriggerPro-knappen for at holde de mappede taster nede. Tryk igen for at frigive";
+"ComboActionDesc" = "Tryk på TriggerPro-knappen for at udløse de mappede taster i rækkefølge - perfekt til arkade-kombinationer";
+"NoMappingAlert" = "Denne knap har i øjeblikket ingen mapping og vil ikke udføre nogen handling. Er du sikker på, at du vil lukke den?";
+"TriggerProName" = "TriggerPro-navn";
+"Position" = "Position";
+"ButtonInfo" = "Knappeinformation";
+"NoTriggerPro" = "Ingen TriggerPro-konfiguration fundet. Du kan gå til Indstillinger eller holde nede på TriggerPro-indstillingen i Spilmenuen for at oprette en";
+"ManageTriggerPro" = "Administrer TriggerPro";
+"EnableTriggerPro" = "Aktivér TriggerPro";
+"DisableTriggerPro" = "Deaktivér TriggerPro";
+"ActivateHold" = "Aktivér hold: %@";
+"DeactivateHold" = "Annullér hold: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings
index 6775fbaa..6d846f45 100644
--- a/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings
@@ -544,12 +544,12 @@ Drücke die Controller-Taste...";
"ImportMissingFile" = "Fehler beim Import von %@: Datei %@ fehlt";
"MultiDiscBuilder" = "MultiDisc-Assistent";
-"MultiDiscBuilderDesc" = "Erstellt wechselbare .m3u-Dateien für Multi-Disc-Spiele (.cue/.bin oder .chd). Überspringen, wenn bereits .m3u vorhanden – direkt über Spielimport hinzufügen";
+"MultiDiscBuilderDesc" = "Erstellt wechselbare .m3u-Dateien für Multi-Disc-Spiele (.cue(.bin) .cdi oder .chd). Überspringen, wenn bereits .m3u vorhanden – direkt über Spielimport hinzufügen";
"M3uFileShare" = ".m3u-Datei teilen";
"M3uFileImport" = "Zur Bibliothek hinzufügen";
"MultiDiscAddFile" = "%@-Datei hinzufügen";
-"MultiDiscImportErrorConflict" = "Fehler: .cue und .chd können nicht gemischt werden";
-"MultiDiscImportErrorMissing" = "Fehler: Keine .cue/.chd-Dateien gefunden";
+"MultiDiscImportErrorConflict" = "Fehler: .cue .cdi und .chd können nicht gemischt werden";
+"MultiDiscImportErrorMissing" = "Fehler: Keine .cue/.cdi/.chd-Dateien gefunden";
"GenerateM3uFailed" = ".m3u-Erstellung fehlgeschlagen";
"MultiDiscCloseAlert" = ".m3u erstellt. Seite nach Import schließen";
"MultiDiscContinueClose" = "Schließen";
@@ -730,3 +730,39 @@ Drücke die Controller-Taste...";
"FDSAlert" = "Diese Option ist nur für FDS-Spiele verfügbar.";
"DiskSideChange" = "Diskette Wenden";
"EjectDisk" = "Diskette Auswerfen";
+
+"TriggerProDesc" = "Erstellen und Verwalten erweiterter benutzerdefinierter Tasten";
+"AddButton" = "Taste hinzufügen";
+"ButtonStyle" = "Tastenstil";
+"Mapping" = "Tastenbelegung";
+"Action" = "Aktion";
+"Classic" = "Klassisch";
+"Flat" = "Flach";
+"Custom" = "Benutzerdefiniert";
+"Size" = "Größe";
+"Opacity" = "Deckkraft";
+"CornerRadius" = "Eckenradius";
+"Simple" = "Einfach";
+"Hold" = "Halten";
+"Combo" = "Kombination";
+"RepeatTrigger" = "Wiederholungsauslöser";
+"RepeatInterval" = "Wiederholungsintervall";
+"AutoStop" = "Automatischer Stop";
+"HoldDuration" = "Haltezeit";
+"PressDurationPerKey" = "Gedrückthaltezeit pro Taste";
+"IntervalPerKey" = "Intervall pro Taste";
+"AddTriggerPro" = "TriggerPro hinzufügen";
+"SwitchPreviewSkin" = "Vorschau-Skin wechseln";
+"SimpleActionDesc" = "Tippe auf die TriggerPro-Taste, um alle zugeordneten Tasten sofort gleichzeitig auszulösen";
+"HoldActionDesc" = "Tippe auf die TriggerPro-Taste, um die zugeordneten Tasten gedrückt zu halten. Nochmaliges Tippen löst sie";
+"ComboActionDesc" = "Tippe auf die TriggerPro-Taste, um die zugeordneten Tasten in Sequenz auszulösen - perfekt für Arcade-Kombinationen";
+"NoMappingAlert" = "Diese Taste hat derzeit keine Zuordnung und wird keine Aktion ausführen. Bist du sicher, dass du sie schließen möchtest?";
+"TriggerProName" = "TriggerPro-Name";
+"Position" = "Position";
+"ButtonInfo" = "Tasteninfo";
+"NoTriggerPro" = "Keine TriggerPro-Konfiguration gefunden. Du kannst zu den Einstellungen gehen oder im Spielmenü die TriggerPro-Option lang drücken, um eine zu erstellen";
+"ManageTriggerPro" = "TriggerPro verwalten";
+"EnableTriggerPro" = "TriggerPro aktivieren";
+"DisableTriggerPro" = "TriggerPro deaktivieren";
+"ActivateHold" = "Halten aktivieren: %@";
+"DeactivateHold" = "Halten abbrechen: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings
index 6060eb38..4b6be4b6 100644
--- a/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings
@@ -543,12 +543,12 @@
"ImportMissingFile" = "Αποτυχία εισαγωγής %@: Λείπει το αρχείο %@";
"MultiDiscBuilder" = "Βοηθός Πολλαπλών Δίσκων";
-"MultiDiscBuilderDesc" = "Δημιουργεί .m3u αρχεία για παιχνίδια πολλαπλών δίσκων (.cue/.bin ή .chd). Παραλείψτε αν έχετε ήδη .m3u - εισάγετε απευθείας μέσω Εισαγωγής Παιχνιδιού";
+"MultiDiscBuilderDesc" = "Δημιουργεί .m3u αρχεία για παιχνίδια πολλαπλών δίσκων (.cue(.bin) .cdi ή .chd). Παραλείψτε αν έχετε ήδη .m3u - εισάγετε απευθείας μέσω Εισαγωγής Παιχνιδιού";
"M3uFileShare" = "Κοινοποίηση .m3u";
"M3uFileImport" = "Προσθήκη στη βιβλιοθήκη";
"MultiDiscAddFile" = "Προσθήκη αρχείου %@";
-"MultiDiscImportErrorConflict" = "Σφάλμα: Αδυναμία ανάμειξης .cue και .chd";
-"MultiDiscImportErrorMissing" = "Σφάλμα: Δεν βρέθηκαν .cue/.chd αρχεία";
+"MultiDiscImportErrorConflict" = "Σφάλμα: Αδυναμία ανάμειξης .cue .cdi και .chd";
+"MultiDiscImportErrorMissing" = "Σφάλμα: Δεν βρέθηκαν .cue/.cdi/.chd αρχεία";
"GenerateM3uFailed" = "Αποτυχία δημιουργίας .m3u";
"MultiDiscCloseAlert" = ".m3u δημιουργήθηκε. Κλείστε μετά την εισαγωγή";
"MultiDiscContinueClose" = "Κλείσιμο";
@@ -729,3 +729,39 @@
"FDSAlert" = "Αυτή η επιλογή είναι διαθέσιμη μόνο για παιχνίδια FDS.";
"DiskSideChange" = "Αναστροφή Δίσκου";
"EjectDisk" = "Απέκτωση Δίσκου";
+
+"TriggerProDesc" = "Δημιουργία και διαχείριση προηγμένων προσαρμοσμένων κουμπιών";
+"AddButton" = "Προσθήκη κουμπιού";
+"ButtonStyle" = "Στυλ κουμπιού";
+"Mapping" = "Αντιστοίχιση";
+"Action" = "Ενέργεια";
+"Classic" = "Κλασικό";
+"Flat" = "Επίπεδο";
+"Custom" = "Προσαρμοσμένο";
+"Size" = "Μέγεθος";
+"Opacity" = "Αδιαφάνεια";
+"CornerRadius" = "Ακτίνα γωνίας";
+"Simple" = "Απλό";
+"Hold" = "Κράτηση";
+"Combo" = "Συνδυασμός";
+"RepeatTrigger" = "Επανάληψη ενεργοποίησης";
+"RepeatInterval" = "Διάστημα επανάληψης";
+"AutoStop" = "Αυτόματη διακοπή";
+"HoldDuration" = "Διάρκεια κράτησης";
+"PressDurationPerKey" = "Διάρκεια πίεσης ανά πλήκτρο";
+"IntervalPerKey" = "Διάστημα ανά πλήκτρο";
+"AddTriggerPro" = "Προσθήκη TriggerPro";
+"SwitchPreviewSkin" = "Αλλαγή skin προεπισκόπησης";
+"SimpleActionDesc" = "Πατήστε το κουμπί TriggerPro για να ενεργοποιήσετε αμέσως όλα τα αντιστοιχισμένα πλήκτρα ταυτόχρονα";
+"HoldActionDesc" = "Πατήστε το κουμπί TriggerPro για να κρατήσετε πατημένα τα αντιστοιχισμένα πλήκτρα. Πατήστε ξανά για απελευθέρωση";
+"ComboActionDesc" = "Πατήστε το κουμπί TriggerPro για να ενεργοποιήσετε τα αντιστοιχισμένα πλήκτρα διαδοχικά - ιδανικό για συνδυασμούς στυλ arcade";
+"NoMappingAlert" = "Αυτό το κουμπί δεν έχει αντιστοίχιση και δεν θα εκτελέσει καμία ενέργεια. Είστε σίγουροι ότι θέλετε να το κλείσετε;";
+"TriggerProName" = "Όνομα TriggerPro";
+"Position" = "Θέση";
+"ButtonInfo" = "Πληροφορίες κουμπιού";
+"NoTriggerPro" = "Δεν βρέθηκε διαμόρφωση TriggerPro. Μπορείτε να μεταβείτε στις Ρυθμίσεις ή να κρατήσετε πατημένη την επιλογή TriggerPro στο Μενού Παιχνιδιού για δημιουργία";
+"ManageTriggerPro" = "Διαχείριση TriggerPro";
+"EnableTriggerPro" = "Ενεργοποίηση TriggerPro";
+"DisableTriggerPro" = "Απενεργοποίηση TriggerPro";
+"ActivateHold" = "Ενεργοποίηση κράτησης: %@";
+"DeactivateHold" = "Ακύρωση κράτησης: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
index 517cbf89..13ce6399 100644
--- a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
@@ -553,12 +553,12 @@ Press the controller button to complete mapping...";
"ImportMissingFile" = "Failed to import %@: Missing file %@";
"MultiDiscBuilder" = "MultiDisc Helper";
-"MultiDiscBuilderDesc" = "The MultiDisc Helper creates disc-swappable .m3u files for multi-disc games (.cue/.bin or .chd). Skip this if you already have an .m3u file – import it directly via Game Import.";
+"MultiDiscBuilderDesc" = "The MultiDisc Helper creates disc-swappable .m3u files for multi-disc games (.cue(.bin) .cdi or .chd). Skip this if you already have an .m3u file – import it directly via Game Import.";
"M3uFileShare" = "Share .m3u File";
"M3uFileImport" = "Add to Library";
"MultiDiscAddFile" = "Add %@ File";
-"MultiDiscImportErrorConflict" = "Error: Cannot mix .cue and .chd files";
-"MultiDiscImportErrorMissing" = "Error: No .cue or .chd files found";
+"MultiDiscImportErrorConflict" = "Error: Cannot mix .cue .cdi and .chd files";
+"MultiDiscImportErrorMissing" = "Error: No .cue .cdi or .chd files found";
"GenerateM3uFailed" = "Failed to generate .m3u file";
"MultiDiscCloseAlert" = ".m3u file generated. Close this page after importing it to your library.";
"MultiDiscContinueClose" = "Continue Closing";
@@ -743,3 +743,39 @@ Press the controller button to complete mapping...";
"FDSAlert" = "This option is only available for FDS games.";
"DiskSideChange" = "Flip Disk";
"EjectDisk" = "Eject Disk";
+
+"TriggerProDesc" = "Create and manage advanced custom buttons.";
+"AddButton" = "Add Button";
+"ButtonStyle" = "Button Style";
+"Mapping" = "Mapping";
+"Action" = "Action";
+"Classic" = "Classic";
+"Flat" = "Flat";
+"Custom" = "Custom";
+"Size" = "Size";
+"Opacity" = "Opacity";
+"CornerRadius" = "Corner Radius";
+"Simple" = "Simple";
+"Hold" = "Hold";
+"Combo" = "Combo";
+"RepeatTrigger" = "Repeat Trigger";
+"RepeatInterval" = "Repeat Interval";
+"AutoStop" = "Auto Stop";
+"HoldDuration" = "Hold Duration";
+"PressDurationPerKey" = "Press Duration per Key";
+"IntervalPerKey" = "Interval per Key";
+"AddTriggerPro" = "Add TriggerPro";
+"SwitchPreviewSkin" = "Switch Preview Skin";
+"SimpleActionDesc" = "Tap the TriggerPro button to instantly trigger all mapped keys at once.";
+"HoldActionDesc" = "Tap the TriggerPro button to hold down the mapped keys. Tap again to release.";
+"ComboActionDesc" = "Tap the TriggerPro button to trigger the mapped keys in sequence—perfect for arcade-style combos.";
+"NoMappingAlert" = "This button currently has no mapping and will not perform any action. Are you sure you want to close it?";
+"TriggerProName" = "TriggerPro Name";
+"Position" = "Position";
+"ButtonInfo" = "Button Info";
+"NoTriggerPro" = "No TriggerPro configuration found. You can go to Settings or long-press the TriggerPro option in the Game Menu to create one.";
+"ManageTriggerPro" = "Manage TriggerPro";
+"EnableTriggerPro" = "Enable TriggerPro";
+"DisableTriggerPro" = "Disable TriggerPro";
+"ActivateHold" = "Activate Hold: %@";
+"DeactivateHold" = "Cancel Hold: %@";
diff --git a/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings
index 25bef0b7..10cf0b32 100644
--- a/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings
@@ -542,12 +542,12 @@ Presiona el botón del control para continuar...";
"ImportMissingFile" = "Error al importar %@: Archivo %@ faltante";
"MultiDiscBuilder" = "Asistente multidisco";
-"MultiDiscBuilderDesc" = "Crea archivos .m3u intercambiables para juegos multidisco (.cue/.bin o .chd). Saltea esto si ya tienes .m3u - impórtalo directamente en Importar Juegos";
+"MultiDiscBuilderDesc" = "Crea archivos .m3u intercambiables para juegos multidisco (.cue(.bin) .cdi o .chd). Saltea esto si ya tienes .m3u - impórtalo directamente en Importar Juegos";
"M3uFileShare" = "Compartir archivo .m3u";
"M3uFileImport" = "Agregar a biblioteca";
"MultiDiscAddFile" = "Agregar archivo %@";
-"MultiDiscImportErrorConflict" = "Error: No se pueden mezclar archivos .cue y .chd";
-"MultiDiscImportErrorMissing" = "Error: No hay archivos .cue/.chd";
+"MultiDiscImportErrorConflict" = "Error: No se pueden mezclar archivos .cue .cdi y .chd";
+"MultiDiscImportErrorMissing" = "Error: No hay archivos .cue/.cdi/.chd";
"GenerateM3uFailed" = "Error al generar .m3u";
"MultiDiscCloseAlert" = ".m3u generado. Cierra esta página después de importarlo";
"MultiDiscContinueClose" = "Cerrar";
@@ -728,3 +728,39 @@ Presiona el botón del control para continuar...";
"FDSAlert" = "Esta opción solo está disponible para juegos FDS.";
"DiskSideChange" = "Voltear Disco";
"EjectDisk" = "Expulsar Disco";
+
+"TriggerProDesc" = "Crear y administrar botones personalizados avanzados";
+"AddButton" = "Agregar botón";
+"ButtonStyle" = "Estilo de botón";
+"Mapping" = "Mapeo";
+"Action" = "Acción";
+"Classic" = "Clásico";
+"Flat" = "Plano";
+"Custom" = "Personalizado";
+"Size" = "Tamaño";
+"Opacity" = "Opacidad";
+"CornerRadius" = "Radio de esquina";
+"Simple" = "Simple";
+"Hold" = "Mantener";
+"Combo" = "Combo";
+"RepeatTrigger" = "Repetir gatillo";
+"RepeatInterval" = "Intervalo de repetición";
+"AutoStop" = "Detención automática";
+"HoldDuration" = "Duración de mantenimiento";
+"PressDurationPerKey" = "Duración de pulsación por tecla";
+"IntervalPerKey" = "Intervalo por tecla";
+"AddTriggerPro" = "Agregar TriggerPro";
+"SwitchPreviewSkin" = "Cambiar skin de vista previa";
+"SimpleActionDesc" = "Toca el botón TriggerPro para activar instantáneamente todas las teclas mapeadas a la vez";
+"HoldActionDesc" = "Toca el botón TriggerPro para mantener presionadas las teclas mapeadas. Toca de nuevo para soltar";
+"ComboActionDesc" = "Toca el botón TriggerPro para activar las teclas mapeadas en secuencia, perfecto para combos estilo arcade";
+"NoMappingAlert" = "Este botón no tiene mapeo actualmente y no realizará ninguna acción. ¿Estás seguro de que quieres cerrarlo?";
+"TriggerProName" = "Nombre de TriggerPro";
+"Position" = "Posición";
+"ButtonInfo" = "Información del botón";
+"NoTriggerPro" = "No se encontró configuración de TriggerPro. Puedes ir a Configuración o mantener presionada la opción TriggerPro en el Menú del juego para crear una";
+"ManageTriggerPro" = "Administrar TriggerPro";
+"EnableTriggerPro" = "Habilitar TriggerPro";
+"DisableTriggerPro" = "Deshabilitar TriggerPro";
+"ActivateHold" = "Activar mantenimiento: %@";
+"DeactivateHold" = "Cancelar mantenimiento: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings
index dffbe4b8..363a062a 100644
--- a/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings
@@ -517,12 +517,12 @@ Presiona el botón del control para completar...";
"ImportMissingFile" = "Error al importar %@: Falta el archivo %@";
"MultiDiscBuilder" = "Asistente multidisco";
-"MultiDiscBuilderDesc" = "El Asistente multidisco crea archivos .m3u intercambiables para juegos multidisco (.cue/.bin o .chd). Omite esto si ya tienes un .m3u - impórtalo directamente mediante Importar Juego";
+"MultiDiscBuilderDesc" = "El Asistente multidisco crea archivos .m3u intercambiables para juegos multidisco (.cue(.bin) .cdi o .chd). Omite esto si ya tienes un .m3u - impórtalo directamente mediante Importar Juego";
"M3uFileShare" = "Compartir archivo .m3u";
"M3uFileImport" = "Añadir a biblioteca";
"MultiDiscAddFile" = "Añadir archivo %@";
-"MultiDiscImportErrorConflict" = "Error: No se pueden mezclar archivos .cue y .chd";
-"MultiDiscImportErrorMissing" = "Error: No se encontraron archivos .cue o .chd";
+"MultiDiscImportErrorConflict" = "Error: No se pueden mezclar archivos .cue .cdi y .chd";
+"MultiDiscImportErrorMissing" = "Error: No se encontraron archivos .cue .cdi o .chd";
"GenerateM3uFailed" = "Error al generar archivo .m3u";
"MultiDiscCloseAlert" = "Archivo .m3u generado. Cierra esta página tras importarlo a tu biblioteca";
"MultiDiscContinueClose" = "Cerrar";
@@ -703,3 +703,39 @@ Presiona el botón del control para completar...";
"FDSAlert" = "Esta opción solo está disponible para juegos FDS.";
"DiskSideChange" = "Voltear Disco";
"EjectDisk" = "Expulsar Disco";
+
+"TriggerProDesc" = "Crear y gestionar botones personalizados avanzados";
+"AddButton" = "Añadir botón";
+"ButtonStyle" = "Estilo de botón";
+"Mapping" = "Mapeo";
+"Action" = "Acción";
+"Classic" = "Clásico";
+"Flat" = "Plano";
+"Custom" = "Personalizado";
+"Size" = "Tamaño";
+"Opacity" = "Opacidad";
+"CornerRadius" = "Radio de esquina";
+"Simple" = "Simple";
+"Hold" = "Mantener";
+"Combo" = "Combo";
+"RepeatTrigger" = "Repetir disparador";
+"RepeatInterval" = "Intervalo de repetición";
+"AutoStop" = "Parada automática";
+"HoldDuration" = "Duración de mantenimiento";
+"PressDurationPerKey" = "Duración de pulsación por tecla";
+"IntervalPerKey" = "Intervalo por tecla";
+"AddTriggerPro" = "Añadir TriggerPro";
+"SwitchPreviewSkin" = "Cambiar skin de vista previa";
+"SimpleActionDesc" = "Toca el botón TriggerPro para activar instantáneamente todas las teclas mapeadas a la vez";
+"HoldActionDesc" = "Toca el botón TriggerPro para mantener pulsadas las teclas mapeadas. Toca de nuevo para liberar";
+"ComboActionDesc" = "Toca el botón TriggerPro para activar las teclas mapeadas en secuencia, ideal para combos al estilo arcade";
+"NoMappingAlert" = "Este botón no tiene mapeo actualmente y no realizará ninguna acción. ¿Seguro que quieres cerrarlo?";
+"TriggerProName" = "Nombre de TriggerPro";
+"Position" = "Posición";
+"ButtonInfo" = "Información del botón";
+"NoTriggerPro" = "No se encontró configuración de TriggerPro. Puedes ir a Ajustes o mantener pulsada la opción TriggerPro en el Menú del juego para crear una";
+"ManageTriggerPro" = "Gestionar TriggerPro";
+"EnableTriggerPro" = "Activar TriggerPro";
+"DisableTriggerPro" = "Desactivar TriggerPro";
+"ActivateHold" = "Activar mantenimiento: %@";
+"DeactivateHold" = "Cancelar mantenimiento: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings
index 7e2c549d..b6fa64be 100644
--- a/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings
@@ -543,12 +543,12 @@ Paina ohjaimen nappia...";
"ImportMissingFile" = "%@-tuonti epäonnistui: Tiedostoa %@ ei löydy";
"MultiDiscBuilder" = "Monilevyavustin";
-"MultiDiscBuilderDesc" = "Luo levyjä vaihdettavia .m3u-tiedostoja monilevyisille peleille (.cue/.bin tai .chd). Ohita jos sinulla on jo .m3u - tuo suoraan Pelituonnissa";
+"MultiDiscBuilderDesc" = "Luo levyjä vaihdettavia .m3u-tiedostoja monilevyisille peleille (.cue(.bin) .cdi tai .chd). Ohita jos sinulla on jo .m3u - tuo suoraan Pelituonnissa";
"M3uFileShare" = "Jaa .m3u-tiedosto";
"M3uFileImport" = "Lisää kirjastoon";
"MultiDiscAddFile" = "Lisää %@-tiedosto";
-"MultiDiscImportErrorConflict" = "Virhe: .cue ja .chd tiedostoja ei voi sekoittaa";
-"MultiDiscImportErrorMissing" = "Virhe: .cue/.chd tiedostoja ei löytynyt";
+"MultiDiscImportErrorConflict" = "Virhe: .cue .cdi ja .chd tiedostoja ei voi sekoittaa";
+"MultiDiscImportErrorMissing" = "Virhe: .cue/.cdi/.chd tiedostoja ei löytynyt";
"GenerateM3uFailed" = ".m3u-tiedoston luonti epäonnistui";
"MultiDiscCloseAlert" = ".m3u luotu. Sulje sivu tuonnin jälkeen";
"MultiDiscContinueClose" = "Sulje";
@@ -729,3 +729,39 @@ Paina ohjaimen nappia...";
"FDSAlert" = "Tämä vaihtoehto on saatavilla vain FDS-peleissä.";
"DiskSideChange" = "Käännä Levy";
"EjectDisk" = "Poista Levy";
+
+"TriggerProDesc" = "Luo ja hallinna kehittyneitä mukautettuja painikkeita";
+"AddButton" = "Lisää painike";
+"ButtonStyle" = "Painikkeen tyyli";
+"Mapping" = "Määrittely";
+"Action" = "Toiminto";
+"Classic" = "Klassinen";
+"Flat" = "Litteä";
+"Custom" = "Mukautettu";
+"Size" = "Koko";
+"Opacity" = "Läpinäkyvyys";
+"CornerRadius" = "Kulman säde";
+"Simple" = "Yksinkertainen";
+"Hold" = "Pidä";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Toista laukaisin";
+"RepeatInterval" = "Toistoväli";
+"AutoStop" = "Automaattinen pysäytys";
+"HoldDuration" = "Pidon kesto";
+"PressDurationPerKey" = "Painon kesto per näppäin";
+"IntervalPerKey" = "Väli per näppäin";
+"AddTriggerPro" = "Lisää TriggerPro";
+"SwitchPreviewSkin" = "Vaihda esikatselukuorta";
+"SimpleActionDesc" = "Napauta TriggerPro-painiketta laukaistaksesi kaikki määritellyt näppäimet heti kerralla";
+"HoldActionDesc" = "Napauta TriggerPro-painiketta pitääksesi määritellyt näppäimet painettuna. Napauta uudelleen vapauttaaksesi";
+"ComboActionDesc" = "Napauta TriggerPro-painiketta laukaistaksesi määritellyt näppäimet peräkkäin - täydellinen arcade-tyylisille kombinaatioille";
+"NoMappingAlert" = "Tällä painikkeella ei ole tällä hetkellä määrittelyä, eikä se suorita mitään toimintoa. Oletko varma, että haluat sulkea sen?";
+"TriggerProName" = "TriggerPro-nimi";
+"Position" = "Sijainti";
+"ButtonInfo" = "Painiketiedot";
+"NoTriggerPro" = "TriggerPro-määritystä ei löytynyt. Voit siirtyä Asetuksiin tai painaa pitkään TriggerPro-vaihtoehtoa Pelivalikossa luodaksesi sellaisen";
+"ManageTriggerPro" = "Hallinnoi TriggerProa";
+"EnableTriggerPro" = "Ota TriggerPro käyttöön";
+"DisableTriggerPro" = "Poista TriggerPro käytöstä";
+"ActivateHold" = "Aktivoi pito: %@";
+"DeactivateHold" = "Peru pito: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings
index 2559ce08..11318edd 100644
--- a/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings
@@ -544,12 +544,12 @@ Appuyez sur le bouton du contrôleur...";
"ImportMissingFile" = "Échec importation %@ : Fichier %@ manquant";
"MultiDiscBuilder" = "Outil multidisc";
-"MultiDiscBuilderDesc" = "Crée des .m3u échangeables pour jeux multidisc (.cue/.bin/.chd). Passez si vous avez déjà un .m3u - importez-le via Importer Jeu";
+"MultiDiscBuilderDesc" = "Crée des .m3u échangeables pour jeux multidisc (.cue(.bin) .cdi/.chd). Passez si vous avez déjà un .m3u - importez-le via Importer Jeu";
"M3uFileShare" = "Partager .m3u";
"M3uFileImport" = "Ajouter à bibliothèque";
"MultiDiscAddFile" = "Ajouter fichier %@";
-"MultiDiscImportErrorConflict" = "Erreur : Fichiers .cue et .chd incompatibles";
-"MultiDiscImportErrorMissing" = "Erreur : Aucun fichier .cue/.chd";
+"MultiDiscImportErrorConflict" = "Erreur : Fichiers .cue .cdi et .chd incompatibles";
+"MultiDiscImportErrorMissing" = "Erreur : Aucun fichier .cue/.cdi/.chd";
"GenerateM3uFailed" = "Échec création .m3u";
"MultiDiscCloseAlert" = ".m3u créé. Fermez après importation";
"MultiDiscContinueClose" = "Fermer";
@@ -730,3 +730,39 @@ Appuyez sur le bouton du contrôleur...";
"FDSAlert" = "Cette option n'est disponible que pour les jeux FDS.";
"DiskSideChange" = "Retourner le Disque";
"EjectDisk" = "Éjecter le Disque";
+
+"TriggerProDesc" = "Créer et gérer des boutons personnalisés avancés";
+"AddButton" = "Ajouter un bouton";
+"ButtonStyle" = "Style du bouton";
+"Mapping" = "Mappage";
+"Action" = "Action";
+"Classic" = "Classique";
+"Flat" = "Plat";
+"Custom" = "Personnalisé";
+"Size" = "Taille";
+"Opacity" = "Opacité";
+"CornerRadius" = "Rayon des coins";
+"Simple" = "Simple";
+"Hold" = "Maintenir";
+"Combo" = "Combo";
+"RepeatTrigger" = "Répéter le déclencheur";
+"RepeatInterval" = "Intervalle de répétition";
+"AutoStop" = "Arrêt automatique";
+"HoldDuration" = "Durée de maintien";
+"PressDurationPerKey" = "Durée d'appui par touche";
+"IntervalPerKey" = "Intervalle par touche";
+"AddTriggerPro" = "Ajouter TriggerPro";
+"SwitchPreviewSkin" = "Changer l'apparence de prévisualisation";
+"SimpleActionDesc" = "Appuyez sur le bouton TriggerPro pour déclencher instantanément toutes les touches mappées en une fois";
+"HoldActionDesc" = "Appuyez sur le bouton TriggerPro pour maintenir les touches mappées. Appuyez à nouveau pour relâcher";
+"ComboActionDesc" = "Appuyez sur le bouton TriggerPro pour déclencher les touches mappées en séquence, parfait pour les combos style arcade";
+"NoMappingAlert" = "Ce bouton n'a actuellement aucun mappage et n'effectuera aucune action. Êtes-vous sûr de vouloir le fermer ?";
+"TriggerProName" = "Nom TriggerPro";
+"Position" = "Position";
+"ButtonInfo" = "Infos du bouton";
+"NoTriggerPro" = "Aucune configuration TriggerPro trouvée. Vous pouvez aller dans Paramètres ou appuyer longuement sur l'option TriggerPro dans le Menu Jeu pour en créer une";
+"ManageTriggerPro" = "Gérer TriggerPro";
+"EnableTriggerPro" = "Activer TriggerPro";
+"DisableTriggerPro" = "Désactiver TriggerPro";
+"ActivateHold" = "Activer le maintien : %@";
+"DeactivateHold" = "Annuler le maintien : %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings
index 4183f348..fe6a67a7 100644
--- a/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings
@@ -544,12 +544,12 @@ Appuyez sur le bouton du contrôleur...";
"ImportMissingFile" = "Échec d'importation de %@ : Fichier %@ manquant";
"MultiDiscBuilder" = "Assistant multidisc";
-"MultiDiscBuilderDesc" = "Crée des fichiers .m3u échangeables pour jeux multidisc (.cue/.bin ou .chd). Ignorez si vous avez déjà un .m3u - importez-le directement via l'importation de jeu";
+"MultiDiscBuilderDesc" = "Crée des fichiers .m3u échangeables pour jeux multidisc (.cue(.bin) .cdi ou .chd). Ignorez si vous avez déjà un .m3u - importez-le directement via l'importation de jeu";
"M3uFileShare" = "Partager fichier .m3u";
"M3uFileImport" = "Ajouter à la bibliothèque";
"MultiDiscAddFile" = "Ajouter fichier %@";
-"MultiDiscImportErrorConflict" = "Erreur : Impossible de mixer .cue et .chd";
-"MultiDiscImportErrorMissing" = "Erreur : Aucun fichier .cue/.chd trouvé";
+"MultiDiscImportErrorConflict" = "Erreur : Impossible de mixer .cue .cdi et .chd";
+"MultiDiscImportErrorMissing" = "Erreur : Aucun fichier .cue/.cdi/.chd trouvé";
"GenerateM3uFailed" = "Échec de génération du .m3u";
"MultiDiscCloseAlert" = ".m3u généré. Fermez cette page après l'importation";
"MultiDiscContinueClose" = "Fermer";
@@ -730,3 +730,39 @@ Appuyez sur le bouton du contrôleur...";
"FDSAlert" = "Cette option n'est disponible que pour les jeux FDS.";
"DiskSideChange" = "Retourner le Disque";
"EjectDisk" = "Éjecter le Disque";
+
+"TriggerProDesc" = "Créer et gérer des boutons personnalisés avancés";
+"AddButton" = "Ajouter un bouton";
+"ButtonStyle" = "Style du bouton";
+"Mapping" = "Mapping";
+"Action" = "Action";
+"Classic" = "Classique";
+"Flat" = "Plat";
+"Custom" = "Personnalisé";
+"Size" = "Taille";
+"Opacity" = "Opacité";
+"CornerRadius" = "Rayon des coins";
+"Simple" = "Simple";
+"Hold" = "Maintenir";
+"Combo" = "Combo";
+"RepeatTrigger" = "Répéter le déclencheur";
+"RepeatInterval" = "Intervalle de répétition";
+"AutoStop" = "Arrêt automatique";
+"HoldDuration" = "Durée de maintien";
+"PressDurationPerKey" = "Durée d'appui par touche";
+"IntervalPerKey" = "Intervalle par touche";
+"AddTriggerPro" = "Ajouter TriggerPro";
+"SwitchPreviewSkin" = "Changer le skin d'aperçu";
+"SimpleActionDesc" = "Appuyez sur le bouton TriggerPro pour déclencher instantanément toutes les touches mappées en une fois";
+"HoldActionDesc" = "Appuyez sur le bouton TriggerPro pour maintenir les touches mappées. Appuyez à nouveau pour relâcher";
+"ComboActionDesc" = "Appuyez sur le bouton TriggerPro pour déclencher les touches mappées en séquence, parfait pour les combos style arcade";
+"NoMappingAlert" = "Ce bouton n'a actuellement aucun mapping et n'effectuera aucune action. Êtes-vous sûr de vouloir le fermer ?";
+"TriggerProName" = "Nom TriggerPro";
+"Position" = "Position";
+"ButtonInfo" = "Informations du bouton";
+"NoTriggerPro" = "Aucune configuration TriggerPro trouvée. Vous pouvez aller dans Paramètres ou appuyer longuement sur l'option TriggerPro dans le Menu Jeu pour en créer une";
+"ManageTriggerPro" = "Gérer TriggerPro";
+"EnableTriggerPro" = "Activer TriggerPro";
+"DisableTriggerPro" = "Désactiver TriggerPro";
+"ActivateHold" = "Activer le maintien : %@";
+"DeactivateHold" = "Annuler le maintien : %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings
index 24d83c24..47a064e6 100644
--- a/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings
@@ -543,12 +543,12 @@
"ImportMissingFile" = "ייבוא %@ נכשל: הקובץ %@ חסר";
"MultiDiscBuilder" = "מנהל רב-דיסקים";
-"MultiDiscBuilderDesc" = "יוצר קבצי .m3u להחלפת דיסקים במשחקי רב-דיסק (.cue/.bin או .chd). דלג אם כבר יש לך .m3u - ייבא ישירות דרך ייבוא משחק";
+"MultiDiscBuilderDesc" = "יוצר קבצי .m3u להחלפת דיסקים במשחקי רב-דיסק (.cue(.bin) .cdi או .chd). דלג אם כבר יש לך .m3u - ייבא ישירות דרך ייבוא משחק";
"M3uFileShare" = "שתף קובץ .m3u";
"M3uFileImport" = "הוסף לספרייה";
"MultiDiscAddFile" = "הוסף קובץ %@";
-"MultiDiscImportErrorConflict" = "שגיאה: לא ניתן לערבב .cue ו־.chd";
-"MultiDiscImportErrorMissing" = "שגיאה: לא נמצאו קבצי .cue/.chd";
+"MultiDiscImportErrorConflict" = "שגיאה: לא ניתן לערבב .cue .cdi ו־.chd";
+"MultiDiscImportErrorMissing" = "שגיאה: לא נמצאו קבצי .cue/.cdi/.chd";
"GenerateM3uFailed" = "יצירת .m3u נכשלה";
"MultiDiscCloseAlert" = "קובץ .m3u נוצר. סגור לאחר הייבוא";
"MultiDiscContinueClose" = "סגור";
@@ -729,3 +729,39 @@
"FDSAlert" = "אפשרות זו זמינה רק למשחקי FDS.";
"DiskSideChange" = "הפוך דיסק";
"EjectDisk" = "הוצא דיסק";
+
+"TriggerProDesc" = "צור ונהל כפתורים מותאמים אישית מתקדמים";
+"AddButton" = "הוסף כפתור";
+"ButtonStyle" = "סגנון כפתור";
+"Mapping" = "מיפוי";
+"Action" = "פעולה";
+"Classic" = "קלאסי";
+"Flat" = "שטוח";
+"Custom" = "מותאם אישית";
+"Size" = "גודל";
+"Opacity" = "אטימות";
+"CornerRadius" = "רדיוס פינה";
+"Simple" = "פשוט";
+"Hold" = "החזק";
+"Combo" = "קומבו";
+"RepeatTrigger" = "חזור על טריגר";
+"RepeatInterval" = "מרווח חזרה";
+"AutoStop" = "עצירה אוטומטית";
+"HoldDuration" = "משך החזקה";
+"PressDurationPerKey" = "משך לחיצה לכל מקש";
+"IntervalPerKey" = "מרווח לכל מקש";
+"AddTriggerPro" = "הוסף TriggerPro";
+"SwitchPreviewSkin" = "החלף ערכת נושא לתצוגה מקדימה";
+"SimpleActionDesc" = "הקש על כפתור TriggerPro להפעלה מיידית של כל המקשים הממופים בבת אחת";
+"HoldActionDesc" = "הקש על כפתור TriggerPro להחזקת המקשים הממופים. הקש שוב לשחרור";
+"ComboActionDesc" = "הקש על כפתור TriggerPro להפעלת המקשים הממופים ברצף - מושלם לקומבינות בסגנון ארקייד";
+"NoMappingAlert" = "לכפתור זה אין מיפוי והוא לא יבצע שום פעולה. האם אתה בטוח שברצונך לסגור?";
+"TriggerProName" = "שם TriggerPro";
+"Position" = "מיקום";
+"ButtonInfo" = "מידע על הכפתור";
+"NoTriggerPro" = "לא נמצאה תצורת TriggerPro. ניתן לעבור להגדרות או להחזיק את אפשרות TriggerPro בתפריט המשחק כדי ליצור אחת";
+"ManageTriggerPro" = "נהל TriggerPro";
+"EnableTriggerPro" = "הפעל TriggerPro";
+"DisableTriggerPro" = "בטל TriggerPro";
+"ActivateHold" = "הפעל החזקה: %@";
+"DeactivateHold" = "בטל החזקה: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings
index 9b2e5ecd..2383d210 100644
--- a/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings
@@ -544,12 +544,12 @@
"ImportMissingFile" = "%@ आयात विफल: %@ फ़ाइल गायब";
"MultiDiscBuilder" = "मल्टीडिस्क सहायक";
-"MultiDiscBuilderDesc" = "मल्टीडिस्क गेम्स (.cue/.bin या .chd) के लिए डिस्क-बदली .m3u फ़ाइलें बनाता है। यदि पहले से .m3u फ़ाइल है तो छोड़ें - सीधे गेम आयात से जोड़ें";
+"MultiDiscBuilderDesc" = "मल्टीडिस्क गेम्स (.cue(.bin) .cdi या .chd) के लिए डिस्क-बदली .m3u फ़ाइलें बनाता है। यदि पहले से .m3u फ़ाइल है तो छोड़ें - सीधे गेम आयात से जोड़ें";
"M3uFileShare" = ".m3u फ़ाइल साझा करें";
"M3uFileImport" = "लाइब्रेरी में जोड़ें";
"MultiDiscAddFile" = "%@ फ़ाइल जोड़ें";
-"MultiDiscImportErrorConflict" = "त्रुटि: .cue और .chd फ़ाइलें मिश्रित नहीं की जा सकतीं";
-"MultiDiscImportErrorMissing" = "त्रुटि: कोई .cue या .chd फ़ाइल नहीं मिली";
+"MultiDiscImportErrorConflict" = "त्रुटि: .cue .cdi और .chd फ़ाइलें मिश्रित नहीं की जा सकतीं";
+"MultiDiscImportErrorMissing" = "त्रुटि: कोई .cue .cdi या .chd फ़ाइल नहीं मिली";
"GenerateM3uFailed" = ".m3u फ़ाइल बनाने में विफल";
"MultiDiscCloseAlert" = ".m3u फ़ाइल बन गई। लाइब्रेरी में आयात करने के बाद पेज बंद करें";
"MultiDiscContinueClose" = "बंद करना जारी रखें";
@@ -730,3 +730,39 @@
"FDSAlert" = "यह विकल्प केवल FDS गेम्स के लिए उपलब्ध है।";
"DiskSideChange" = "डिस्क पलटें";
"EjectDisk" = "डिस्क बाहर निकालें";
+
+"TriggerProDesc" = "उन्नत कस्टम बटन बनाएं और प्रबंधित करें";
+"AddButton" = "बटन जोड़ें";
+"ButtonStyle" = "बटन शैली";
+"Mapping" = "मैपिंग";
+"Action" = "क्रिया";
+"Classic" = "क्लासिक";
+"Flat" = "फ्लैट";
+"Custom" = "कस्टम";
+"Size" = "आकार";
+"Opacity" = "अपारदर्शिता";
+"CornerRadius" = "कोने की त्रिज्या";
+"Simple" = "सरल";
+"Hold" = "होल्ड";
+"Combo" = "कॉम्बो";
+"RepeatTrigger" = "दोहराएं ट्रिगर";
+"RepeatInterval" = "ट्रिगर अंतराल";
+"AutoStop" = "स्वचालित रोक";
+"HoldDuration" = "होल्ड अवधि";
+"PressDurationPerKey" = "प्रति कुंजी दबाने की अवधि";
+"IntervalPerKey" = "प्रति कुंजी अंतराल";
+"AddTriggerPro" = "TriggerPro जोड़ें";
+"SwitchPreviewSkin" = "पूर्वावलोकन स्किन बदलें";
+"SimpleActionDesc" = "TriggerPro बटन को टैप करके सभी मैप की गई कुंजियों को एक साथ तुरंत ट्रिगर करें";
+"HoldActionDesc" = "TriggerPro बटन को टैप करके मैप की गई कुंजियों को दबाए रखें। छोड़ने के लिए फिर से टैप करें";
+"ComboActionDesc" = "TriggerPro बटन को टैप करके मैप की गई कुंजियों को क्रम में ट्रिगर करें - आर्केड-शैली कॉम्बो के लिए आदर्श";
+"NoMappingAlert" = "इस बटन में वर्तमान में कोई मैपिंग नहीं है और यह कोई क्रिया नहीं करेगा। क्या आप वाकई इसे बंद करना चाहते हैं?";
+"TriggerProName" = "TriggerPro नाम";
+"Position" = "स्थिति";
+"ButtonInfo" = "बटन जानकारी";
+"NoTriggerPro" = "कोई TriggerPro कॉन्फ़िगरेशन नहीं मिला। आप सेटिंग्स में जा सकते हैं या गेम मेनू में TriggerPro विकल्प को लंबे समय तक दबाकर एक बना सकते हैं";
+"ManageTriggerPro" = "TriggerPro प्रबंधित करें";
+"EnableTriggerPro" = "TriggerPro सक्षम करें";
+"DisableTriggerPro" = "TriggerPro अक्षम करें";
+"ActivateHold" = "होल्ड सक्रिय करें: %@";
+"DeactivateHold" = "होल्ड रद्द करें: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings
index b9ee1528..f177176e 100644
--- a/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings
@@ -540,12 +540,12 @@ Ako naiđete na nestabilnost u 3DS-u, pogledajte «Često Postavljana Pitanja»
"ImportMissingFile" = "Uvoz %@ neuspješan: Nedostaje datoteka %@";
"MultiDiscBuilder" = "MultiDisc pomoćnik";
-"MultiDiscBuilderDesc" = "Stvara .m3u datoteke za višediskne igre (.cue/.bin ili .chd). Preskoči ako već imaš .m3u - uvezi izravno putem Uvoza igre";
+"MultiDiscBuilderDesc" = "Stvara .m3u datoteke za višediskne igre (.cue(.bin) .cdi ili .chd). Preskoči ako već imaš .m3u - uvezi izravno putem Uvoza igre";
"M3uFileShare" = "Dijeli .m3u datoteku";
"M3uFileImport" = "Dodaj u biblioteku";
"MultiDiscAddFile" = "Dodaj %@ datoteku";
-"MultiDiscImportErrorConflict" = "Greška: Nemiješati .cue i .chd datoteke";
-"MultiDiscImportErrorMissing" = "Greška: Nema .cue/.chd datoteka";
+"MultiDiscImportErrorConflict" = "Greška: Nemiješati .cue .cdi i .chd datoteke";
+"MultiDiscImportErrorMissing" = "Greška: Nema .cue/.cdi/.chd datoteka";
"GenerateM3uFailed" = "Greška pri stvaranju .m3u";
"MultiDiscCloseAlert" = ".m3u stvoren. Zatvori stranicu nakon uvoza";
"MultiDiscContinueClose" = "Zatvori";
@@ -726,3 +726,39 @@ Ako naiđete na nestabilnost u 3DS-u, pogledajte «Često Postavljana Pitanja»
"FDSAlert" = "Ova opcija dostupna je samo za FDS igre.";
"DiskSideChange" = "Okreni disk";
"EjectDisk" = "Izbaci disk";
+
+"TriggerProDesc" = "Stvaranje i upravljanje naprednim prilagođenim tipkama";
+"AddButton" = "Dodaj tipku";
+"ButtonStyle" = "Stil tipke";
+"Mapping" = "Mapiranje";
+"Action" = "Radnja";
+"Classic" = "Klasičan";
+"Flat" = "Ravan";
+"Custom" = "Prilagođeno";
+"Size" = "Veličina";
+"Opacity" = "Neprozirnost";
+"CornerRadius" = "Radijus kuta";
+"Simple" = "Jednostavno";
+"Hold" = "Zadrži";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Ponovi okidač";
+"RepeatInterval" = "Interval ponavljanja";
+"AutoStop" = "Automatsko zaustavljanje";
+"HoldDuration" = "Trajanje zadržavanja";
+"PressDurationPerKey" = "Trajanje pritiska po tipki";
+"IntervalPerKey" = "Interval po tipki";
+"AddTriggerPro" = "Dodaj TriggerPro";
+"SwitchPreviewSkin" = "Promijeni skin pregleda";
+"SimpleActionDesc" = "Dodirnite tipku TriggerPro za trenutno okidanje svih mapiranih tipki odjednom";
+"HoldActionDesc" = "Dodirnite tipku TriggerPro za zadržavanje mapiranih tipki. Dodirnite ponovno za otpuštanje";
+"ComboActionDesc" = "Dodirnite tipku TriggerPro za okidanje mapiranih tipki u slijedu - savršeno za arkadne kombove";
+"NoMappingAlert" = "Ova tipka trenutno nema mapiranje i neće izvršiti nikakvu radnju. Jeste li sigurni da je želite zatvoriti?";
+"TriggerProName" = "Naziv TriggerPro";
+"Position" = "Položaj";
+"ButtonInfo" = "Informacije o tipki";
+"NoTriggerPro" = "Nije pronađena TriggerPro konfiguracija. Možete otići u Postavke ili dugo pritisnuti opciju TriggerPro u Izborniku igre za stvaranje";
+"ManageTriggerPro" = "Upravljaj TriggerPro";
+"EnableTriggerPro" = "Omogući TriggerPro";
+"DisableTriggerPro" = "Onemogući TriggerPro";
+"ActivateHold" = "Aktiviraj zadržavanje: %@";
+"DeactivateHold" = "Otkaži zadržavanje: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings
index 22de92f0..9bc8bd7f 100644
--- a/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings
@@ -542,12 +542,12 @@ Nyomja meg a kontroller gombját...";
"ImportMissingFile" = "%@ importálása sikertelen: Hiányzó %@ fájl";
"MultiDiscBuilder" = "MultiDisc segéd";
-"MultiDiscBuilderDesc" = "Lemezt cserélhető .m3u fájlokat készít többlemezes játékokhoz (.cue/.bin vagy .chd). Hagyd ki, ha már van .m3u fájlod – importáld közvetlenül a Játék importálás menüponton keresztül";
+"MultiDiscBuilderDesc" = "Lemezt cserélhető .m3u fájlokat készít többlemezes játékokhoz (.cue(.bin) .cdi vagy .chd). Hagyd ki, ha már van .m3u fájlod – importáld közvetlenül a Játék importálás menüponton keresztül";
"M3uFileShare" = ".m3u fájl megosztása";
"M3uFileImport" = "Hozzáadás a gyűjteményhez";
"MultiDiscAddFile" = "%@ fájl hozzáadása";
-"MultiDiscImportErrorConflict" = "Hiba: .cue és .chd fájlok nem keverhetők";
-"MultiDiscImportErrorMissing" = "Hiba: .cue/.chd fájl nem található";
+"MultiDiscImportErrorConflict" = "Hiba: .cue .cdi és .chd fájlok nem keverhetők";
+"MultiDiscImportErrorMissing" = "Hiba: .cue/.cdi/.chd fájl nem található";
"GenerateM3uFailed" = ".m3u létrehozása sikertelen";
"MultiDiscCloseAlert" = ".m3u elkészült. Zárja be az importálás után";
"MultiDiscContinueClose" = "Bezárás";
@@ -728,3 +728,39 @@ Nyomja meg a kontroller gombját...";
"FDSAlert" = "Ez a lehetőség csak FDS játékoknál érhető el.";
"DiskSideChange" = "Lemez Megfordítása";
"EjectDisk" = "Lemez Kiadása";
+
+"TriggerProDesc" = "Speciális egyéni gombok létrehozása és kezelése";
+"AddButton" = "Gomb hozzáadása";
+"ButtonStyle" = "Gombstílus";
+"Mapping" = "Leképezés";
+"Action" = "Művelet";
+"Classic" = "Klasszikus";
+"Flat" = "Lapos";
+"Custom" = "Egyéni";
+"Size" = "Méret";
+"Opacity" = "Átlátszatlanság";
+"CornerRadius" = "Saroklekerekítés";
+"Simple" = "Egyszerű";
+"Hold" = "Tartás";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Ismétlés indítása";
+"RepeatInterval" = "Ismétlési időköz";
+"AutoStop" = "Automatikus leállítás";
+"HoldDuration" = "Tartás időtartama";
+"PressDurationPerKey" = "Nyomva tartás időtartama billentyűnként";
+"IntervalPerKey" = "Időköz billentyűnként";
+"AddTriggerPro" = "TriggerPro hozzáadása";
+"SwitchPreviewSkin" = "Előnézeti skin váltása";
+"SimpleActionDesc" = "Koppints a TriggerPro gombra, hogy azonnal egyszerre aktiválja az összes leképezett billentyűt";
+"HoldActionDesc" = "Koppints a TriggerPro gombra a leképezett billentyűk lenyomva tartásához. Újabb koppintással feloldod";
+"ComboActionDesc" = "Koppints a TriggerPro gombra a leképezett billentyűk sorozatos aktiválásához - tökéletes arcade stílusú kombókhoz";
+"NoMappingAlert" = "Ennek a gombnak jelenleg nincs leképezése, és nem fog műveletet végrehajtani. Biztosan be akarod zárni?";
+"TriggerProName" = "TriggerPro név";
+"Position" = "Pozíció";
+"ButtonInfo" = "Gomb információ";
+"NoTriggerPro" = "Nem található TriggerPro konfiguráció. Lépj a Beállításokba, vagy nyomd hosszan a TriggerPro opciót a Játékmenüben létrehozásához";
+"ManageTriggerPro" = "TriggerPro kezelése";
+"EnableTriggerPro" = "TriggerPro engedélyezése";
+"DisableTriggerPro" = "TriggerPro letiltása";
+"ActivateHold" = "Tartás aktiválása: %@";
+"DeactivateHold" = "Tartás megszakítása: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings
index d1f9da4c..fce8e8eb 100644
--- a/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings
@@ -535,12 +535,12 @@ Tekan tombol kontroler...";
"ImportMissingFile" = "Gagal impor %@: File %@ tidak ditemukan";
"MultiDiscBuilder" = "Pemutar MultiDisc";
-"MultiDiscBuilderDesc" = "Membuat file .m3u tukar-disk untuk game multidisc (.cue/.bin atau .chd). Lewati jika sudah punya .m3u - impor langsung via Impor Game";
+"MultiDiscBuilderDesc" = "Membuat file .m3u tukar-disk untuk game multidisc (.cue(.bin) .cdi atau .chd). Lewati jika sudah punya .m3u - impor langsung via Impor Game";
"M3uFileShare" = "Bagikan File .m3u";
"M3uFileImport" = "Tambahkan ke Library";
"MultiDiscAddFile" = "Tambahkan File %@";
-"MultiDiscImportErrorConflict" = "Error: Tidak bisa campur file .cue dan .chd";
-"MultiDiscImportErrorMissing" = "Error: File .cue/.chd tidak ditemukan";
+"MultiDiscImportErrorConflict" = "Error: Tidak bisa campur file .cue .cdi dan .chd";
+"MultiDiscImportErrorMissing" = "Error: File .cue/.cdi/.chd tidak ditemukan";
"GenerateM3uFailed" = "Gagal membuat file .m3u";
"MultiDiscCloseAlert" = "File .m3u telah dibuat. Tutup halaman ini setelah diimpor";
"MultiDiscContinueClose" = "Tutup";
@@ -721,3 +721,39 @@ Tekan tombol kontroler...";
"FDSAlert" = "Opsi ini hanya tersedia untuk game FDS.";
"DiskSideChange" = "Balik Cakram";
"EjectDisk" = "Keluarkan Cakram";
+
+"TriggerProDesc" = "Buat dan kelola tombol kustom lanjutan";
+"AddButton" = "Tambah Tombol";
+"ButtonStyle" = "Gaya Tombol";
+"Mapping" = "Pemetaan";
+"Action" = "Aksi";
+"Classic" = "Klasik";
+"Flat" = "Datar";
+"Custom" = "Kustom";
+"Size" = "Ukuran";
+"Opacity" = "Opasitas";
+"CornerRadius" = "Radius Sudut";
+"Simple" = "Sederhana";
+"Hold" = "Tahan";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Ulangi Pemicu";
+"RepeatInterval" = "Interval Pengulangan";
+"AutoStop" = "Berhenti Otomatis";
+"HoldDuration" = "Durasi Tahan";
+"PressDurationPerKey" = "Durasi Tekan per Tombol";
+"IntervalPerKey" = "Interval per Tombol";
+"AddTriggerPro" = "Tambah TriggerPro";
+"SwitchPreviewSkin" = "Ganti Skin Pratinjau";
+"SimpleActionDesc" = "Ketuk tombol TriggerPro untuk langsung memicu semua tombol yang telah dipetakan sekaligus";
+"HoldActionDesc" = "Ketuk tombol TriggerPro untuk menahan tombol yang telah dipetakan. Ketuk lagi untuk melepaskan";
+"ComboActionDesc" = "Ketuk tombol TriggerPro untuk memicu tombol yang telah dipetakan secara berurutan - cocok untuk kombo gaya arkade";
+"NoMappingAlert" = "Tombol ini saat ini tidak memiliki pemetaan dan tidak akan melakukan aksi apa pun. Yakin ingin menutupnya?";
+"TriggerProName" = "Nama TriggerPro";
+"Position" = "Posisi";
+"ButtonInfo" = "Info Tombol";
+"NoTriggerPro" = "Tidak ada konfigurasi TriggerPro yang ditemukan. Anda dapat pergi ke Pengaturan atau tahan lama opsi TriggerPro di Menu Game untuk membuatnya";
+"ManageTriggerPro" = "Kelola TriggerPro";
+"EnableTriggerPro" = "Aktifkan TriggerPro";
+"DisableTriggerPro" = "Nonaktifkan TriggerPro";
+"ActivateHold" = "Aktifkan Tahan: %@";
+"DeactivateHold" = "Batalkan Tahan: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings
index 1e330d3c..735b71fc 100644
--- a/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings
@@ -546,12 +546,12 @@ Premi il pulsante del controller...";
"ImportMissingFile" = "Importazione %@ fallita: File %@ mancante";
"MultiDiscBuilder" = "Assistente multidisco";
-"MultiDiscBuilderDesc" = "Crea file .m3u intercambiabili per giochi multidisco (.cue/.bin o .chd). Salta se hai già .m3u - importalo direttamente via Importa Gioco";
+"MultiDiscBuilderDesc" = "Crea file .m3u intercambiabili per giochi multidisco (.cue(.bin) .cdi o .chd). Salta se hai già .m3u - importalo direttamente via Importa Gioco";
"M3uFileShare" = "Condividi .m3u";
"M3uFileImport" = "Aggiungi a libreria";
"MultiDiscAddFile" = "Aggiungi file %@";
-"MultiDiscImportErrorConflict" = "Errore: Non mischiare .cue e .chd";
-"MultiDiscImportErrorMissing" = "Errore: Nessun file .cue/.chd trovato";
+"MultiDiscImportErrorConflict" = "Errore: Non mischiare .cue .cdi e .chd";
+"MultiDiscImportErrorMissing" = "Errore: Nessun file .cue/.cdi/.chd trovato";
"GenerateM3uFailed" = "Generazione .m3u fallita";
"MultiDiscCloseAlert" = ".m3u generato. Chiudi dopo l'importazione";
"MultiDiscContinueClose" = "Chiudi";
@@ -732,3 +732,39 @@ Premi il pulsante del controller...";
"FDSAlert" = "Questa opzione è disponibile solo per i giochi FDS.";
"DiskSideChange" = "Gira Disco";
"EjectDisk" = "Espelli Disco";
+
+"TriggerProDesc" = "Crea e gestisci pulsanti personalizzati avanzati";
+"AddButton" = "Aggiungi pulsante";
+"ButtonStyle" = "Stile pulsante";
+"Mapping" = "Mappatura";
+"Action" = "Azione";
+"Classic" = "Classico";
+"Flat" = "Piatto";
+"Custom" = "Personalizzato";
+"Size" = "Dimensione";
+"Opacity" = "Opacità";
+"CornerRadius" = "Raggio angolo";
+"Simple" = "Semplice";
+"Hold" = "Mantieni";
+"Combo" = "Combo";
+"RepeatTrigger" = "Ripeti trigger";
+"RepeatInterval" = "Intervallo ripetizione";
+"AutoStop" = "Arresto automatico";
+"HoldDuration" = "Durata mantenimento";
+"PressDurationPerKey" = "Durata pressione per tasto";
+"IntervalPerKey" = "Intervallo per tasto";
+"AddTriggerPro" = "Aggiungi TriggerPro";
+"SwitchPreviewSkin" = "Cambia skin anteprima";
+"SimpleActionDesc" = "Tocca il pulsante TriggerPro per attivare istantaneamente tutti i tasti mappati contemporaneamente";
+"HoldActionDesc" = "Tocca il pulsante TriggerPro per mantenere premuti i tasti mappati. Tocca di nuovo per rilasciare";
+"ComboActionDesc" = "Tocca il pulsante TriggerPro per attivare i tasti mappati in sequenza, perfetto per combo stile arcade";
+"NoMappingAlert" = "Questo pulsante non ha attualmente alcuna mappatura e non eseguirà alcuna azione. Sei sicuro di volerlo chiudere?";
+"TriggerProName" = "Nome TriggerPro";
+"Position" = "Posizione";
+"ButtonInfo" = "Informazioni pulsante";
+"NoTriggerPro" = "Nessuna configurazione TriggerPro trovata. Puoi andare su Impostazioni o premere a lungo l'opzione TriggerPro nel Menu di Gioco per crearne una";
+"ManageTriggerPro" = "Gestisci TriggerPro";
+"EnableTriggerPro" = "Abilita TriggerPro";
+"DisableTriggerPro" = "Disabilita TriggerPro";
+"ActivateHold" = "Attiva mantenimento: %@";
+"DeactivateHold" = "Annulla mantenimento: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings
index 7415900c..ba6afc39 100644
--- a/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings
@@ -539,12 +539,12 @@
"ImportMissingFile" = "%@のインポート失敗:ファイル%@が見つかりません";
"MultiDiscBuilder" = "マルチディスクヘルパー";
-"MultiDiscBuilderDesc" = "マルチディスクヘルパーは、マルチディスクゲーム(.cue/.bin/.chd)用のディスク交換可能な.m3uファイルを作成します。既に.m3uファイルをお持ちの場合はスキップし、ゲームインポートから直接追加してください";
+"MultiDiscBuilderDesc" = "マルチディスクヘルパーは、マルチディスクゲーム(.cue(.bin) .cdi/.chd)用のディスク交換可能な.m3uファイルを作成します。既に.m3uファイルをお持ちの場合はスキップし、ゲームインポートから直接追加してください";
"M3uFileShare" = ".m3uファイルを共有";
"M3uFileImport" = "ライブラリに追加";
"MultiDiscAddFile" = "%@ファイルを追加";
-"MultiDiscImportErrorConflict" = "エラー:.cueと.chdファイルを混在できません";
-"MultiDiscImportErrorMissing" = "エラー:.cueまたは.chdファイルが見つかりません";
+"MultiDiscImportErrorConflict" = "エラー:.cue .cdiと.chdファイルを混在できません";
+"MultiDiscImportErrorMissing" = "エラー:.cue .cdiまたは.chdファイルが見つかりません";
"GenerateM3uFailed" = ".m3uファイルの生成に失敗";
"MultiDiscCloseAlert" = ".m3uファイルが生成されました。ライブラリにインポート後、この画面を閉じてください";
"MultiDiscContinueClose" = "閉じる";
@@ -725,3 +725,39 @@
"FDSAlert" = "このオプションはFDSゲームでのみ利用可能です。";
"DiskSideChange" = "ディスクを反転";
"EjectDisk" = "ディスクを取り出す";
+
+"TriggerProDesc" = "高度なカスタムボタンの作成と管理";
+"AddButton" = "ボタンを追加";
+"ButtonStyle" = "ボタンスタイル";
+"Mapping" = "マッピング";
+"Action" = "アクション";
+"Classic" = "クラシック";
+"Flat" = "フラット";
+"Custom" = "カスタム";
+"Size" = "サイズ";
+"Opacity" = "不透明度";
+"CornerRadius" = "角丸";
+"Simple" = "シンプル";
+"Hold" = "ホールド";
+"Combo" = "コンボ";
+"RepeatTrigger" = "繰り返しトリガー";
+"RepeatInterval" = "トリガー間隔";
+"AutoStop" = "自動停止";
+"HoldDuration" = "ホールド時間";
+"PressDurationPerKey" = "キー毎の押下時間";
+"IntervalPerKey" = "キー毎の間隔";
+"AddTriggerPro" = "TriggerProを追加";
+"SwitchPreviewSkin" = "プレビュースキン切替";
+"SimpleActionDesc" = "TriggerProボタンをタップすると、マップされた全キーを即座に一度にトリガーします";
+"HoldActionDesc" = "TriggerProボタンをタップするとマップされたキーを押し続け、再度タップで解放します";
+"ComboActionDesc" = "TriggerProボタンをタップするとマップされたキーを順次トリガー。アーケードスタイルのコンボに最適";
+"NoMappingAlert" = "このボタンには現在マッピングが設定されていません。閉じてもよろしいですか?";
+"TriggerProName" = "TriggerPro名";
+"Position" = "位置";
+"ButtonInfo" = "ボタン情報";
+"NoTriggerPro" = "TriggerPro設定が見つかりません。設定画面へ移動するか、ゲームメニューでTriggerProオプションを長押しして新規作成できます";
+"ManageTriggerPro" = "TriggerPro管理";
+"EnableTriggerPro" = "TriggerProを有効化";
+"DisableTriggerPro" = "TriggerProを無効化";
+"ActivateHold" = "ホールド開始:%@";
+"DeactivateHold" = "ホールド解除:%@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings
index d2dfc2ca..12d310a1 100644
--- a/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings
@@ -546,12 +546,12 @@
"ImportMissingFile" = "%@ 가져오기 실패: %@ 파일 없음";
"MultiDiscBuilder" = "멀티디스크 도우미";
-"MultiDiscBuilderDesc" = "멀티디스크 게임(.cue/.bin 또는 .chd)용 디스크 교체 가능 .m3u 파일 생성. 이미 .m3u 파일이 있다면 건너뛰고 게임 가져오기로 직접 추가하세요";
+"MultiDiscBuilderDesc" = "멀티디스크 게임(.cue(.bin) .cdi 또는 .chd)용 디스크 교체 가능 .m3u 파일 생성. 이미 .m3u 파일이 있다면 건너뛰고 게임 가져오기로 직접 추가하세요";
"M3uFileShare" = ".m3u 파일 공유";
"M3uFileImport" = "라이브러리에 추가";
"MultiDiscAddFile" = "%@ 파일 추가";
-"MultiDiscImportErrorConflict" = "오류: .cue와 .chd 파일 혼합 불가";
-"MultiDiscImportErrorMissing" = "오류: .cue 또는 .chd 파일 없음";
+"MultiDiscImportErrorConflict" = "오류: .cue .cdi와 .chd 파일 혼합 불가";
+"MultiDiscImportErrorMissing" = "오류: .cue .cdi 또는 .chd 파일 없음";
"GenerateM3uFailed" = ".m3u 파일 생성 실패";
"MultiDiscCloseAlert" = ".m3u 파일 생성됨. 라이브러리로 가져온 후 이 페이지 닫기";
"MultiDiscContinueClose" = "닫기";
@@ -732,3 +732,39 @@
"FDSAlert" = "이 옵션은 FDS 게임에서만 사용 가능합니다.";
"DiskSideChange" = "디스크 뒤집기";
"EjectDisk" = "디스크 배출";
+
+"TriggerProDesc" = "고급 사용자 지정 버튼 생성 및 관리";
+"AddButton" = "버튼 추가";
+"ButtonStyle" = "버튼 스타일";
+"Mapping" = "매핑";
+"Action" = "동작";
+"Classic" = "클래식";
+"Flat" = "플랫";
+"Custom" = "사용자 지정";
+"Size" = "크기";
+"Opacity" = "투명도";
+"CornerRadius" = "코너 반경";
+"Simple" = "단순";
+"Hold" = "홀드";
+"Combo" = "콤보";
+"RepeatTrigger" = "반복 트리거";
+"RepeatInterval" = "트리거 간격";
+"AutoStop" = "자동 정지";
+"HoldDuration" = "홀드 지속 시간";
+"PressDurationPerKey" = "키별 누름 지속 시간";
+"IntervalPerKey" = "키별 간격";
+"AddTriggerPro" = "TriggerPro 추가";
+"SwitchPreviewSkin" = "미리보기 스킨 전환";
+"SimpleActionDesc" = "TriggerPro 버튼을 탭하여 매핑된 모든 키를 즉시 한 번에 트리거합니다";
+"HoldActionDesc" = "TriggerPro 버튼을 탭하여 매핑된 키를 길게 누릅니다. 다시 탭하면 해제됩니다";
+"ComboActionDesc" = "TriggerPro 버튼을 탭하여 매핑된 키를 순차적으로 트리거합니다. 아케이드 스타일 콤보에 완벽합니다";
+"NoMappingAlert" = "이 버튼에는 현재 매핑이 없어 작업을 수행하지 않습니다. 닫으시겠습니까?";
+"TriggerProName" = "TriggerPro 이름";
+"Position" = "위치";
+"ButtonInfo" = "버튼 정보";
+"NoTriggerPro" = "TriggerPro 구성을 찾을 수 없습니다. 설정으로 이동하거나 게임 메뉴에서 TriggerPro 옵션을 길게 눌러 새로 만들 수 있습니다";
+"ManageTriggerPro" = "TriggerPro 관리";
+"EnableTriggerPro" = "TriggerPro 활성화";
+"DisableTriggerPro" = "TriggerPro 비활성화";
+"ActivateHold" = "홀드 활성화: %@";
+"DeactivateHold" = "홀드 취소: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings
index 4d1c2923..2da22e9e 100644
--- a/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings
@@ -516,12 +516,12 @@ Tekan butang pengawal...";
"ImportMissingFile" = "Gagal import %@: Fail %@ tiada";
"MultiDiscBuilder" = "Pembantu MultiDisc";
-"MultiDiscBuilderDesc" = "Cipta fail .m3u tukar-cakera untuk permainan multidisc (.cue/.bin atau .chd). Langkau jika sudah ada .m3u - import terus melalui Import Permainan";
+"MultiDiscBuilderDesc" = "Cipta fail .m3u tukar-cakera untuk permainan multidisc (.cue(.bin) .cdi atau .chd). Langkau jika sudah ada .m3u - import terus melalui Import Permainan";
"M3uFileShare" = "Kongsi Fail .m3u";
"M3uFileImport" = "Tambah ke Pustaka";
"MultiDiscAddFile" = "Tambah Fail %@";
-"MultiDiscImportErrorConflict" = "Ralat: Tidak boleh campur .cue dan .chd";
-"MultiDiscImportErrorMissing" = "Ralat: Tiada fail .cue/.chd dijumpai";
+"MultiDiscImportErrorConflict" = "Ralat: Tidak boleh campur .cue .cdi dan .chd";
+"MultiDiscImportErrorMissing" = "Ralat: Tiada fail .cue/.cdi/.chd dijumpai";
"GenerateM3uFailed" = "Gagal hasilkan .m3u";
"MultiDiscCloseAlert" = "Fail .m3u dihasilkan. Tutup halaman selepas import";
"MultiDiscContinueClose" = "Tutup";
@@ -702,3 +702,39 @@ Tekan butang pengawal...";
"FDSAlert" = "Pilihan ini hanya tersedia untuk permainan FDS.";
"DiskSideChange" = "Balik Cakera";
"EjectDisk" = "Keluarkan Cakera";
+
+"TriggerProDesc" = "Buat dan urus butang tersuai lanjutan";
+"AddButton" = "Tambah Butang";
+"ButtonStyle" = "Gaya Butang";
+"Mapping" = "Pemetaan";
+"Action" = "Tindakan";
+"Classic" = "Klasik";
+"Flat" = "Rata";
+"Custom" = "Tersuai";
+"Size" = "Saiz";
+"Opacity" = "Kelegapan";
+"CornerRadius" = "Jejari Sudut";
+"Simple" = "Mudah";
+"Hold" = "Tahan";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Ulang Pencetus";
+"RepeatInterval" = "Selang Pengulangan";
+"AutoStop" = "Henti Automatik";
+"HoldDuration" = "Tempoh Tahanan";
+"PressDurationPerKey" = "Tempoh Tekanan per Kekunci";
+"IntervalPerKey" = "Selang per Kekunci";
+"AddTriggerPro" = "Tambah TriggerPro";
+"SwitchPreviewSkin" = "Tukar Kulit Pratonton";
+"SimpleActionDesc" = "Ketuk butang TriggerPro untuk mencetuskan semua kekunci yang dipetakan sekaligus";
+"HoldActionDesc" = "Ketuk butang TriggerPro untuk menahan kekunci yang dipetakan. Ketuk lagi untuk lepaskan";
+"ComboActionDesc" = "Ketuk butang TriggerPro untuk mencetuskan kekunci yang dipetakan mengikut urutan - sesuai untuk kombo gaya arked";
+"NoMappingAlert" = "Butang ini tiada pemetaan dan tidak akan melakukan sebarang tindakan. Pasti ingin tutup?";
+"TriggerProName" = "Nama TriggerPro";
+"Position" = "Kedudukan";
+"ButtonInfo" = "Maklumat Butang";
+"NoTriggerPro" = "Tiada konfigurasi TriggerPro ditemui. Anda boleh pergi ke Tetapan atau tahan pilihan TriggerPro dalam Menu Permainan untuk mencipta";
+"ManageTriggerPro" = "Urus TriggerPro";
+"EnableTriggerPro" = "Dayakan TriggerPro";
+"DisableTriggerPro" = "Nyahdayakan TriggerPro";
+"ActivateHold" = "Aktifkan Tahan: %@";
+"DeactivateHold" = "Batal Tahan: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings
index 89b5837f..bd97a2a9 100644
--- a/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings
@@ -534,12 +534,12 @@ Trykk på kontrollerknappen...";
"ImportMissingFile" = "Kunne ikke importere %@: Mangler fil %@";
"MultiDiscBuilder" = "Multiplatehjelper";
-"MultiDiscBuilderDesc" = "Lager byttbare .m3u-filer for multiplatespill (.cue/.bin eller .chd). Hopp over hvis du allerede har .m3u - importer direkte via Spillimport";
+"MultiDiscBuilderDesc" = "Lager byttbare .m3u-filer for multiplatespill (.cue(.bin) .cdi eller .chd). Hopp over hvis du allerede har .m3u - importer direkte via Spillimport";
"M3uFileShare" = "Del .m3u-fil";
"M3uFileImport" = "Legg til i bibliotek";
"MultiDiscAddFile" = "Legg til %@-fil";
-"MultiDiscImportErrorConflict" = "Feil: Kan ikke blande .cue og .chd";
-"MultiDiscImportErrorMissing" = "Feil: Fant ingen .cue/.chd-filer";
+"MultiDiscImportErrorConflict" = "Feil: Kan ikke blande .cue .cdi og .chd";
+"MultiDiscImportErrorMissing" = "Feil: Fant ingen .cue/.cdi/.chd-filer";
"GenerateM3uFailed" = "Kunne ikke generere .m3u";
"MultiDiscCloseAlert" = ".m3u opprettet. Lukk etter import";
"MultiDiscContinueClose" = "Lukk";
@@ -720,3 +720,39 @@ Trykk på kontrollerknappen...";
"FDSAlert" = "Dette alternativet er kun tilgjengelig for FDS-spill.";
"DiskSideChange" = "Vend Disk";
"EjectDisk" = "Støt Ut Disk";
+
+"TriggerProDesc" = "Opprett og administrer avanserte egendefinerte knapper";
+"AddButton" = "Legg til knapp";
+"ButtonStyle" = "Knappestil";
+"Mapping" = "Mapping";
+"Action" = "Handling";
+"Classic" = "Klassisk";
+"Flat" = "Flat";
+"Custom" = "Egendefinert";
+"Size" = "Størrelse";
+"Opacity" = "Opasitet";
+"CornerRadius" = "Hjørneradius";
+"Simple" = "Enkel";
+"Hold" = "Hold";
+"Combo" = "Kombinasjon";
+"RepeatTrigger" = "Gjenta utløser";
+"RepeatInterval" = "Gjentaksintervall";
+"AutoStop" = "Auto stopp";
+"HoldDuration" = "Holdetid";
+"PressDurationPerKey" = "Trykketid per tast";
+"IntervalPerKey" = "Intervall per tast";
+"AddTriggerPro" = "Legg til TriggerPro";
+"SwitchPreviewSkin" = "Bytt forhåndsvisningsskin";
+"SimpleActionDesc" = "Trykk på TriggerPro-knappen for å utløse alle mappede taster umiddelbart på en gang";
+"HoldActionDesc" = "Trykk på TriggerPro-knappen for å holde de mappede tastene nede. Trykk igjen for å frigjøre";
+"ComboActionDesc" = "Trykk på TriggerPro-knappen for å utløse de mappede tastene i sekvens - perfekt for arkade-kombinasjoner";
+"NoMappingAlert" = "Denne knappen har for øyeblikket ingen mapping og vil ikke utføre noen handling. Er du sikker på at du vil lukke den?";
+"TriggerProName" = "TriggerPro-navn";
+"Position" = "Posisjon";
+"ButtonInfo" = "Knappeinformasjon";
+"NoTriggerPro" = "Ingen TriggerPro-konfigurasjon funnet. Du kan gå til Innstillinger eller holde nede på TriggerPro-alternativet i Spillmenyen for å opprette en";
+"ManageTriggerPro" = "Administrer TriggerPro";
+"EnableTriggerPro" = "Aktiver TriggerPro";
+"DisableTriggerPro" = "Deaktiver TriggerPro";
+"ActivateHold" = "Aktiver hold: %@";
+"DeactivateHold" = "Avbryt hold: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings
index 0a335c15..c887a613 100644
--- a/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings
@@ -543,12 +543,12 @@ Druk op de controllerknop...";
"ImportMissingFile" = "Import %@ mislukt: Bestand %@ ontbreekt";
"MultiDiscBuilder" = "MultiDisc-hulpmiddel";
-"MultiDiscBuilderDesc" = "Maakt verwisselbare .m3u-bestanden voor multidisc-spellen (.cue/.bin of .chd). Overslaan als u al een .m3u heeft - importeer direct via Spel importeren";
+"MultiDiscBuilderDesc" = "Maakt verwisselbare .m3u-bestanden voor multidisc-spellen (.cue(.bin) .cdi of .chd). Overslaan als u al een .m3u heeft - importeer direct via Spel importeren";
"M3uFileShare" = ".m3u-bestand delen";
"M3uFileImport" = "Toevoegen aan bibliotheek";
"MultiDiscAddFile" = "%@-bestand toevoegen";
-"MultiDiscImportErrorConflict" = "Fout: .cue en .chd niet mengen";
-"MultiDiscImportErrorMissing" = "Fout: Geen .cue/.chd-bestanden gevonden";
+"MultiDiscImportErrorConflict" = "Fout: .cue .cdi en .chd niet mengen";
+"MultiDiscImportErrorMissing" = "Fout: Geen .cue/.cdi/.chd-bestanden gevonden";
"GenerateM3uFailed" = ".m3u aanmaken mislukt";
"MultiDiscCloseAlert" = ".m3u aangemaakt. Sluit na importeren";
"MultiDiscContinueClose" = "Doorgaan met sluiten";
@@ -729,3 +729,39 @@ Druk op de controllerknop...";
"FDSAlert" = "Deze optie is alleen beschikbaar voor FDS-spellen.";
"DiskSideChange" = "Schijf Omdraaien";
"EjectDisk" = "Schijf Uitwerpen";
+
+"TriggerProDesc" = "Geavanceerde aangepaste knoppen maken en beheren";
+"AddButton" = "Knop toevoegen";
+"ButtonStyle" = "Knopstijl";
+"Mapping" = "Toewijzing";
+"Action" = "Actie";
+"Classic" = "Klassiek";
+"Flat" = "Vlak";
+"Custom" = "Aangepast";
+"Size" = "Grootte";
+"Opacity" = "Doorzichtigheid";
+"CornerRadius" = "Hoekradius";
+"Simple" = "Eenvoudig";
+"Hold" = "Vasthouden";
+"Combo" = "Combo";
+"RepeatTrigger" = "Herhaal trigger";
+"RepeatInterval" = "Herhaalinterval";
+"AutoStop" = "Automatisch stoppen";
+"HoldDuration" = "Vasthoudduur";
+"PressDurationPerKey" = "Indrukduur per toets";
+"IntervalPerKey" = "Interval per toets";
+"AddTriggerPro" = "TriggerPro toevoegen";
+"SwitchPreviewSkin" = "Voorbeeldskin wisselen";
+"SimpleActionDesc" = "Tik op de TriggerPro-knop om alle toegewezen toetsen direct tegelijk te activeren";
+"HoldActionDesc" = "Tik op de TriggerPro-knop om de toegewezen toetsen ingedrukt te houden. Tik opnieuw om los te laten";
+"ComboActionDesc" = "Tik op de TriggerPro-knop om de toegewezen toetsen in volgorde te activeren - perfect voor arcade-combo's";
+"NoMappingAlert" = "Deze knop heeft momenteel geen toewijzing en zal geen actie uitvoeren. Weet je zeker dat je hem wilt sluiten?";
+"TriggerProName" = "TriggerPro-naam";
+"Position" = "Positie";
+"ButtonInfo" = "Knopinformatie";
+"NoTriggerPro" = "Geen TriggerPro-configuratie gevonden. Je kunt naar Instellingen gaan of lang op de TriggerPro-optie in het Spelmenu drukken om er een te maken";
+"ManageTriggerPro" = "TriggerPro beheren";
+"EnableTriggerPro" = "TriggerPro inschakelen";
+"DisableTriggerPro" = "TriggerPro uitschakelen";
+"ActivateHold" = "Vasthouden activeren: %@";
+"DeactivateHold" = "Vasthouden annuleren: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings
index 8c176fbb..3e6882d1 100644
--- a/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings
@@ -517,12 +517,12 @@ Naciśnij przycisk kontrolera...";
"ImportMissingFile" = "Błąd importu %@: Brak pliku %@";
"MultiDiscBuilder" = "Asystent multidysków";
-"MultiDiscBuilderDesc" = "Tworzy wymienne pliki .m3u dla gier multidysk (.cue/.bin lub .chd). Pomiń, jeśli masz już .m3u - zaimportuj bezpośrednio przez Import gier";
+"MultiDiscBuilderDesc" = "Tworzy wymienne pliki .m3u dla gier multidysk (.cue(.bin) .cdi lub .chd). Pomiń, jeśli masz już .m3u - zaimportuj bezpośrednio przez Import gier";
"M3uFileShare" = "Udostępnij .m3u";
"M3uFileImport" = "Dodaj do biblioteki";
"MultiDiscAddFile" = "Dodaj plik %@";
-"MultiDiscImportErrorConflict" = "Błąd: Nie można mieszać .cue i .chd";
-"MultiDiscImportErrorMissing" = "Błąd: Brak plików .cue/.chd";
+"MultiDiscImportErrorConflict" = "Błąd: Nie można mieszać .cue .cdi i .chd";
+"MultiDiscImportErrorMissing" = "Błąd: Brak plików .cue/.cdi/.chd";
"GenerateM3uFailed" = "Błąd generowania .m3u";
"MultiDiscCloseAlert" = ".m3u wygenerowany. Zamknij po imporcie";
"MultiDiscContinueClose" = "Zamknij";
@@ -703,3 +703,39 @@ Naciśnij przycisk kontrolera...";
"FDSAlert" = "Ta opcja jest dostępna tylko dla gier FDS.";
"DiskSideChange" = "Obróć Dysk";
"EjectDisk" = "Wysuń Dysk";
+
+"TriggerProDesc" = "Twórz i zarządzaj zaawansowanymi niestandardowymi przyciskami";
+"AddButton" = "Dodaj przycisk";
+"ButtonStyle" = "Styl przycisku";
+"Mapping" = "Mapowanie";
+"Action" = "Akcja";
+"Classic" = "Klasyczny";
+"Flat" = "Płaski";
+"Custom" = "Niestandardowy";
+"Size" = "Rozmiar";
+"Opacity" = "Przezroczystość";
+"CornerRadius" = "Promień zaokrąglenia";
+"Simple" = "Prosty";
+"Hold" = "Przytrzymaj";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Powtarzaj wyzwalacz";
+"RepeatInterval" = "Interwał powtarzania";
+"AutoStop" = "Auto stop";
+"HoldDuration" = "Czas przytrzymania";
+"PressDurationPerKey" = "Czas naciśnięcia na klawisz";
+"IntervalPerKey" = "Interwał na klawisz";
+"AddTriggerPro" = "Dodaj TriggerPro";
+"SwitchPreviewSkin" = "Zmień skórkę podglądu";
+"SimpleActionDesc" = "Dotknij przycisku TriggerPro, aby natychmiast uruchomić wszystkie zmapowane klawisze";
+"HoldActionDesc" = "Dotknij przycisku TriggerPro, aby przytrzymać zmapowane klawisze. Dotknij ponownie, aby zwolnić";
+"ComboActionDesc" = "Dotknij przycisku TriggerPro, aby uruchomić zmapowane klawisze w sekwencji - idealne do kombo w stylu arcade";
+"NoMappingAlert" = "Ten przycisk nie ma obecnie mapowania i nie wykona żadnej akcji. Czy na pewno chcesz go zamknąć?";
+"TriggerProName" = "Nazwa TriggerPro";
+"Position" = "Pozycja";
+"ButtonInfo" = "Informacje o przycisku";
+"NoTriggerPro" = "Nie znaleziono konfiguracji TriggerPro. Możesz przejść do Ustawień lub przytrzymać opcję TriggerPro w Menu Gry, aby utworzyć";
+"ManageTriggerPro" = "Zarządzaj TriggerPro";
+"EnableTriggerPro" = "Włącz TriggerPro";
+"DisableTriggerPro" = "Wyłącz TriggerPro";
+"ActivateHold" = "Aktywuj przytrzymanie: %@";
+"DeactivateHold" = "Anuluj przytrzymanie: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings
index 944a69e7..95528818 100644
--- a/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings
@@ -543,12 +543,12 @@ Pressione o botão do controle...";
"ImportMissingFile" = "Falha ao importar %@: Arquivo %@ ausente";
"MultiDiscBuilder" = "Assistente multidisco";
-"MultiDiscBuilderDesc" = "Cria arquivos .m3u intercambiáveis para jogos multidisco (.cue/.bin ou .chd). Ignore se já tiver .m3u - importe diretamente via Importar Jogo";
+"MultiDiscBuilderDesc" = "Cria arquivos .m3u intercambiáveis para jogos multidisco (.cue(.bin) .cdi ou .chd). Ignore se já tiver .m3u - importe diretamente via Importar Jogo";
"M3uFileShare" = "Compartilhar .m3u";
"M3uFileImport" = "Adicionar à biblioteca";
"MultiDiscAddFile" = "Adicionar arquivo %@";
-"MultiDiscImportErrorConflict" = "Erro: Não misture .cue e .chd";
-"MultiDiscImportErrorMissing" = "Erro: Nenhum .cue/.chd encontrado";
+"MultiDiscImportErrorConflict" = "Erro: Não misture .cue .cdi e .chd";
+"MultiDiscImportErrorMissing" = "Erro: Nenhum .cue/.cdi/.chd encontrado";
"GenerateM3uFailed" = "Falha ao gerar .m3u";
"MultiDiscCloseAlert" = ".m3u gerado. Feche após importar";
"MultiDiscContinueClose" = "Fechar";
@@ -729,3 +729,39 @@ Pressione o botão do controle...";
"FDSAlert" = "Esta opção está disponível apenas para jogos FDS.";
"DiskSideChange" = "Virar Disco";
"EjectDisk" = "Ejetar Disco";
+
+"TriggerProDesc" = "Criar e gerenciar botões personalizados avançados";
+"AddButton" = "Adicionar botão";
+"ButtonStyle" = "Estilo do botão";
+"Mapping" = "Mapeamento";
+"Action" = "Ação";
+"Classic" = "Clássico";
+"Flat" = "Plano";
+"Custom" = "Personalizado";
+"Size" = "Tamanho";
+"Opacity" = "Opacidade";
+"CornerRadius" = "Raio da borda";
+"Simple" = "Simples";
+"Hold" = "Manter";
+"Combo" = "Combo";
+"RepeatTrigger" = "Repetir gatilho";
+"RepeatInterval" = "Intervalo de repetição";
+"AutoStop" = "Parada automática";
+"HoldDuration" = "Duração de manutenção";
+"PressDurationPerKey" = "Duração de pressionamento por tecla";
+"IntervalPerKey" = "Intervalo por tecla";
+"AddTriggerPro" = "Adicionar TriggerPro";
+"SwitchPreviewSkin" = "Alternar skin de visualização";
+"SimpleActionDesc" = "Toque no botão TriggerPro para acionar instantaneamente todas as teclas mapeadas de uma vez";
+"HoldActionDesc" = "Toque no botão TriggerPro para manter as teclas mapeadas pressionadas. Toque novamente para liberar";
+"ComboActionDesc" = "Toque no botão TriggerPro para acionar as teclas mapeadas em sequência - perfeito para combos no estilo arcade";
+"NoMappingAlert" = "Este botão não possui mapeamento atualmente e não executará nenhuma ação. Tem certeza de que deseja fechá-lo?";
+"TriggerProName" = "Nome do TriggerPro";
+"Position" = "Posição";
+"ButtonInfo" = "Informações do botão";
+"NoTriggerPro" = "Nenhuma configuração do TriggerPro encontrada. Você pode ir para Configurações ou pressionar prolongadamente a opção TriggerPro no Menu do Jogo para criar uma";
+"ManageTriggerPro" = "Gerenciar TriggerPro";
+"EnableTriggerPro" = "Ativar TriggerPro";
+"DisableTriggerPro" = "Desativar TriggerPro";
+"ActivateHold" = "Ativar manutenção: %@";
+"DeactivateHold" = "Cancelar manutenção: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings
index 3182d4c5..2c56d4aa 100644
--- a/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings
@@ -544,12 +544,12 @@ Pressione o botão do comando...";
"ImportMissingFile" = "Falha ao importar %@: Ficheiro %@ em falta";
"MultiDiscBuilder" = "Assistente multidisco";
-"MultiDiscBuilderDesc" = "Cria ficheiros .m3u intercambiáveis para jogos multidisco (.cue/.bin ou .chd). Ignore se já tiver .m3u - importe diretamente via Importar Jogo";
+"MultiDiscBuilderDesc" = "Cria ficheiros .m3u intercambiáveis para jogos multidisco (.cue(.bin) .cdi ou .chd). Ignore se já tiver .m3u - importe diretamente via Importar Jogo";
"M3uFileShare" = "Partilhar .m3u";
"M3uFileImport" = "Adicionar à biblioteca";
"MultiDiscAddFile" = "Adicionar ficheiro %@";
-"MultiDiscImportErrorConflict" = "Erro: Não misture .cue e .chd";
-"MultiDiscImportErrorMissing" = "Erro: Nenhum .cue/.chd encontrado";
+"MultiDiscImportErrorConflict" = "Erro: Não misture .cue .cdi e .chd";
+"MultiDiscImportErrorMissing" = "Erro: Nenhum .cue/.cdi/.chd encontrado";
"GenerateM3uFailed" = "Falha ao gerar .m3u";
"MultiDiscCloseAlert" = ".m3u gerado. Feche após importação";
"MultiDiscContinueClose" = "Fechar";
@@ -730,3 +730,39 @@ Pressione o botão do comando...";
"FDSAlert" = "Esta opção está disponível apenas para jogos FDS.";
"DiskSideChange" = "Virar Disco";
"EjectDisk" = "Ejetar Disco";
+
+"TriggerProDesc" = "Criar e gerir botões personalizados avançados";
+"AddButton" = "Adicionar botão";
+"ButtonStyle" = "Estilo do botão";
+"Mapping" = "Mapeamento";
+"Action" = "Ação";
+"Classic" = "Clássico";
+"Flat" = "Plano";
+"Custom" = "Personalizado";
+"Size" = "Tamanho";
+"Opacity" = "Opacidade";
+"CornerRadius" = "Raio do canto";
+"Simple" = "Simples";
+"Hold" = "Manter";
+"Combo" = "Combo";
+"RepeatTrigger" = "Repetir acionador";
+"RepeatInterval" = "Intervalo de repetição";
+"AutoStop" = "Paragem automática";
+"HoldDuration" = "Duração de manutenção";
+"PressDurationPerKey" = "Duração de pressão por tecla";
+"IntervalPerKey" = "Intervalo por tecla";
+"AddTriggerPro" = "Adicionar TriggerPro";
+"SwitchPreviewSkin" = "Mudar skin de pré-visualização";
+"SimpleActionDesc" = "Toque no botão TriggerPro para acionar instantaneamente todas as teclas mapeadas de uma vez";
+"HoldActionDesc" = "Toque no botão TriggerPro para manter as teclas mapeadas premidas. Toque novamente para libertar";
+"ComboActionDesc" = "Toque no botão TriggerPro para acionar as teclas mapeadas em sequência - perfeito para combos estilo arcada";
+"NoMappingAlert" = "Este botão não tem atualmente nenhum mapeamento e não executará nenhuma ação. Tem a certeza de que quer fechá-lo?";
+"TriggerProName" = "Nome do TriggerPro";
+"Position" = "Posição";
+"ButtonInfo" = "Informação do botão";
+"NoTriggerPro" = "Nenhuma configuração do TriggerPro encontrada. Pode ir para Definições ou premir prolongadamente a opção TriggerPro no Menu do Jogo para criar uma";
+"ManageTriggerPro" = "Gerir TriggerPro";
+"EnableTriggerPro" = "Ativar TriggerPro";
+"DisableTriggerPro" = "Desativar TriggerPro";
+"ActivateHold" = "Ativar manutenção: %@";
+"DeactivateHold" = "Cancelar manutenção: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings
index 6692afb5..aadb601a 100644
--- a/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings
@@ -542,12 +542,12 @@ Apasă butonul controlerului...";
"ImportMissingFile" = "Import %@ eșuat: Lipsește fișierul %@";
"MultiDiscBuilder" = "Asistent multi-disc";
-"MultiDiscBuilderDesc" = "Creează fișiere .m3u interschimbabile pentru jocuri multi-disc (.cue/.bin sau .chd). Omite dacă ai deja .m3u - importă direct prin Import Joc";
+"MultiDiscBuilderDesc" = "Creează fișiere .m3u interschimbabile pentru jocuri multi-disc (.cue(.bin) .cdi sau .chd). Omite dacă ai deja .m3u - importă direct prin Import Joc";
"M3uFileShare" = "Partajează .m3u";
"M3uFileImport" = "Adaugă în colecție";
"MultiDiscAddFile" = "Adaugă fișier %@";
-"MultiDiscImportErrorConflict" = "Eroare: Nu se pot amesteca .cue și .chd";
-"MultiDiscImportErrorMissing" = "Eroare: Nu s-au găsit fișiere .cue/.chd";
+"MultiDiscImportErrorConflict" = "Eroare: Nu se pot amesteca .cue .cdi și .chd";
+"MultiDiscImportErrorMissing" = "Eroare: Nu s-au găsit fișiere .cue/.cdi/.chd";
"GenerateM3uFailed" = "Generare .m3u eșuată";
"MultiDiscCloseAlert" = ".m3u generat. Închide după import";
"MultiDiscContinueClose" = "Închide";
@@ -728,3 +728,39 @@ Apasă butonul controlerului...";
"FDSAlert" = "Această opțiune este disponibilă doar pentru jocurile FDS.";
"DiskSideChange" = "Întoarce Discul";
"EjectDisk" = "Scoate Discul";
+
+"TriggerProDesc" = "Creează și gestionează butoane personalizate avansate";
+"AddButton" = "Adaugă buton";
+"ButtonStyle" = "Stil buton";
+"Mapping" = "Mapare";
+"Action" = "Acțiune";
+"Classic" = "Clasic";
+"Flat" = "Flat";
+"Custom" = "Personalizat";
+"Size" = "Dimensiune";
+"Opacity" = "Opacitate";
+"CornerRadius" = "Rază colț";
+"Simple" = "Simplu";
+"Hold" = "Ține apăsat";
+"Combo" = "Combo";
+"RepeatTrigger" = "Repetă declanșator";
+"RepeatInterval" = "Interval repetare";
+"AutoStop" = "Oprire automată";
+"HoldDuration" = "Durată ținere";
+"PressDurationPerKey" = "Durată apăsare per tastă";
+"IntervalPerKey" = "Interval per tastă";
+"AddTriggerPro" = "Adaugă TriggerPro";
+"SwitchPreviewSkin" = "Schimbă skin previzualizare";
+"SimpleActionDesc" = "Atinge butonul TriggerPro pentru a declanșa instantaneu toate tastele mapate deodată";
+"HoldActionDesc" = "Atinge butonul TriggerPro pentru a ține tastele mapate apăsate. Atinge din nou pentru a elibera";
+"ComboActionDesc" = "Atinge butonul TriggerPro pentru a declanșa tastele mapate în secvență - perfect pentru combo-uri arcade";
+"NoMappingAlert" = "Acest buton nu are în prezent nicio mapare și nu va efectua nicio acțiune. Sigur doriți să îl închideți?";
+"TriggerProName" = "Nume TriggerPro";
+"Position" = "Poziție";
+"ButtonInfo" = "Informații buton";
+"NoTriggerPro" = "Nu s-a găsit nicio configurație TriggerPro. Poți merge la Setări sau ține apăsat opțiunea TriggerPro în Meniul Joc pentru a crea una";
+"ManageTriggerPro" = "Gestionează TriggerPro";
+"EnableTriggerPro" = "Activează TriggerPro";
+"DisableTriggerPro" = "Dezactivează TriggerPro";
+"ActivateHold" = "Activează ținere: %@";
+"DeactivateHold" = "Anulează ținere: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings
index 949a8e39..b53c3365 100644
--- a/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings
@@ -538,12 +538,12 @@
"ImportMissingFile" = "Ошибка импорта %@: Отсутствует файл %@";
"MultiDiscBuilder" = "Помощник многодисковых игр";
-"MultiDiscBuilderDesc" = "Создает .m3u файлы для переключения дисков в многодисковых играх (.cue/.bin или .chd). Пропустите, если у вас уже есть .m3u - импортируйте его через Импорт Игр";
+"MultiDiscBuilderDesc" = "Создает .m3u файлы для переключения дисков в многодисковых играх (.cue(.bin) .cdi или .chd). Пропустите, если у вас уже есть .m3u - импортируйте его через Импорт Игр";
"M3uFileShare" = "Поделиться .m3u";
"M3uFileImport" = "Добавить в библиотеку";
"MultiDiscAddFile" = "Добавить файл %@";
-"MultiDiscImportErrorConflict" = "Ошибка: Нельзя смешивать .cue и .chd";
-"MultiDiscImportErrorMissing" = "Ошибка: Файлы .cue/.chd не найдены";
+"MultiDiscImportErrorConflict" = "Ошибка: Нельзя смешивать .cue .cdi и .chd";
+"MultiDiscImportErrorMissing" = "Ошибка: Файлы .cue/.cdi/.chd не найдены";
"GenerateM3uFailed" = "Ошибка создания .m3u";
"MultiDiscCloseAlert" = ".m3u создан. Закройте после импорта";
"MultiDiscContinueClose" = "Закрыть";
@@ -724,3 +724,39 @@
"FDSAlert" = "Эта опция доступна только для игр FDS.";
"DiskSideChange" = "Перевернуть диск";
"EjectDisk" = "Извлечь диск";
+
+"TriggerProDesc" = "Создание и управление расширенными пользовательскими кнопками";
+"AddButton" = "Добавить кнопку";
+"ButtonStyle" = "Стиль кнопки";
+"Mapping" = "Сопоставление";
+"Action" = "Действие";
+"Classic" = "Классический";
+"Flat" = "Плоский";
+"Custom" = "Пользовательский";
+"Size" = "Размер";
+"Opacity" = "Прозрачность";
+"CornerRadius" = "Радиус угла";
+"Simple" = "Простой";
+"Hold" = "Удержание";
+"Combo" = "Комбо";
+"RepeatTrigger" = "Повтор триггера";
+"RepeatInterval" = "Интервал повтора";
+"AutoStop" = "Автостоп";
+"HoldDuration" = "Длительность удержания";
+"PressDurationPerKey" = "Длительность нажатия на клавишу";
+"IntervalPerKey" = "Интервал между клавишами";
+"AddTriggerPro" = "Добавить TriggerPro";
+"SwitchPreviewSkin" = "Сменить скин предпросмотра";
+"SimpleActionDesc" = "Нажмите кнопку TriggerPro, чтобы мгновенно активировать все сопоставленные клавиши одновременно";
+"HoldActionDesc" = "Нажмите кнопку TriggerPro, чтобы удерживать сопоставленные клавиши. Нажмите еще раз, чтобы отпустить";
+"ComboActionDesc" = "Нажмите кнопку TriggerPro, чтобы активировать сопоставленные клавиши последовательно - идеально для аркадных комбо";
+"NoMappingAlert" = "Эта кнопка в настоящее время не имеет сопоставления и не будет выполнять никаких действий. Вы уверены, что хотите закрыть ее?";
+"TriggerProName" = "Имя TriggerPro";
+"Position" = "Позиция";
+"ButtonInfo" = "Информация о кнопке";
+"NoTriggerPro" = "Конфигурация TriggerPro не найдена. Вы можете перейти в Настройки или нажать и удерживать опцию TriggerPro в Игровом Меню, чтобы создать ее";
+"ManageTriggerPro" = "Управление TriggerPro";
+"EnableTriggerPro" = "Включить TriggerPro";
+"DisableTriggerPro" = "Отключить TriggerPro";
+"ActivateHold" = "Активировать удержание: %@";
+"DeactivateHold" = "Отменить удержание: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings
index 99c2ac2c..fdf8650f 100644
--- a/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings
@@ -542,12 +542,12 @@ Ak sa vyskytne nestabilita v 3DS, pozrite si «Časté otázky» alebo sa pripoj
"ImportMissingFile" = "Chyba pri importe %@: Chýbajúci súbor %@";
"MultiDiscBuilder" = "Pomocník pre viac diskov";
-"MultiDiscBuilderDesc" = "Vytvára vymeniteľné .m3u súbory pre hry na viac diskov (.cue/.bin alebo .chd). Preskočte, ak už máte .m3u - importujte priamo cez Import hry";
+"MultiDiscBuilderDesc" = "Vytvára vymeniteľné .m3u súbory pre hry na viac diskov (.cue(.bin) .cdi alebo .chd). Preskočte, ak už máte .m3u - importujte priamo cez Import hry";
"M3uFileShare" = "Zdieľať .m3u súbor";
"M3uFileImport" = "Pridať do knižnice";
"MultiDiscAddFile" = "Pridať súbor %@";
-"MultiDiscImportErrorConflict" = "Chyba: Nemiešajte .cue a .chd súbory";
-"MultiDiscImportErrorMissing" = "Chyba: Nenašli sa .cue/.chd súbory";
+"MultiDiscImportErrorConflict" = "Chyba: Nemiešajte .cue .cdi a .chd súbory";
+"MultiDiscImportErrorMissing" = "Chyba: Nenašli sa .cue/.cdi/.chd súbory";
"GenerateM3uFailed" = "Chyba pri vytváraní .m3u";
"MultiDiscCloseAlert" = ".m3u vytvorený. Zatvorte po importe";
"MultiDiscContinueClose" = "Zatvoriť";
@@ -728,3 +728,39 @@ Ak sa vyskytne nestabilita v 3DS, pozrite si «Časté otázky» alebo sa pripoj
"FDSAlert" = "Táto možnosť je k dispozícii len pre hry FDS.";
"DiskSideChange" = "Otočiť disk";
"EjectDisk" = "Vysunúť disk";
+
+"TriggerProDesc" = "Vytvárajte a spravujte pokročilé vlastné tlačidlá";
+"AddButton" = "Pridať tlačidlo";
+"ButtonStyle" = "Štýl tlačidla";
+"Mapping" = "Mapovanie";
+"Action" = "Akcia";
+"Classic" = "Klasický";
+"Flat" = "Plochý";
+"Custom" = "Vlastný";
+"Size" = "Veľkosť";
+"Opacity" = "Nepriehľadnosť";
+"CornerRadius" = "Polomer rohu";
+"Simple" = "Jednoduchý";
+"Hold" = "Podržanie";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Opakovať spúšťač";
+"RepeatInterval" = "Interval opakovania";
+"AutoStop" = "Automatické zastavenie";
+"HoldDuration" = "Dĺžka podržania";
+"PressDurationPerKey" = "Dĺžka stlačenia na kláves";
+"IntervalPerKey" = "Interval na kláves";
+"AddTriggerPro" = "Pridať TriggerPro";
+"SwitchPreviewSkin" = "Prepnúť skin náhľadu";
+"SimpleActionDesc" = "Kliknutím na tlačidlo TriggerPro okamžite aktivujte všetky mapované klávesy naraz";
+"HoldActionDesc" = "Kliknutím na tlačidlo TriggerPro podržte mapované klávesy. Kliknutím znova uvoľníte";
+"ComboActionDesc" = "Kliknutím na tlačidlo TriggerPro aktivujte mapované klávesy v poradí - ideálne pre arkádové kombá";
+"NoMappingAlert" = "Toto tlačidlo nemá žiadne mapovanie a nevykoná žiadnu akciu. Naozaj ho chcete zavrieť?";
+"TriggerProName" = "Názov TriggerPro";
+"Position" = "Pozícia";
+"ButtonInfo" = "Informácie o tlačidle";
+"NoTriggerPro" = "Nenašla sa žiadna konfigurácia TriggerPro. Môžete prejsť do Nastavení alebo podržať voľbu TriggerPro v Hernom menu pre vytvorenie";
+"ManageTriggerPro" = "Spravovať TriggerPro";
+"EnableTriggerPro" = "Povoliť TriggerPro";
+"DisableTriggerPro" = "Zakázať TriggerPro";
+"ActivateHold" = "Aktivovať podržanie: %@";
+"DeactivateHold" = "Zrušiť podržanie: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings
index 335d1050..317c0aed 100644
--- a/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings
@@ -536,12 +536,12 @@ Tryck på kontrollknappen...";
"ImportMissingFile" = "Misslyckades importera %@: Filen %@ saknas";
"MultiDiscBuilder" = "Multidiskhjälpare";
-"MultiDiscBuilderDesc" = "Skapar bytbara .m3u-filer för multidisk-spel (.cue/.bin eller .chd). Hoppa över om du redan har .m3u - importera direkt via Spelimport";
+"MultiDiscBuilderDesc" = "Skapar bytbara .m3u-filer för multidisk-spel (.cue(.bin) .cdi eller .chd). Hoppa över om du redan har .m3u - importera direkt via Spelimport";
"M3uFileShare" = "Dela .m3u-fil";
"M3uFileImport" = "Lägg till i bibliotek";
"MultiDiscAddFile" = "Lägg till %@-fil";
-"MultiDiscImportErrorConflict" = "Fel: Kan inte blanda .cue och .chd";
-"MultiDiscImportErrorMissing" = "Fel: Hittade inga .cue/.chd-filer";
+"MultiDiscImportErrorConflict" = "Fel: Kan inte blanda .cue .cdi och .chd";
+"MultiDiscImportErrorMissing" = "Fel: Hittade inga .cue/.cdi/.chd-filer";
"GenerateM3uFailed" = "Misslyckades skapa .m3u";
"MultiDiscCloseAlert" = ".m3u skapad. Stäng sidan efter import";
"MultiDiscContinueClose" = "Stäng";
@@ -722,3 +722,39 @@ Tryck på kontrollknappen...";
"FDSAlert" = "Detta alternativ är endast tillgängligt för FDS-spel.";
"DiskSideChange" = "Vänd Skiva";
"EjectDisk" = "Lägg Ut Skiva";
+
+"TriggerProDesc" = "Skapa och hantera avancerade anpassade knappar";
+"AddButton" = "Lägg till knapp";
+"ButtonStyle" = "Knappstil";
+"Mapping" = "Mappning";
+"Action" = "Handling";
+"Classic" = "Klassisk";
+"Flat" = "Platt";
+"Custom" = "Anpassad";
+"Size" = "Storlek";
+"Opacity" = "Opacitet";
+"CornerRadius" = "Hörnradie";
+"Simple" = "Enkel";
+"Hold" = "Håll";
+"Combo" = "Kombo";
+"RepeatTrigger" = "Upprepa utlösare";
+"RepeatInterval" = "Upprepningsintervall";
+"AutoStop" = "Auto stopp";
+"HoldDuration" = "Hålltid";
+"PressDurationPerKey" = "Trycktid per tangent";
+"IntervalPerKey" = "Intervall per tangent";
+"AddTriggerPro" = "Lägg till TriggerPro";
+"SwitchPreviewSkin" = "Byt förhandsgranskningsskin";
+"SimpleActionDesc" = "Tryck på TriggerPro-knappen för att omedelbart utlösa alla mappade tangenter på en gång";
+"HoldActionDesc" = "Tryck på TriggerPro-knappen för att hålla ned de mappade tangenterna. Tryck igen för att släppa";
+"ComboActionDesc" = "Tryck på TriggerPro-knappen för att utlösa de mappade tangenterna i sekvens - perfekt för arkadkombon";
+"NoMappingAlert" = "Denna knapp har för närvarande ingen mappning och kommer inte att utföra någon åtgärd. Är du säker på att du vill stänga den?";
+"TriggerProName" = "TriggerPro-namn";
+"Position" = "Position";
+"ButtonInfo" = "Knappinformation";
+"NoTriggerPro" = "Ingen TriggerPro-konfiguration hittades. Du kan gå till Inställningar eller hålla ned TriggerPro-alternativet i Spelmenyn för att skapa en";
+"ManageTriggerPro" = "Hantera TriggerPro";
+"EnableTriggerPro" = "Aktivera TriggerPro";
+"DisableTriggerPro" = "Inaktivera TriggerPro";
+"ActivateHold" = "Aktivera håll: %@";
+"DeactivateHold" = "Avbryt håll: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings
index 5aec9a3f..c1b1fba5 100644
--- a/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings
@@ -532,12 +532,12 @@
"ImportMissingFile" = "นำเข้า %@ ไม่สำเร็จ: ไม่พบไฟล์ %@";
"MultiDiscBuilder" = "ตัวช่วยหลายดิสก์";
-"MultiDiscBuilderDesc" = "สร้างไฟล์ .m3u สำหรับเปลี่ยนดิสก์ในเกมหลายดิสก์ (.cue/.bin หรือ .chd) ข้ามขั้นตอนนี้หากคุณมีไฟล์ .m3u อยู่แล้ว - นำเข้าได้โดยตรงผ่านการนำเข้าเกม";
+"MultiDiscBuilderDesc" = "สร้างไฟล์ .m3u สำหรับเปลี่ยนดิสก์ในเกมหลายดิสก์ (.cue(.bin) .cdi หรือ .chd) ข้ามขั้นตอนนี้หากคุณมีไฟล์ .m3u อยู่แล้ว - นำเข้าได้โดยตรงผ่านการนำเข้าเกม";
"M3uFileShare" = "แชร์ไฟล์ .m3u";
"M3uFileImport" = "เพิ่มไปที่ไลบรารี";
"MultiDiscAddFile" = "เพิ่มไฟล์ %@";
-"MultiDiscImportErrorConflict" = "ข้อผิดพลาด: ไม่สามารถผสมไฟล์ .cue และ .chd";
-"MultiDiscImportErrorMissing" = "ข้อผิดพลาด: ไม่พบไฟล์ .cue หรือ .chd";
+"MultiDiscImportErrorConflict" = "ข้อผิดพลาด: ไม่สามารถผสมไฟล์ .cue .cdi และ .chd";
+"MultiDiscImportErrorMissing" = "ข้อผิดพลาด: ไม่พบไฟล์ .cue .cdi หรือ .chd";
"GenerateM3uFailed" = "สร้างไฟล์ .m3u ไม่สำเร็จ";
"MultiDiscCloseAlert" = "สร้างไฟล์ .m3u เสร็จสิ้น ปิดหน้านี้หลังนำเข้าไปที่ไลบรารี";
"MultiDiscContinueClose" = "ปิด";
@@ -718,3 +718,39 @@
"FDSAlert" = "ตัวเลือกนี้ใช้ได้กับเกม FDS เท่านั้น";
"DiskSideChange" = "พลิกดิสก์";
"EjectDisk" = "ปลดดิสก์";
+
+"TriggerProDesc" = "สร้างและจัดการปุ่มปรับแต่งขั้นสูง";
+"AddButton" = "เพิ่มปุ่ม";
+"ButtonStyle" = "สไตล์ปุ่ม";
+"Mapping" = "การแมป";
+"Action" = "การดำเนินการ";
+"Classic" = "คลาสสิก";
+"Flat" = "เรียบ";
+"Custom" = "ปรับแต่ง";
+"Size" = "ขนาด";
+"Opacity" = "ความทึบแสง";
+"CornerRadius" = "รัศมีมุม";
+"Simple" = "ง่าย";
+"Hold" = "กดค้าง";
+"Combo" = "คอมโบ";
+"RepeatTrigger" = "ทริเกอร์ซ้ำ";
+"RepeatInterval" = "ช่วงเวลาทริเกอร์";
+"AutoStop" = "หยุดอัตโนมัติ";
+"HoldDuration" = "ระยะเวลากดค้าง";
+"PressDurationPerKey" = "ระยะเวลากดต่อปุ่ม";
+"IntervalPerKey" = "ช่วงเวลาต่อปุ่ม";
+"AddTriggerPro" = "เพิ่ม TriggerPro";
+"SwitchPreviewSkin" = "เปลี่ยนสกินตัวอย่าง";
+"SimpleActionDesc" = "แตะปุ่ม TriggerPro เพื่อทริเกอร์ปุ่มที่แมปทั้งหมดในครั้งเดียว";
+"HoldActionDesc" = "แตะปุ่ม TriggerPro เพื่อกดปุ่มที่แมปค้างไว้ แตะอีกครั้งเพื่อปล่อย";
+"ComboActionDesc" = "แตะปุ่ม TriggerPro เพื่อทริเกอร์ปุ่มที่แมปตามลำดับ เหมาะสำหรับคอมโบสไตล์อาร์เคด";
+"NoMappingAlert" = "ปุ่มนี้ยังไม่มีการแมปและจะไม่ทำงานใดๆ คุณแน่ใจหรือไม่ว่าจะปิด?";
+"TriggerProName" = "ชื่อ TriggerPro";
+"Position" = "ตำแหน่ง";
+"ButtonInfo" = "ข้อมูลปุ่ม";
+"NoTriggerPro" = "ไม่พบการกำหนดค่า TriggerPro คุณสามารถไปที่การตั้งค่าหรือกดค้างที่ตัวเลือก TriggerPro ในเมนูเกมเพื่อสร้าง";
+"ManageTriggerPro" = "จัดการ TriggerPro";
+"EnableTriggerPro" = "เปิดใช้งาน TriggerPro";
+"DisableTriggerPro" = "ปิดใช้งาน TriggerPro";
+"ActivateHold" = "เปิดใช้งานการกดค้าง: %@";
+"DeactivateHold" = "ยกเลิกการกดค้าง: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings
index 7002e75a..69cdd6e54 100644
--- a/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings
@@ -542,12 +542,12 @@ Kontrolcü düğmesine basın...";
"ImportMissingFile" = "%@ içe aktarma başarısız: %@ dosyası eksik";
"MultiDiscBuilder" = "Çoklu Disk Yardımcısı";
-"MultiDiscBuilderDesc" = "Çok diskli oyunlar (.cue/.bin veya .chd) için disk değiştirilebilir .m3u dosyaları oluşturur. Zaten .m3u dosyanız varsa atlayın - doğrudan Oyun İçe Aktarma ile içe aktarın";
+"MultiDiscBuilderDesc" = "Çok diskli oyunlar (.cue(.bin) .cdi veya .chd) için disk değiştirilebilir .m3u dosyaları oluşturur. Zaten .m3u dosyanız varsa atlayın - doğrudan Oyun İçe Aktarma ile içe aktarın";
"M3uFileShare" = ".m3u Dosyasını Paylaş";
"M3uFileImport" = "Kütüphaneye Ekle";
"MultiDiscAddFile" = "%@ Dosyası Ekle";
-"MultiDiscImportErrorConflict" = "Hata: .cue ve .chd dosyaları karıştırılamaz";
-"MultiDiscImportErrorMissing" = "Hata: .cue veya .chd dosyası bulunamadı";
+"MultiDiscImportErrorConflict" = "Hata: .cue .cdi ve .chd dosyaları karıştırılamaz";
+"MultiDiscImportErrorMissing" = "Hata: .cue .cdi veya .chd dosyası bulunamadı";
"GenerateM3uFailed" = ".m3u dosyası oluşturulamadı";
"MultiDiscCloseAlert" = ".m3u dosyası oluşturuldu. Kütüphaneye aktardıktan sonra bu sayfayı kapatın";
"MultiDiscContinueClose" = "Kapatmaya Devam Et";
@@ -728,3 +728,39 @@ Kontrolcü düğmesine basın...";
"FDSAlert" = "Bu seçenek yalnızca FDS oyunları için kullanılabilir.";
"DiskSideChange" = "Diski Çevir";
"EjectDisk" = "Diski Çıkar";
+
+"TriggerProDesc" = "Gelişmiş özel tuşlar oluşturun ve yönetin";
+"AddButton" = "Tuş Ekle";
+"ButtonStyle" = "Tuş Stili";
+"Mapping" = "Eşleme";
+"Action" = "Eylem";
+"Classic" = "Klasik";
+"Flat" = "Düz";
+"Custom" = "Özel";
+"Size" = "Boyut";
+"Opacity" = "Opaklık";
+"CornerRadius" = "Köşe Yarıçapı";
+"Simple" = "Basit";
+"Hold" = "Basılı Tut";
+"Combo" = "Kombinasyon";
+"RepeatTrigger" = "Tekrarla Tetikleyici";
+"RepeatInterval" = "Tekrarlama Aralığı";
+"AutoStop" = "Otomatik Durdurma";
+"HoldDuration" = "Basılı Tutma Süresi";
+"PressDurationPerKey" = "Tuş Başına Basma Süresi";
+"IntervalPerKey" = "Tuş Başına Aralık";
+"AddTriggerPro" = "TriggerPro Ekle";
+"SwitchPreviewSkin" = "Ön İzleme Görünümünü Değiştir";
+"SimpleActionDesc" = "TriggerPro tuşuna dokunarak eşlenen tüm tuşları anında aynı anda tetikleyin";
+"HoldActionDesc" = "TriggerPro tuşuna dokunarak eşlenen tuşları basılı tutun. Tekrar dokunarak bırakın";
+"ComboActionDesc" = "TriggerPro tuşuna dokunarak eşlenen tuşları sırayla tetikleyin - arcade tarzı kombinasyonlar için ideal";
+"NoMappingAlert" = "Bu tuşun şu anda hiç eşlemesi yok ve herhangi bir işlem yapmayacak. Kapatmak istediğinizden emin misiniz?";
+"TriggerProName" = "TriggerPro Adı";
+"Position" = "Konum";
+"ButtonInfo" = "Tuş Bilgisi";
+"NoTriggerPro" = "TriggerPro yapılandırması bulunamadı. Ayarlar'a gidebilir veya Oyun Menüsü'nde TriggerPro seçeneğini uzun basarak yeni bir tane oluşturabilirsiniz";
+"ManageTriggerPro" = "TriggerPro'yu Yönet";
+"EnableTriggerPro" = "TriggerPro'yu Etkinleştir";
+"DisableTriggerPro" = "TriggerPro'yu Devre Dışı Bırak";
+"ActivateHold" = "Basılı Tutmayı Etkinleştir: %@";
+"DeactivateHold" = "Basılı Tutmayı İptal Et: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings
index 4544c217..45356535 100644
--- a/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings
@@ -542,12 +542,12 @@
"ImportMissingFile" = "Помилка імпорту %@: Відсутній файл %@";
"MultiDiscBuilder" = "Помічник мультидисків";
-"MultiDiscBuilderDesc" = "Створює .m3u файли для зміни дисків у мультидискових іграх (.cue/.bin або .chd). Пропустіть, якщо вже маєте .m3u – імпортуйте напряму через Імпорт гри";
+"MultiDiscBuilderDesc" = "Створює .m3u файли для зміни дисків у мультидискових іграх (.cue(.bin) .cdi або .chd). Пропустіть, якщо вже маєте .m3u – імпортуйте напряму через Імпорт гри";
"M3uFileShare" = "Поділитися .m3u";
"M3uFileImport" = "Додати до бібліотеки";
"MultiDiscAddFile" = "Додати файл %@";
-"MultiDiscImportErrorConflict" = "Помилка: Не можна змішувати .cue та .chd";
-"MultiDiscImportErrorMissing" = "Помилка: Файлів .cue/.chd не знайдено";
+"MultiDiscImportErrorConflict" = "Помилка: Не можна змішувати .cue .cdi та .chd";
+"MultiDiscImportErrorMissing" = "Помилка: Файлів .cue/.cdi/.chd не знайдено";
"GenerateM3uFailed" = "Не вдалося створити .m3u";
"MultiDiscCloseAlert" = ".m3u створено. Закрийте після імпорту";
"MultiDiscContinueClose" = "Закрити";
@@ -728,3 +728,39 @@
"FDSAlert" = "Ця опція доступна лише для ігор FDS.";
"DiskSideChange" = "Перевернути диск";
"EjectDisk" = "Витягнути диск";
+
+"TriggerProDesc" = "Створюйте та керуйте розширеними користувацькими кнопками";
+"AddButton" = "Додати кнопку";
+"ButtonStyle" = "Стиль кнопки";
+"Mapping" = "Прив'язка";
+"Action" = "Дія";
+"Classic" = "Класичний";
+"Flat" = "Плоский";
+"Custom" = "Користувацький";
+"Size" = "Розмір";
+"Opacity" = "Прозорість";
+"CornerRadius" = "Радіус кута";
+"Simple" = "Простий";
+"Hold" = "Утримання";
+"Combo" = "Комбо";
+"RepeatTrigger" = "Повтор тригера";
+"RepeatInterval" = "Інтервал повторення";
+"AutoStop" = "Автозупинка";
+"HoldDuration" = "Тривалість утримання";
+"PressDurationPerKey" = "Тривалість натискання на клавішу";
+"IntervalPerKey" = "Інтервал між клавішами";
+"AddTriggerPro" = "Додати TriggerPro";
+"SwitchPreviewSkin" = "Змінити скін перегляду";
+"SimpleActionDesc" = "Натисніть кнопку TriggerPro, щоб миттєво активувати всі прив'язані клавіші одночасно";
+"HoldActionDesc" = "Натисніть кнопку TriggerPro, щоб утримувати прив'язані клавіші. Натисніть знову, щоб відпустити";
+"ComboActionDesc" = "Натисніть кнопку TriggerPro, щоб активувати прив'язані клавіші послідовно - ідеально для аркадних комбо";
+"NoMappingAlert" = "Ця кнопка наразі не має прив'язки і не виконуватиме жодних дій. Ви впевнені, що хочете закрити її?";
+"TriggerProName" = "Назва TriggerPro";
+"Position" = "Позиція";
+"ButtonInfo" = "Інформація про кнопку";
+"NoTriggerPro" = "Не знайдено конфігурації TriggerPro. Ви можете перейти до Налаштувань або натиснути та утримувати опцію TriggerPro в Ігровому меню, щоб створити її";
+"ManageTriggerPro" = "Керування TriggerPro";
+"EnableTriggerPro" = "Увімкнути TriggerPro";
+"DisableTriggerPro" = "Вимкнути TriggerPro";
+"ActivateHold" = "Активувати утримання: %@";
+"DeactivateHold" = "Скасувати утримання: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings
index 095a5409..183cbcf6 100644
--- a/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings
@@ -536,12 +536,12 @@ Nhấn nút điều khiển...";
"ImportMissingFile" = "Nhập %@ thất bại: Thiếu tệp %@";
"MultiDiscBuilder" = "Trợ lý đa đĩa";
-"MultiDiscBuilderDesc" = "Tạo tệp .m3u có thể đổi đĩa cho game đa đĩa (.cue/.bin hoặc .chd). Bỏ qua nếu đã có .m3u - nhập trực tiếp qua Nhập Game";
+"MultiDiscBuilderDesc" = "Tạo tệp .m3u có thể đổi đĩa cho game đa đĩa (.cue(.bin) .cdi hoặc .chd). Bỏ qua nếu đã có .m3u - nhập trực tiếp qua Nhập Game";
"M3uFileShare" = "Chia sẻ tệp .m3u";
"M3uFileImport" = "Thêm vào thư viện";
"MultiDiscAddFile" = "Thêm tệp %@";
-"MultiDiscImportErrorConflict" = "Lỗi: Không thể trộn tệp .cue và .chd";
-"MultiDiscImportErrorMissing" = "Lỗi: Không tìm thấy tệp .cue/.chd";
+"MultiDiscImportErrorConflict" = "Lỗi: Không thể trộn tệp .cue .cdi và .chd";
+"MultiDiscImportErrorMissing" = "Lỗi: Không tìm thấy tệp .cue/.cdi/.chd";
"GenerateM3uFailed" = "Tạo tệp .m3u thất bại";
"MultiDiscCloseAlert" = "Đã tạo tệp .m3u. Đóng trang sau khi nhập vào thư viện";
"MultiDiscContinueClose" = "Đóng";
@@ -722,3 +722,39 @@ Nhấn nút điều khiển...";
"FDSAlert" = "Tùy chọn này chỉ khả dụng cho trò chơi FDS.";
"DiskSideChange" = "Lật đĩa";
"EjectDisk" = "Đẩy đĩa ra";
+
+"TriggerProDesc" = "Tạo và quản lý nút tùy chỉnh nâng cao";
+"AddButton" = "Thêm nút";
+"ButtonStyle" = "Kiểu nút";
+"Mapping" = "Ánh xạ";
+"Action" = "Hành động";
+"Classic" = "Cổ điển";
+"Flat" = "Phẳng";
+"Custom" = "Tùy chỉnh";
+"Size" = "Kích thước";
+"Opacity" = "Độ mờ";
+"CornerRadius" = "Bán kính góc";
+"Simple" = "Đơn giản";
+"Hold" = "Giữ";
+"Combo" = "Combo";
+"RepeatTrigger" = "Lặp lại kích hoạt";
+"RepeatInterval" = "Khoảng thời gian lặp";
+"AutoStop" = "Tự động dừng";
+"HoldDuration" = "Thời gian giữ";
+"PressDurationPerKey" = "Thời gian nhấn mỗi phím";
+"IntervalPerKey" = "Khoảng thời gian mỗi phím";
+"AddTriggerPro" = "Thêm TriggerPro";
+"SwitchPreviewSkin" = "Chuyển đổi skin xem trước";
+"SimpleActionDesc" = "Chạm vào nút TriggerPro để kích hoạt ngay lập tức tất cả các phím đã ánh xạ";
+"HoldActionDesc" = "Chạm vào nút TriggerPro để giữ các phím đã ánh xạ. Chạm lần nữa để thả";
+"ComboActionDesc" = "Chạm vào nút TriggerPro để kích hoạt các phím đã ánh xạ theo trình tự - hoàn hảo cho combo kiểu arcade";
+"NoMappingAlert" = "Nút này hiện không có ánh xạ và sẽ không thực hiện hành động nào. Bạn có chắc muốn đóng không?";
+"TriggerProName" = "Tên TriggerPro";
+"Position" = "Vị trí";
+"ButtonInfo" = "Thông tin nút";
+"NoTriggerPro" = "Không tìm thấy cấu hình TriggerPro. Bạn có thể vào Cài đặt hoặc nhấn giữ tùy chọn TriggerPro trong Menu Trò chơi để tạo";
+"ManageTriggerPro" = "Quản lý TriggerPro";
+"EnableTriggerPro" = "Bật TriggerPro";
+"DisableTriggerPro" = "Tắt TriggerPro";
+"ActivateHold" = "Kích hoạt giữ: %@";
+"DeactivateHold" = "Hủy giữ: %@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings
index b9bfc196..740e5062 100644
--- a/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings
@@ -547,12 +547,12 @@
"ImportMissingFile" = "導入%@失敗:缺少文件%@";
"MultiDiscBuilder" = "多光碟助手";
-"MultiDiscBuilderDesc" = "此工具為多光碟遊戲(.cue/.bin或.chd)建立可換碟的.m3u檔案。若已有.m3u檔案,請跳過此步驟並直接透過遊戲導入功能添加";
+"MultiDiscBuilderDesc" = "此工具為多光碟遊戲(.cue(.bin) .cdi或.chd)建立可換碟的.m3u檔案。若已有.m3u檔案,請跳過此步驟並直接透過遊戲導入功能添加";
"M3uFileShare" = "分享.m3u檔案";
"M3uFileImport" = "加入遊戲庫";
"MultiDiscAddFile" = "加入%@檔案";
-"MultiDiscImportErrorConflict" = "錯誤:不可混合.cue與.chd檔案";
-"MultiDiscImportErrorMissing" = "錯誤:找不到.cue或.chd檔案";
+"MultiDiscImportErrorConflict" = "錯誤:不可混合.cue .cdi與.chd檔案";
+"MultiDiscImportErrorMissing" = "錯誤:找不到.cue .cdi或.chd檔案";
"GenerateM3uFailed" = "生成.m3u檔案失敗";
"MultiDiscCloseAlert" = ".m3u檔案已生成。導入遊戲庫後可關閉此頁面";
"MultiDiscContinueClose" = "繼續關閉";
@@ -734,3 +734,39 @@
"FDSAlert" = "此選項僅適用於FDS遊戲。";
"DiskSideChange" = "翻轉磁碟";
"EjectDisk" = "彈出磁碟";
+
+"TriggerProDesc" = "建立及管理進階自訂按鈕";
+"AddButton" = "新增按鈕";
+"ButtonStyle" = "按鈕樣式";
+"Mapping" = "按鍵映射";
+"Action" = "動作";
+"Classic" = "仿真";
+"Flat" = "扁平";
+"Custom" = "自訂";
+"Size" = "大小";
+"Opacity" = "透明度";
+"CornerRadius" = "圓角";
+"Simple" = "點擊";
+"Hold" = "長按";
+"Combo" = "連招";
+"RepeatTrigger" = "重複觸發";
+"RepeatInterval" = "觸發間隔";
+"AutoStop" = "自動停止";
+"HoldDuration" = "長按時長";
+"PressDurationPerKey" = "按鍵按壓時長";
+"IntervalPerKey" = "按鍵間隔";
+"AddTriggerPro" = "新增TriggerPro";
+"SwitchPreviewSkin" = "切換預覽皮膚";
+"SimpleActionDesc" = "點擊TriggerPro按鈕可立即觸發所有已映射按鍵";
+"HoldActionDesc" = "點擊TriggerPro按鈕可長按已映射按鍵,再次點擊即可釋放";
+"ComboActionDesc" = "點擊TriggerPro按鈕將按順序觸發已映射按鍵,非常適合街機類連擊操作";
+"NoMappingAlert" = "此按鈕目前沒有任何映射,無法執行操作。確定要關閉嗎?";
+"TriggerProName" = "TriggerPro名稱";
+"Position" = "位置";
+"ButtonInfo" = "按鈕資訊";
+"NoTriggerPro" = "未找到TriggerPro設定。你可以前往設定,或在遊戲選單中長按TriggerPro選項以建立新設定";
+"ManageTriggerPro" = "管理TriggerPro";
+"EnableTriggerPro" = "啟用TriggerPro";
+"DisableTriggerPro" = "停用TriggerPro";
+"ActivateHold" = "啟動長按:%@";
+"DeactivateHold" = "取消長按:%@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings
index a26e32cc..9a8a6747 100644
--- a/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings
@@ -548,12 +548,12 @@
"ImportMissingFile" = "导入%@失败,缺失文件:%@";
"MultiDiscBuilder" = "多碟助手";
-"MultiDiscBuilderDesc" = "多碟助手可以帮你将多碟游戏格式 .cue .bin 或 .chd 生成支持换碟的m3u文件, 如果你已经拥有m3u文件则无需使用此助手,直接使用游戏导入功能导入m3u";
+"MultiDiscBuilderDesc" = "多碟助手可以帮你将多碟游戏格式 .cue(.bin) .cdi 或 .chd 生成支持换碟的m3u文件, 如果你已经拥有m3u文件则无需使用此助手,直接使用游戏导入功能导入m3u";
"M3uFileShare" = "分享m3u文件";
"M3uFileImport" = "导入游戏库";
"MultiDiscAddFile" = "添加%@文件";
-"MultiDiscImportErrorConflict" = "cue和chd只能任选其一导入";
-"MultiDiscImportErrorMissing" = "没有发现cue或chd文件";
+"MultiDiscImportErrorConflict" = "cue cdi和chd只能任选其一导入";
+"MultiDiscImportErrorMissing" = "没有发现cue cdi或chd文件";
"GenerateM3uFailed" = "无法生成m3u文件";
"MultiDiscCloseAlert" = "m3u文件已经生成,如果你还没有导入到游戏库中,可以选择导入后关闭页面。";
"MultiDiscContinueClose" = "继续关闭";
@@ -738,3 +738,40 @@
"FDSAlert" = "此选项仅适用于FDS游戏。";
"DiskSideChange" = "翻转软盘";
"EjectDisk" = "弹出软盘";
+
+"TriggerProDesc" = "创建并管理高级自定义按键。";
+"AddButton" = "添加按键";
+"ButtonStyle" = "按键样式";
+"Mapping" = "按键映射";
+"Action" = "动作";
+"Classic" = "仿真";
+"Flat" = "扁平";
+"Custom" = "自定义";
+"Size" = "大小";
+"Opacity" = "透明度";
+"CornerRadius" = "圆角";
+"Simple" = "单击";
+"Hold" = "长按";
+"Combo" = "连招";
+"RepeatTrigger" = "重复触发";
+"RepeatInterval" = "触发间隔";
+"AutoStop" = "自动停止";
+"HoldDuration" = "长按时长";
+"PressDurationPerKey" = "按键按压时长";
+"IntervalPerKey" = "按键间隔";
+"AddTriggerPro" = "添加TriggerPro";
+"SwitchPreviewSkin" = "切换预览皮肤";
+"SimpleActionDesc" = "点击TriggerPro按钮可立即触发所有已映射按键。";
+"HoldActionDesc" = "点击TriggerPro按钮可长按已映射按键,再次点击即可释放。";
+"ComboActionDesc" = "点击TriggerPro按钮将按顺序触发已映射按键,非常适合街机类连击操作。";
+"NoMappingAlert" = "该按键当前没有任何映射,无法执行操作。确定要关闭吗?";
+"TriggerProName" = "TriggerPro名称";
+"Position" = "位置";
+"ButtonInfo" = "按键信息";
+"NoTriggerPro" = "未找到TriggerPro配置。您可以前往设置,或在游戏菜单中长按TriggerPro选项以创建新的配置。";
+"ManageTriggerPro" = "管理TriggerPro";
+"EnableTriggerPro" = "启用TriggerPro";
+"DisableTriggerPro" = "停用TriggerPro";
+"ActivateHold" = "启动长按:%@";
+"DeactivateHold" = "取消长按:%@";
+
diff --git a/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings
index b3c47089..8b6463ae 100644
--- a/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings
@@ -547,12 +547,12 @@
"ImportMissingFile" = "匯入 %@ 失敗:缺少檔案 %@";
"MultiDiscBuilder" = "多光碟助手";
-"MultiDiscBuilderDesc" = "此工具為多光碟遊戲(.cue/.bin 或 .chd)建立可換片的.m3u檔案。若已有.m3u檔請略過此步驟,直接透過遊戲匯入功能新增";
+"MultiDiscBuilderDesc" = "此工具為多光碟遊戲(.cue(.bin) .cdi 或 .chd)建立可換片的.m3u檔案。若已有.m3u檔請略過此步驟,直接透過遊戲匯入功能新增";
"M3uFileShare" = "分享.m3u檔案";
"M3uFileImport" = "新增至遊戲庫";
"MultiDiscAddFile" = "新增 %@ 檔案";
-"MultiDiscImportErrorConflict" = "錯誤:無法混合.cue與.chd檔案";
-"MultiDiscImportErrorMissing" = "錯誤:找不到.cue或.chd檔案";
+"MultiDiscImportErrorConflict" = "錯誤:無法混合.cue .cdi與.chd檔案";
+"MultiDiscImportErrorMissing" = "錯誤:找不到.cue .cdi或.chd檔案";
"GenerateM3uFailed" = "產生.m3u檔案失敗";
"MultiDiscCloseAlert" = "已產生.m3u檔案,匯入遊戲庫後可關閉此頁面";
"MultiDiscContinueClose" = "繼續關閉";
@@ -734,3 +734,39 @@
"FDSAlert" = "此選項僅適用於FDS遊戲。";
"DiskSideChange" = "翻轉磁碟";
"EjectDisk" = "退出磁碟";
+
+"TriggerProDesc" = "建立並管理進階自訂按鈕";
+"AddButton" = "新增按鈕";
+"ButtonStyle" = "按鈕樣式";
+"Mapping" = "按鍵映射";
+"Action" = "動作";
+"Classic" = "仿真";
+"Flat" = "扁平";
+"Custom" = "自訂";
+"Size" = "大小";
+"Opacity" = "透明度";
+"CornerRadius" = "圓角";
+"Simple" = "點擊";
+"Hold" = "長按";
+"Combo" = "連招";
+"RepeatTrigger" = "重複觸發";
+"RepeatInterval" = "觸發間隔";
+"AutoStop" = "自動停止";
+"HoldDuration" = "長按時長";
+"PressDurationPerKey" = "按鍵按壓時長";
+"IntervalPerKey" = "按鍵間隔";
+"AddTriggerPro" = "新增TriggerPro";
+"SwitchPreviewSkin" = "切換預覽皮膚";
+"SimpleActionDesc" = "點擊TriggerPro按鈕可立即觸發所有已映射按鍵";
+"HoldActionDesc" = "點擊TriggerPro按鈕可長按已映射按鍵,再次點擊即可釋放";
+"ComboActionDesc" = "點擊TriggerPro按鈕將按順序觸發已映射按鍵,非常適合街機類連擊操作";
+"NoMappingAlert" = "此按鈕目前沒有任何映射,無法執行操作。確定要關閉嗎?";
+"TriggerProName" = "TriggerPro名稱";
+"Position" = "位置";
+"ButtonInfo" = "按鈕資訊";
+"NoTriggerPro" = "未找到TriggerPro設定。您可以前往設定,或在遊戲選單中長按TriggerPro選項以建立新設定";
+"ManageTriggerPro" = "管理TriggerPro";
+"EnableTriggerPro" = "啟用TriggerPro";
+"DisableTriggerPro" = "停用TriggerPro";
+"ActivateHold" = "啟動長按:%@";
+"DeactivateHold" = "取消長按:%@";
\ No newline at end of file
diff --git a/ManicEmu/ManicEmu/Sources/Base/Bridging-Header.h b/ManicEmu/ManicEmu/Sources/Base/Bridging-Header.h
index 444d6acc..70c967dd 100644
--- a/ManicEmu/ManicEmu/Sources/Base/Bridging-Header.h
+++ b/ManicEmu/ManicEmu/Sources/Base/Bridging-Header.h
@@ -19,3 +19,4 @@
#import <UMAPM/UMAPMConfig.h>
#import <UMAPM/UMCrashConfigure.h>
#endif
+#import "ShadowLabel.h"
diff --git a/ManicEmu/ManicEmu/Sources/Base/Constants.swift b/ManicEmu/ManicEmu/Sources/Base/Constants.swift
index 74f58d63..42a2dd82 100644
--- a/ManicEmu/ManicEmu/Sources/Base/Constants.swift
+++ b/ManicEmu/ManicEmu/Sources/Base/Constants.swift
@@ -337,6 +337,7 @@ struct Constants {
static let HasShowPS1PlayAlert = "HasShowPS1PlayAlert"
static let HasShowJumpGameInfoAlert = "HasShowJumpGameInfoAlert"
static let Appearance = "Appearance"
+ static let HalloweenIconShowUpDate = "HalloweenIconShowUpDate"
}
struct Font {
@@ -445,6 +446,8 @@ struct Constants {
static let RandomGameLimit = 10
///非会员最大金手指数量
static let NonMemberCheatCodeCount = 3
+ ///非会员最大TriggerPro数量
+ static let NonMemberTriggerProCount = 3
/// 动画执行时间
static let LongAnimationDuration = 1.0
///主题颜色最大数量
@@ -500,7 +503,7 @@ struct Constants {
struct URLs {
#if DEBUG
- static let ManicEMU = "http://10.10.10.20:4000/"
+ static let ManicEMU = "http://10.10.10.2:4000/"
#else
static let ManicEMU = "https://manicemu.site/"
#endif
@@ -539,7 +542,7 @@ struct Constants {
static func DeltaStyles(gameType: GameType) -> URL {
let deltastyles = "https://deltastyles.com"
switch gameType {
- case .nes: return URL(string: "\(deltastyles)/systems/nes")!
+ case .nes, .fds: return URL(string: "\(deltastyles)/systems/nes")!
case .snes: return URL(string: "\(deltastyles)/systems/snes")!
case .gbc: return URL(string: "\(deltastyles)/systems/gbc")!
case .gb: return URL(string: "\(deltastyles)/systems/gbc")!
@@ -627,7 +630,7 @@ struct Constants {
BIOSItem(fileName: "gba_bios.bin", imported: false, desc: "Game Boy Advance BIOS", required: false)
]
- static let NESBios = [
+ static let FDSBios = [
BIOSItem(fileName: "disksys.rom", imported: false, desc: "Family Computer Disk System BIOS", required: false)
]
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift
index 1e1938ba..b17456b1 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Models/ExtraKey.swift
@@ -35,4 +35,7 @@ enum ExtraKey: String {
case manualPage
case manualFileName
case nesPalette
+ case triggerProID
+ case forceFullSkin
+ case recoverIcon
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/LowestHaderReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/LowestHaderReusableView.swift
index 2186b4b9..ff208191 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/LowestHaderReusableView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/LowestHaderReusableView.swift
@@ -71,3 +71,83 @@ class BackgroundColorHaderReusableView: UICollectionReusableView {
}
}
+
+class BackgroundColorTitleAndButtonHaderReusableView: UICollectionReusableView {
+ var titleLabel: UILabel = {
+ let view = UILabel()
+ view.textColor = Constants.Color.LabelSecondary.forceStyle(UIDevice.isDarkMode ? .dark : .light)
+ view.font = Constants.Font.body(size: .s, weight: .semibold)
+ return view
+ }()
+
+ var button: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)), enableGlass: false)
+ view.enableRoundCorner = true
+ return view
+ }()
+
+ var didTapButton: (()->Void)? = nil
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ addSubviews([titleLabel, button])
+ makeBlur(blurColor: Constants.Color.Background)
+
+ titleLabel.snp.makeConstraints { make in
+ make.centerY.equalToSuperview()
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceHuge)
+ }
+
+ button.snp.makeConstraints { make in
+ make.size.equalTo(CGSize(width: 44, height: 26))
+ make.centerY.equalTo(titleLabel)
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceHuge)
+ }
+
+ button.addTapGesture { [weak self] gesture in
+ self?.didTapButton?()
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
+
+class BackgroundColorTitleAndDetailHaderReusableView: UICollectionReusableView {
+ var titleLabel: UILabel = {
+ let view = UILabel()
+ view.textColor = Constants.Color.LabelSecondary.forceStyle(UIDevice.isDarkMode ? .dark : .light)
+ view.font = Constants.Font.body(size: .s, weight: .semibold)
+ return view
+ }()
+
+ var detailLabel: UILabel = {
+ let view = UILabel()
+ view.textColor = Constants.Color.LabelSecondary.forceStyle(UIDevice.isDarkMode ? .dark : .light)
+ view.font = Constants.Font.caption(size: .l, weight: .regular)
+ view.numberOfLines = 0
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ addSubviews([titleLabel, detailLabel])
+ makeBlur(blurColor: Constants.Color.Background)
+
+ titleLabel.snp.makeConstraints { make in
+ make.top.equalToSuperview().offset(14)
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceHuge)
+ }
+
+ detailLabel.snp.makeConstraints { make in
+ make.top.equalTo(titleLabel.snp.bottom).offset(2)
+ make.leading.equalTo(titleLabel)
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceHuge)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/ShadowLabel.h b/ManicEmu/ManicEmu/Sources/Business/Common/Views/ShadowLabel.h
new file mode 100644
index 00000000..3cd6108c
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/ShadowLabel.h
@@ -0,0 +1,59 @@
+//
+// ShadowLabel.h
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/23.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for ShadowLabel.
+FOUNDATION_EXPORT double ShadowLabelVersionNumber;
+
+//! Project version string for ShadowLabel.
+FOUNDATION_EXPORT const unsigned char ShadowLabelVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <ShadowLabel/PublicHeader.h>
+
+
+typedef NS_ENUM(NSInteger, ShadowLabelStrokePosition) {
+ ShadowLabelStrokePositionOutside,
+ ShadowLabelStrokePositionCenter,
+ ShadowLabelStrokePositionInside
+};
+
+typedef NS_OPTIONS(NSUInteger, ShadowLabelFadeTruncatingMode) {
+ ShadowLabelFadeTruncatingModeNone = 0,
+ ShadowLabelFadeTruncatingModeTail = 1 << 0,
+ ShadowLabelFadeTruncatingModeHead = 1 << 1,
+ ShadowLabelFadeTruncatingModeHeadAndTail = ShadowLabelFadeTruncatingModeHead | ShadowLabelFadeTruncatingModeTail
+};
+
+@interface ShadowLabel : UILabel
+
+@property (nonatomic, assign) CGFloat letterSpacing;
+@property (nonatomic, assign) CGFloat lineSpacing;
+
+@property (nonatomic, assign) CGFloat shadowBlur;
+
+@property (nonatomic, assign) CGFloat innerShadowBlur;
+@property (nonatomic, assign) CGSize innerShadowOffset;
+@property (nonatomic, strong) UIColor *innerShadowColor;
+
+@property (nonatomic, assign) CGFloat strokeSize;
+@property (nonatomic, strong) UIColor *strokeColor;
+@property (nonatomic, assign) ShadowLabelStrokePosition strokePosition;
+
+@property (nonatomic, strong) UIColor *gradientStartColor;
+@property (nonatomic, strong) UIColor *gradientEndColor;
+@property (nonatomic, copy) NSArray *gradientColors;
+@property (nonatomic, assign) CGPoint gradientStartPoint;
+@property (nonatomic, assign) CGPoint gradientEndPoint;
+
+@property (nonatomic, assign) ShadowLabelFadeTruncatingMode fadeTruncatingMode;
+
+@property (nonatomic, assign) UIEdgeInsets textInsets;
+@property (nonatomic, assign) BOOL automaticallyAdjustTextInsets;
+
+@end
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/ShadowLabel.m b/ManicEmu/ManicEmu/Sources/Business/Common/Views/ShadowLabel.m
new file mode 100644
index 00000000..c09bf826
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/ShadowLabel.m
@@ -0,0 +1,646 @@
+//
+// ShadowLabel.m
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/23.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+#import <Availability.h>
+#if !__has_feature(objc_arc)
+#error This class requires automatic reference counting.
+#endif
+
+
+#import <CoreText/CoreText.h>
+
+#import "ShadowLabel.h"
+
+@implementation ShadowLabel
+
+- (instancetype)initWithFrame:(CGRect)frame {
+ if (self = [super initWithFrame:frame]) {
+ self.backgroundColor = [UIColor clearColor];
+ [self setDefaults];
+ }
+ return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+ if (self = [super initWithCoder:aDecoder]) {
+ [self setDefaults];
+ }
+ return self;
+}
+
+- (void)setDefaults {
+ self.clipsToBounds = YES;
+ self.letterSpacing = 0.0;
+ self.gradientStartPoint = CGPointMake(0.5, 0.2);
+ self.gradientEndPoint = CGPointMake(0.5, 0.8);
+ self.automaticallyAdjustTextInsets = YES;
+}
+
+- (BOOL)hasShadow {
+ return self.shadowColor && ![self.shadowColor isEqual:[UIColor clearColor]] && (self.shadowBlur > 0.0 || !CGSizeEqualToSize(self.shadowOffset, CGSizeZero));
+}
+
+- (BOOL)hasInnerShadow {
+ return self.innerShadowColor && ![self.innerShadowColor isEqual:[UIColor clearColor]] && (self.innerShadowBlur > 0.0 || !CGSizeEqualToSize(self.innerShadowOffset, CGSizeZero));
+}
+
+- (BOOL)hasStroke {
+ return self.strokeSize > 0.0 && ![self.strokeColor isEqual:[UIColor clearColor]];
+}
+
+- (BOOL)hasGradient {
+ return self.gradientColors.count > 1;
+}
+
+- (BOOL)hasFadeTruncating {
+ return self.fadeTruncatingMode != ShadowLabelFadeTruncatingModeNone;
+}
+
+- (CGSize)sizeThatFits:(CGSize)size {
+ return [self intrinsicContentSize];
+}
+
+- (CGSize)intrinsicContentSize {
+ if (!self.text || [self.text isEqualToString:@""]) {
+ return CGSizeZero;
+ }
+
+ CGRect textRect;
+ CTFrameRef frameRef = [self frameRefFromSize:CGSizeMake(self.preferredMaxLayoutWidth, CGFLOAT_MAX) textRectOutput:&textRect];
+ CFRelease(frameRef);
+
+ return CGSizeMake(ceilf(CGRectGetWidth(textRect) + self.textInsets.left + self.textInsets.right),
+ ceilf(CGRectGetHeight(textRect) + self.textInsets.top + self.textInsets.bottom));
+}
+
+#pragma mark - Accessors and Mutators
+
+- (void)setShadowBlur:(CGFloat)shadowBlur {
+ _shadowBlur = fmaxf(shadowBlur, 0.0);
+}
+
+- (UIColor *)gradientStartColor {
+ return self.gradientColors.count ? self.gradientColors.firstObject : nil;
+}
+
+- (void)setGradientStartColor:(UIColor *)gradientStartColor {
+ if (gradientStartColor == nil) {
+ self.gradientColors = nil;
+ } else if (self.gradientColors.count < 2) {
+ self.gradientColors = @[gradientStartColor, gradientStartColor];
+ } else if (![self.gradientColors.firstObject isEqual:gradientStartColor]) {
+ NSMutableArray *colors = [self.gradientColors mutableCopy];
+ colors[0] = gradientStartColor;
+ self.gradientColors = colors;
+ }
+}
+
+- (UIColor *)gradientEndColor {
+ return self.gradientColors.lastObject;
+}
+
+- (void)setGradientEndColor:(UIColor *)gradientEndColor {
+ if (gradientEndColor == nil) {
+ self.gradientColors = nil;
+ } else if (self.gradientColors.count < 2) {
+ self.gradientColors = @[gradientEndColor, gradientEndColor];
+ } else if (![self.gradientColors.lastObject isEqual:gradientEndColor]) {
+ NSMutableArray *colors = [self.gradientColors mutableCopy];
+ colors[colors.count - 1] = gradientEndColor;
+ self.gradientColors = colors;
+ }
+}
+
+- (void)setGradientColors:(NSArray *)gradientColors {
+ if (self.gradientColors != gradientColors) {
+ _gradientColors = [gradientColors copy];
+ [self setNeedsDisplay];
+ }
+}
+
+- (void)setTextInsets:(UIEdgeInsets)textInsets {
+ if (!UIEdgeInsetsEqualToEdgeInsets(self.textInsets, textInsets)) {
+ _textInsets = textInsets;
+ [self setNeedsDisplay];
+ }
+}
+
+- (CGFloat)strokeSizeDependentOnStrokePosition {
+ switch (self.strokePosition) {
+ case ShadowLabelStrokePositionCenter:
+ return self.strokeSize;
+
+ default:
+ // Stroke width times 2, because CG draws a centered stroke. We cut the rest into halves.
+ return self.strokeSize * 2.0;
+ }
+}
+
+#pragma mark - Drawing
+
+- (void)drawRect:(CGRect)rect {
+ // Don't draw anything, if there is no text.
+ if (!self.text || [self.text isEqualToString:@""]) {
+ return;
+ }
+
+ // -------
+ // Determine what has to be drawn.
+ // -------
+
+ BOOL hasShadow = [self hasShadow];
+ BOOL hasInnerShadow = [self hasInnerShadow];
+ BOOL hasStroke = [self hasStroke];
+ BOOL hasGradient = [self hasGradient];
+ BOOL hasFadeTruncating = [self hasFadeTruncating];
+ BOOL needsMask = hasGradient || (hasStroke && self.strokePosition == ShadowLabelStrokePositionInside) || hasInnerShadow;
+
+ // -------
+ // Step 1: Begin new drawing context, where we will apply all our styles.
+ // -------
+
+ UIGraphicsBeginImageContextWithOptions(rect.size, NO, 0.0);
+ CGContextRef context = UIGraphicsGetCurrentContext();
+ CGImageRef alphaMask = NULL;
+ CGRect textRect;
+ CTFrameRef frameRef = [self frameRefFromSize:self.bounds.size textRectOutput:&textRect];
+
+ // Invert everything, because CG works with an inverted coordinate system.
+ CGContextTranslateCTM(context, 0.0, CGRectGetHeight(rect));
+ CGContextScaleCTM(context, 1.0, -1.0);
+
+ // -------
+ // Step 2: Prepare mask.
+ // -------
+
+ if (needsMask) {
+ CGContextSaveGState(context);
+
+ // Draw alpha mask.
+ if (hasStroke) {
+ // Text needs invisible stroke for consistent character glyph widths.
+ CGContextSetTextDrawingMode(context, kCGTextFillStroke);
+ CGContextSetLineWidth(context, [self strokeSizeDependentOnStrokePosition]);
+ CGContextSetLineJoin(context, kCGLineJoinRound);
+ [[UIColor clearColor] setStroke];
+ } else {
+ CGContextSetTextDrawingMode(context, kCGTextFill);
+ }
+
+ [[UIColor whiteColor] setFill];
+ CTFrameDraw(frameRef, context);
+
+ // Save alpha mask.
+ alphaMask = CGBitmapContextCreateImage(context);
+
+ // Clear the content.
+ CGContextClearRect(context, rect);
+
+ CGContextRestoreGState(context);
+ }
+
+ // -------
+ // Step 3: Draw text normally, or with gradient.
+ // -------
+
+ CGContextSaveGState(context);
+
+ if (!hasGradient) {
+ // Draw text.
+ if (hasStroke) {
+ // Text needs invisible stroke for consistent character glyph widths.
+ CGContextSetTextDrawingMode(context, kCGTextFillStroke);
+ CGContextSetLineWidth(context, [self strokeSizeDependentOnStrokePosition]);
+ CGContextSetLineJoin(context, kCGLineJoinRound);
+ [[UIColor clearColor] setStroke];
+ } else {
+ CGContextSetTextDrawingMode(context, kCGTextFill);
+ }
+
+ CTFrameDraw(frameRef, context);
+ } else {
+ // Clip the current context to alpha mask.
+ CGContextClipToMask(context, rect, alphaMask);
+
+ // Invert back to draw the gradient correctly.
+ CGContextTranslateCTM(context, 0.0, CGRectGetHeight(rect));
+ CGContextScaleCTM(context, 1.0, -1.0);
+
+ // Get gradient colors as CGColor.
+ NSMutableArray *gradientColors = [NSMutableArray arrayWithCapacity:self.gradientColors.count];
+ for (UIColor *color in self.gradientColors) {
+ [gradientColors addObject:(__bridge id)color.CGColor];
+ }
+
+ // Create gradient.
+ CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+ CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef)gradientColors, NULL);
+ CGPoint startPoint = CGPointMake(textRect.origin.x + self.gradientStartPoint.x * CGRectGetWidth(textRect),
+ textRect.origin.y + self.gradientStartPoint.y * CGRectGetHeight(textRect));
+ CGPoint endPoint = CGPointMake(textRect.origin.x + self.gradientEndPoint.x * CGRectGetWidth(textRect),
+ textRect.origin.y + self.gradientEndPoint.y * CGRectGetHeight(textRect));
+
+ // Draw gradient.
+ CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation);
+
+ // Clean up.
+ CGColorSpaceRelease(colorSpace);
+ CGGradientRelease(gradient);
+ }
+
+ CGContextRestoreGState(context);
+
+ // -------
+ // Step 4: Draw inner shadow.
+ // -------
+
+ if (hasInnerShadow) {
+ CGContextSaveGState(context);
+
+ // Clip the current context to alpha mask.
+ CGContextClipToMask(context, rect, alphaMask);
+
+ // Invert to draw the inner shadow correctly.
+ CGContextTranslateCTM(context, 0.0, CGRectGetHeight(rect));
+ CGContextScaleCTM(context, 1.0, -1.0);
+
+ // Draw inner shadow.
+ CGImageRef shadowImage = [self inverseMaskFromAlphaMask:alphaMask withRect:rect];
+ CGContextSetShadowWithColor(context, self.innerShadowOffset, self.innerShadowBlur, self.innerShadowColor.CGColor);
+ CGContextSetBlendMode(context, kCGBlendModeDarken);
+ CGContextDrawImage(context, rect, shadowImage);
+
+ // Clean up.
+ CGImageRelease(shadowImage);
+
+ CGContextRestoreGState(context);
+ }
+
+ // -------
+ // Step 5: Draw stroke.
+ // -------
+
+ if (hasStroke) {
+ CGContextSaveGState(context);
+
+ CGContextSetTextDrawingMode(context, kCGTextStroke);
+
+ CGImageRef image = NULL;
+
+ if (self.strokePosition == ShadowLabelStrokePositionOutside) {
+ // Create an image from the text.
+ image = CGBitmapContextCreateImage(context);
+ } else if (self.strokePosition == ShadowLabelStrokePositionInside) {
+ // Clip the current context to alpha mask.
+ CGContextClipToMask(context, rect, alphaMask);
+ }
+
+ // Draw stroke.
+ CGImageRef strokeImage = [self strokeImageWithRect:rect frameRef:frameRef strokeSize:[self strokeSizeDependentOnStrokePosition] strokeColor:self.strokeColor];
+ CGContextDrawImage(context, rect, strokeImage);
+
+ if (self.strokePosition == ShadowLabelStrokePositionOutside) {
+ // Draw the saved image over half of the stroke.
+ CGContextDrawImage(context, rect, image);
+ }
+
+ // Clean up.
+ CGImageRelease(strokeImage);
+ CGImageRelease(image);
+
+ CGContextRestoreGState(context);
+ }
+
+ // -------
+ // Step 6: Draw shadow.
+ // -------
+
+ if (hasShadow) {
+ CGContextSaveGState(context);
+
+ // Create an image from the text.
+ CGImageRef image = CGBitmapContextCreateImage(context);
+
+ // Clear the content.
+ CGContextClearRect(context, rect);
+
+ // Set shadow attributes.
+ CGContextSetShadowWithColor(context, self.shadowOffset, self.shadowBlur, self.shadowColor.CGColor);
+
+ // Draw the saved image, which throws off a shadow.
+ CGContextDrawImage(context, rect, image);
+
+ // Clean up.
+ CGImageRelease(image);
+
+ CGContextRestoreGState(context);
+ }
+
+ // -------
+ // Step 7: Draw fade truncating.
+ // -------
+
+ if (hasFadeTruncating) {
+ CGContextSaveGState(context);
+
+ // Create an image from the text.
+ CGImageRef image = CGBitmapContextCreateImage(context);
+
+ // Clear the content.
+ CGContextClearRect(context, rect);
+
+ // Clip the current context to linear gradient mask.
+ CGImageRef linearGradientImage = [self linearGradientImageWithRect:rect fadeHead:self.fadeTruncatingMode & ShadowLabelFadeTruncatingModeHead fadeTail:self.fadeTruncatingMode & ShadowLabelFadeTruncatingModeTail];
+ CGContextClipToMask(context, self.bounds, linearGradientImage);
+
+ // Draw the saved image, which is clipped by the linear gradient mask.
+ CGContextDrawImage(context, rect, image);
+
+ // Clean up.
+ CGImageRelease(linearGradientImage);
+ CGImageRelease(image);
+
+ CGContextRestoreGState(context);
+ }
+
+ // -------
+ // Step 8: End drawing context and finally draw the text with all styles.
+ // -------
+
+ UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+ UIGraphicsEndImageContext();
+ [image drawInRect:rect];
+
+ // -------
+ // Clean up.
+ // -------
+
+ if (needsMask) {
+ CGImageRelease(alphaMask);
+ }
+
+ CFRelease(frameRef);
+}
+
+- (CTFrameRef)frameRefFromSize:(CGSize)size textRectOutput:(CGRect *)textRectOutput CF_RETURNS_RETAINED {
+ // Set up font.
+ CTFontRef fontRef = CTFontCreateWithFontDescriptor((__bridge CTFontDescriptorRef)self.font.fontDescriptor, self.font.pointSize, NULL);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+ CTTextAlignment alignment = NSTextAlignmentToCTTextAlignment(self.textAlignment);
+#else
+ CTTextAlignment alignment = NSTextAlignmentToCTTextAlignment ? NSTextAlignmentToCTTextAlignment(self.textAlignment) : [self CTTextAlignmentFromNSTextAlignment:self.textAlignment];
+#endif
+ CTLineBreakMode lineBreakMode = (CTLineBreakMode)self.lineBreakMode;
+ CGFloat lineSpacing = self.lineSpacing;
+ CTParagraphStyleSetting paragraphStyleSettings[] = {
+ {kCTParagraphStyleSpecifierAlignment, sizeof(CTTextAlignment), &alignment},
+ {kCTParagraphStyleSpecifierLineBreakMode, sizeof(CTLineBreakMode), &lineBreakMode},
+ {kCTParagraphStyleSpecifierLineSpacingAdjustment, sizeof(CGFloat), &lineSpacing}
+ };
+ CTParagraphStyleRef paragraphStyleRef = CTParagraphStyleCreate(paragraphStyleSettings, 3);
+ CFNumberRef kernRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberCGFloatType, &_letterSpacing);
+
+ // Set up attributed string.
+ CFStringRef keys[] = {kCTFontAttributeName, kCTParagraphStyleAttributeName, kCTForegroundColorAttributeName, kCTKernAttributeName};
+ CFTypeRef values[] = {fontRef, paragraphStyleRef, self.textColor.CGColor, kernRef};
+ CFDictionaryRef attributes = CFDictionaryCreate(kCFAllocatorDefault, (const void **)&keys, (const void **)&values, sizeof(keys) / sizeof(keys[0]), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+ CFRelease(fontRef);
+ CFRelease(paragraphStyleRef);
+ CFRelease(kernRef);
+
+ CFStringRef stringRef = (CFStringRef)CFBridgingRetain(self.text);
+ CFAttributedStringRef attributedStringRef = CFAttributedStringCreate(kCFAllocatorDefault, stringRef, attributes);
+ CFRelease(stringRef);
+ CFRelease(attributes);
+
+ // Set up frame.
+ CTFramesetterRef framesetterRef = CTFramesetterCreateWithAttributedString(attributedStringRef);
+ CFRelease(attributedStringRef);
+
+ if (self.automaticallyAdjustTextInsets) {
+ self.textInsets = [self fittingTextInsets];
+ }
+ CGRect contentRect = [self contentRectFromSize:size withInsets:self.textInsets];
+ CGRect textRect = [self textRectFromContentRect:contentRect framesetterRef:framesetterRef];
+ if (textRectOutput) {
+ *textRectOutput = textRect;
+ }
+ CGMutablePathRef pathRef = CGPathCreateMutable();
+ CGPathAddRect(pathRef, NULL, textRect);
+
+ CTFrameRef frameRef = CTFramesetterCreateFrame(framesetterRef, CFRangeMake(0, self.text.length), pathRef, NULL);
+ CFRelease(framesetterRef);
+ CGPathRelease(pathRef);
+ return frameRef;
+}
+
+// Workaround for < iOS 6.
+- (CTTextAlignment)CTTextAlignmentFromNSTextAlignment:(NSTextAlignment)nsTextAlignment {
+ switch (nsTextAlignment) {
+ case NSTextAlignmentLeft:
+ return kCTTextAlignmentLeft;
+ case NSTextAlignmentCenter:
+ return kCTTextAlignmentCenter;
+ case NSTextAlignmentRight:
+ return kCTTextAlignmentRight;
+ case NSTextAlignmentJustified:
+ return kCTTextAlignmentJustified;
+ case NSTextAlignmentNatural:
+ return kCTTextAlignmentNatural;
+ default:
+ return 0;
+ }
+}
+
+- (CGRect)contentRectFromSize:(CGSize)size withInsets:(UIEdgeInsets)insets {
+ CGRect contentRect = CGRectMake(0.0, 0.0, size.width, size.height);
+
+ // Apply insets.
+ contentRect.origin.x += insets.left;
+ contentRect.origin.y += insets.top;
+ contentRect.size.width -= insets.left + insets.right;
+ contentRect.size.height -= insets.top + insets.bottom;
+
+ return contentRect;
+}
+
+- (CGRect)textRectFromContentRect:(CGRect)contentRect framesetterRef:(CTFramesetterRef)framesetterRef {
+ CGSize suggestedTextRectSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetterRef, CFRangeMake(0, self.text.length), NULL, contentRect.size, NULL);
+ if (CGSizeEqualToSize(suggestedTextRectSize, CGSizeZero)) {
+ suggestedTextRectSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetterRef, CFRangeMake(0, self.text.length), NULL, CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX), NULL);
+ }
+ CGRect textRect = CGRectMake(0.0, 0.0, ceilf(suggestedTextRectSize.width), ceilf(suggestedTextRectSize.height));
+
+ // Horizontal alignment.
+ switch (self.textAlignment) {
+ case NSTextAlignmentCenter:
+ textRect.origin.x = floorf(CGRectGetMinX(contentRect) + (CGRectGetWidth(contentRect) - CGRectGetWidth(textRect)) / 2.0);
+ break;
+
+ case NSTextAlignmentRight:
+ textRect.origin.x = floorf(CGRectGetMinX(contentRect) + CGRectGetWidth(contentRect) - CGRectGetWidth(textRect));
+ break;
+
+ case NSTextAlignmentNatural:
+ if ([UIView userInterfaceLayoutDirectionForSemanticContentAttribute:self.semanticContentAttribute] == UIUserInterfaceLayoutDirectionRightToLeft) {
+ textRect.origin.x = floorf(CGRectGetMinX(contentRect) + CGRectGetWidth(contentRect) - CGRectGetWidth(textRect));
+ } else {
+ textRect.origin.x = floorf(CGRectGetMinX(contentRect));
+ }
+ break;
+
+ default:
+ textRect.origin.x = floorf(CGRectGetMinX(contentRect));
+ break;
+ }
+
+ // Vertical alignment. Top and bottom are upside down, because of inverted drawing.
+ switch (self.contentMode) {
+ case UIViewContentModeTop:
+ case UIViewContentModeTopLeft:
+ case UIViewContentModeTopRight:
+ textRect.origin.y = floorf(CGRectGetMinY(contentRect) + CGRectGetHeight(contentRect) - CGRectGetHeight(textRect));
+ break;
+
+ case UIViewContentModeBottom:
+ case UIViewContentModeBottomLeft:
+ case UIViewContentModeBottomRight:
+ textRect.origin.y = floorf(CGRectGetMinY(contentRect));
+ break;
+
+ default:
+ textRect.origin.y = floorf(CGRectGetMinY(contentRect) + floorf((CGRectGetHeight(contentRect) - CGRectGetHeight(textRect)) / 2.0));
+ break;
+ }
+
+ return textRect;
+}
+
+- (UIEdgeInsets)fittingTextInsets {
+ BOOL hasShadow = [self hasShadow];
+ BOOL hasStroke = [self hasStroke];
+ UIEdgeInsets edgeInsets = UIEdgeInsetsZero;
+
+ if (hasStroke) {
+ switch (self.strokePosition) {
+ case ShadowLabelStrokePositionOutside:
+ edgeInsets = UIEdgeInsetsMake(self.strokeSize, self.strokeSize, self.strokeSize, self.strokeSize);
+ break;
+
+ case ShadowLabelStrokePositionCenter:
+ edgeInsets = UIEdgeInsetsMake(self.strokeSize / 2.0, self.strokeSize / 2.0, self.strokeSize / 2.0, self.strokeSize / 2.0);
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ if (hasShadow) {
+ edgeInsets.top = fmaxf(edgeInsets.top + self.shadowBlur + self.shadowOffset.height, edgeInsets.top);
+ edgeInsets.left = fmaxf(edgeInsets.left + self.shadowBlur + self.shadowOffset.width, edgeInsets.left);
+ edgeInsets.bottom = fmaxf(edgeInsets.bottom + self.shadowBlur - self.shadowOffset.height, edgeInsets.bottom);
+ edgeInsets.right = fmaxf(edgeInsets.right + self.shadowBlur - self.shadowOffset.width, edgeInsets.right);
+ }
+
+ return edgeInsets;
+}
+
+#pragma mark - Image Functions
+
+- (CGImageRef)inverseMaskFromAlphaMask:(CGImageRef)alphaMask withRect:(CGRect)rect CF_RETURNS_RETAINED {
+ // Create context.
+ UIGraphicsBeginImageContextWithOptions(rect.size, NO, 0.0);
+ CGContextRef context = UIGraphicsGetCurrentContext();
+
+ // Fill rect, clip to alpha mask and clear.
+ [[UIColor whiteColor] setFill];
+ UIRectFill(rect);
+ CGContextClipToMask(context, rect, alphaMask);
+ CGContextClearRect(context, rect);
+
+ // Return image.
+ CGImageRef image = CGBitmapContextCreateImage(context);
+ UIGraphicsEndImageContext();
+ return image;
+}
+
+- (CGImageRef)strokeImageWithRect:(CGRect)rect frameRef:(CTFrameRef)frameRef strokeSize:(CGFloat)strokeSize strokeColor:(UIColor *)strokeColor CF_RETURNS_RETAINED {
+ // Create context.
+ UIGraphicsBeginImageContextWithOptions(rect.size, NO, 0.0);
+ CGContextRef context = UIGraphicsGetCurrentContext();
+
+ CGContextSetTextDrawingMode(context, kCGTextStroke);
+
+ // Draw clipping mask.
+ CGContextSetLineWidth(context, strokeSize);
+ CGContextSetLineJoin(context, kCGLineJoinRound);
+ [[UIColor whiteColor] setStroke];
+ CTFrameDraw(frameRef, context);
+
+ // Save clipping mask.
+ CGImageRef clippingMask = CGBitmapContextCreateImage(context);
+
+ // Clear the content.
+ CGContextClearRect(context, rect);
+
+ // Draw stroke.
+ CGContextClipToMask(context, rect, clippingMask);
+ CGContextTranslateCTM(context, 0.0, CGRectGetHeight(rect));
+ CGContextScaleCTM(context, 1.0, -1.0);
+ [strokeColor setFill];
+ UIRectFill(rect);
+
+ // Clean up and return image.
+ CGImageRelease(clippingMask);
+ CGImageRef image = CGBitmapContextCreateImage(context);
+ UIGraphicsEndImageContext();
+ return image;
+}
+
+- (CGImageRef)linearGradientImageWithRect:(CGRect)rect fadeHead:(BOOL)fadeHead fadeTail:(BOOL)fadeTail CF_RETURNS_RETAINED {
+ // Create an opaque context.
+ UIGraphicsBeginImageContextWithOptions(rect.size, YES, 0.0);
+ CGContextRef context = UIGraphicsGetCurrentContext();
+
+ // White background will mask opaque, black gradient will mask transparent.
+ [[UIColor whiteColor] setFill];
+ UIRectFill(rect);
+
+ // Create gradient from white to black.
+ CGFloat locs[2] = {0.0, 1.0};
+ CGFloat components[4] = {1.0, 1.0, 0.0, 1.0};
+ CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceGray();
+ CGGradientRef gradient = CGGradientCreateWithColorComponents(colorSpace, components, locs, 2);
+
+ // Draw head and/or tail gradient.
+ CGFloat fadeWidth = fminf(CGRectGetHeight(rect) * 2.0, floorf(CGRectGetWidth(rect) / 4.0));
+ CGFloat minX = CGRectGetMinX(rect);
+ CGFloat maxX = CGRectGetMaxX(rect);
+ if (fadeTail) {
+ CGFloat startX = maxX - fadeWidth;
+ CGPoint startPoint = CGPointMake(startX, CGRectGetMidY(rect));
+ CGPoint endPoint = CGPointMake(maxX, CGRectGetMidY(rect));
+ CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 0);
+ }
+ if (fadeHead) {
+ CGFloat startX = minX + fadeWidth;
+ CGPoint startPoint = CGPointMake(startX, CGRectGetMidY(rect));
+ CGPoint endPoint = CGPointMake(minX, CGRectGetMidY(rect));
+ CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 0);
+ }
+
+ // Clean up and return image.
+ CGColorSpaceRelease(colorSpace);
+ CGGradientRelease(gradient);
+ CGImageRef image = CGBitmapContextCreateImage(context);
+ UIGraphicsEndImageContext();
+ return image;
+}
+
+@end
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SparkleSeperatorView.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SparkleSeperatorView.swift
index e3e45801..c0f398f0 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SparkleSeperatorView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SparkleSeperatorView.swift
@@ -24,8 +24,13 @@ class SparkleSeperatorView: UIView {
setupViews(isGradient: isGradient)
}
- private func setupViews(color: UIColor = Constants.Color.Border, lineColor: UIColor? = nil, isGradient: Bool = false) {
- let starView = isGradient ? GradientImageView(image: UIImage(symbol: .sparkle, size: 24)) : UIImageView(image: UIImage(symbol: .sparkle, color: color))
+ init(starSize: CGFloat) {
+ super.init(frame: .zero)
+ setupViews(starSize: starSize)
+ }
+
+ private func setupViews(color: UIColor = Constants.Color.Border, lineColor: UIColor? = nil, isGradient: Bool = false, starSize: CGFloat = 24) {
+ let starView = isGradient ? GradientImageView(image: UIImage(symbol: .sparkle, size: starSize)) : UIImageView(image: UIImage(symbol: .sparkle, color: color))
addSubview(starView)
starView.snp.makeConstraints { make in
make.center.equalToSuperview()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SymbolButton.swift b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SymbolButton.swift
index 27abdf92..2250bf94 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Common/Views/SymbolButton.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Common/Views/SymbolButton.swift
@@ -85,6 +85,9 @@ class SymbolButton: UIView {
cornerStyle: UIButton.Configuration.CornerStyle = .capsule) {
super.init(frame: .zero)
+ isAccessibilityElement = true
+ accessibilityTraits = .button
+
self.isGlassEnabled = enableGlass
// 只有 iOS 26+ 且 enableGlass 为 true 时才使用 glass 效果
@@ -281,6 +284,9 @@ class SymbolButton: UIView {
init(image: UIImage?, enableGlass: Bool = false, cornerStyle: UIButton.Configuration.CornerStyle = .capsule) {
super.init(frame: .zero)
+ isAccessibilityElement = true
+ accessibilityTraits = .button
+
self.isGlassEnabled = enableGlass
// 只有 iOS 26+ 且 enableGlass 为 true 时才使用 glass 效果
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
index d1d8db83..bc368642 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/VIews/GameInfoDetailReusableView.swift
@@ -106,6 +106,12 @@ class GameInfoDetailReusableView: UICollectionReusableView {
topViewController()?.present(vc, animated: true)
}
}
+
+ // 无障碍配置
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.retroAchievements2()
+ view.accessibilityTraits = .button
+
return view
}()
@@ -117,6 +123,12 @@ class GameInfoDetailReusableView: UICollectionReusableView {
topViewController()?.present(SkinSettingsViewController(game: game), animated: true)
}
}
+
+ // 无障碍配置
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.gamesSpecifySkin()
+ view.accessibilityTraits = .button
+
return view
}()
@@ -128,6 +140,12 @@ class GameInfoDetailReusableView: UICollectionReusableView {
topViewController()?.present(CheatCodeViewController(game: game), animated: true)
}
}
+
+ // 无障碍配置
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.gamesCheatCode()
+ view.accessibilityTraits = .button
+
return view
}()
@@ -160,6 +178,12 @@ class GameInfoDetailReusableView: UICollectionReusableView {
}
}
}
+
+ // 无障碍配置
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.gameplayManuals()
+ view.accessibilityTraits = .button
+
return view
}()
@@ -222,6 +246,11 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.threeDSModecontextMenuButton.triggerTapGesture()
}
+
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
+
return view
}()
@@ -272,6 +301,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
UIView.makeToast(message: R.string.localizable.jitNoSupportDesc())
}
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -312,6 +344,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.shaderContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -371,6 +406,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.languageContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -414,6 +452,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.rightEyeRenderMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -423,6 +464,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
view.addTapGesture { gesture in
topViewController()?.present(ThreeDSAdvancedSettingViewController(), animated: true)
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.threeDSAdvanceSettingTitle()
+ view.accessibilityTraits = .button
return view
}()
@@ -525,6 +569,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.transferPakContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = "Transfer Pak\(state)"
+ view.accessibilityTraits = .button
return view
}()
@@ -562,6 +609,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.rdpPluginContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -593,6 +643,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.ndsSystemTypeContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.ndsSystemTypeTitle() + type
+ view.accessibilityTraits = .button
return view
}()
@@ -715,6 +768,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
}
}
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = "GBA Slot\(state)"
+ view.accessibilityTraits = .button
return view
}()
@@ -751,6 +807,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.microphoneContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -778,6 +837,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.psxModeContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -790,6 +852,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
topViewController()?.present(PSXSBIImportViewController(game: game), animated: true)
}
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.sbiImport()
+ view.accessibilityTraits = .button
return view
}()
@@ -817,6 +882,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.psxRendererContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -828,6 +896,12 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self, let game = self.game else { return }
PlayViewController.startGame(game: game)
}
+
+ // 无障碍配置
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.startGameTitle()
+ view.accessibilityTraits = .button
+
return view
}()
@@ -863,6 +937,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.dcCoreContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = "JITLess Ver: \(ver)"
+ view.accessibilityTraits = .button
return view
}()
@@ -894,6 +971,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.tvStandardMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = standard
+ view.accessibilityTraits = .button
return view
}()
@@ -925,6 +1005,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.snesVRAMMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -964,6 +1047,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.pspRendererContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -991,6 +1077,9 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self = self else { return }
self.pspTextureContextMenuButton.triggerTapGesture()
}
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = title
+ view.accessibilityTraits = .button
return view
}()
@@ -1016,7 +1105,6 @@ class GameInfoDetailReusableView: UICollectionReusableView {
UIDevice.generateHaptic()
self.didSegmentChange?(index)
}
-
return view
}()
@@ -1029,6 +1117,12 @@ class GameInfoDetailReusableView: UICollectionReusableView {
guard let self else { return }
self.didDeleteSaveState?()
}
+
+ // 无障碍配置
+ view.isAccessibilityElement = true
+ view.accessibilityLabel = R.string.localizable.deleteGameGameStateAlertTitle()
+ view.accessibilityTraits = .button
+
return view
}()
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
index 0316ab9b..1006b244 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameCoverView.swift
@@ -172,6 +172,8 @@ class GameCoverView: UIView {
image = style == .style2 ? R.image.gb_cover_v() : R.image.gb_cover_h()
} else if gameType == .nes {
image = style == .style2 ? R.image.nes_cover_v() : R.image.nes_cover_h()
+ } else if gameType == .fds {
+ image = style == .style2 ? R.image.fds_cover_v() : R.image.fds_cover_h()
} else if gameType == .snes {
image = style == .style2 ? R.image.snes_cover_v() : R.image.snes_cover_h()
} else if gameType == .psp {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesCollectionReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesCollectionReusableView.swift
index 7ceaead2..a068eaae 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesCollectionReusableView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesCollectionReusableView.swift
@@ -138,8 +138,10 @@ class GamesCollectionReusableView: UICollectionReusableView {
image = R.image.gbc_group_brand(compatibleWith: traitCollection)
} else if gameType == .gb {
image = R.image.gb_group_brand(compatibleWith: traitCollection)
- } else if gameType == .nes {
+ } else if gameType == .nes {
image = R.image.nes_group_brand(compatibleWith: traitCollection)
+ } else if gameType == .fds {
+ image = R.image.fds_group_brand(compatibleWith: traitCollection)
} else if gameType == .snes {
image = R.image.snes_group_brand(compatibleWith: traitCollection)
} else if gameType == .psp {
diff --git a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryFavouriteCollectionCell.swift b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryFavouriteCollectionCell.swift
index f3280bfc..4b6defba 100644
--- a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryFavouriteCollectionCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryFavouriteCollectionCell.swift
@@ -173,7 +173,7 @@ class PlayHistoryFavouriteCollectionCell: UICollectionViewCell {
iconView.setGameCover(game: game, size: estimated) { [weak self] image in
self?.infoContainerView.backgroundColor = image.dominantBackground
}
- if game.gameType == .nes || game.gameType == .snes || game.gameType == .psp {
+ if Constants.Size.GameCoverRatio(gameType: game.gameType) != 1.0 {
iconView.contentMode = .scaleAspectFill
} else {
iconView.contentMode = .scaleToFill
diff --git a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryItemCollectionCell.swift b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryItemCollectionCell.swift
index bc012b84..2a6277e4 100644
--- a/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryItemCollectionCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/History/Views/PlayHistoryItemCollectionCell.swift
@@ -95,7 +95,7 @@ class PlayHistoryItemCollectionCell: UICollectionViewCell {
func setData(game: Game, didTapRetro: (()->Void)? = nil) {
let estimated = iconView.size == .zero ? .init(40) : iconView.size
iconView.setGameCover(game: game, size: estimated)
- if game.gameType == .nes || game.gameType == .snes || game.gameType == .psp {
+ if Constants.Size.GameCoverRatio(gameType: game.gameType) != 1.0 {
iconView.contentMode = .scaleAspectFill
} else {
iconView.contentMode = .scaleToFill
diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/MultiDiscBuilderViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/MultiDiscBuilderViewController.swift
index 202f445f..7f0565a0 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/MultiDiscBuilderViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Import/ViewControllers/MultiDiscBuilderViewController.swift
@@ -27,6 +27,11 @@ class MultiDiscBuilderViewController: BaseViewController {
var files: [URL]
}
+ struct CDI: M3uItem {
+ var url: URL
+ var files: [URL]
+ }
+
private var datas: [M3uItem] = [] {
didSet {
collectionView.reloadData()
@@ -34,7 +39,7 @@ class MultiDiscBuilderViewController: BaseViewController {
}
private enum FileType {
- case undetermined, cue, chd
+ case undetermined, cue, chd, cdi
}
private var fileType: FileType {
@@ -42,10 +47,12 @@ class MultiDiscBuilderViewController: BaseViewController {
if self.datas.count == 0 {
return .undetermined
} else {
- if self.datas.first!.url.pathExtension == "cue" {
+ if self.datas.first!.url.pathExtension.lowercased() == "cue" {
return .cue
- } else {
+ } else if self.datas.first!.url.pathExtension.lowercased() == "chd" {
return .chd
+ } else {
+ return .cdi
}
}
}
@@ -109,20 +116,23 @@ class MultiDiscBuilderViewController: BaseViewController {
view.addTapGesture { [weak self] gesture in
guard let self else { return }
let supportedType: [UTType]
- if let cue = UTType(filenameExtension: "cue"), let bin = UTType(filenameExtension: "bin"), let chd = UTType(filenameExtension: "chd") {
+ if let cue = UTType(filenameExtension: "cue"), let bin = UTType(filenameExtension: "bin"), let chd = UTType(filenameExtension: "chd"), let cdi = UTType(filenameExtension: "cdi") {
switch self.fileType {
case .undetermined:
- supportedType = [cue, bin, chd]
+ supportedType = [cue, bin, chd, cdi]
case .cue:
supportedType = [cue, bin]
case .chd:
supportedType = [chd]
+ case .cdi:
+ supportedType = [cdi]
}
FilesImporter.shared.presentImportController(supportedTypes: supportedType) { [weak self] urls in
guard let self else { return }
let isCue = urls.contains(where: { $0.url?.pathExtension.lowercased() == "cue" })
let isChd = urls.contains(where: { $0.url?.pathExtension.lowercased() == "chd" })
- if (isCue || urls.contains(where: { $0.url?.pathExtension.lowercased() == "bin" })), isChd {
+ let isCdi = urls.contains(where: { $0.url?.pathExtension.lowercased() == "cdi" })
+ if (isCue || urls.contains(where: { $0.url?.pathExtension.lowercased() == "bin" })) && (isChd || isCdi) {
UIView.makeToast(message: R.string.localizable.multiDiscImportErrorConflict())
return
}
@@ -159,6 +169,16 @@ class MultiDiscBuilderViewController: BaseViewController {
self.datas.append(contentsOf: chds)
self.collectionView.reloadData()
self.addFileButton.titleLabel.text = R.string.localizable.multiDiscAddFile(".chd")
+ } else if isCdi {
+ var cdis = [CDI]()
+ for url in urls {
+ let tempChdUrl = URL(fileURLWithPath: Constants.Path.Temp.appendingPathComponent(url.lastPathComponent))
+ try? FileManager.safeCopyItem(at: url, to: tempChdUrl, shouldReplace: true)
+ cdis.append(CDI(url: tempChdUrl, files: []))
+ }
+ self.datas.append(contentsOf: cdis)
+ self.collectionView.reloadData()
+ self.addFileButton.titleLabel.text = R.string.localizable.multiDiscAddFile(".cdi")
} else {
UIView.makeToast(message: R.string.localizable.multiDiscImportErrorMissing())
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
index 4735e724..e26631bc 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift
@@ -143,7 +143,7 @@ class Game: Object, ObjectUpdatable {
return URL(fileURLWithPath: Constants.Path.PSPSave.appendingPathComponent(path))
}
}
- } else if gameType == .nes {
+ } else if gameType == .nes || gameType == .fds {
return URL(fileURLWithPath: Constants.Path.Nestopia.appendingPathComponent("\(name).srm"))
} else if gameType == .snes {
return URL(fileURLWithPath: Constants.Path.bsnes.appendingPathComponent("\(name).srm"))
@@ -259,8 +259,8 @@ class Game: Object, ObjectUpdatable {
}
}
return isPS1BIOSMissing
- } else if gameType == .nes, fileExtension.lowercased() == "fds" {
- requireBIOS = Constants.BIOS.NESBios
+ } else if gameType == .fds {
+ requireBIOS = Constants.BIOS.FDSBios
} else {
return false
}
@@ -302,7 +302,7 @@ class Game: Object, ObjectUpdatable {
var libretroCorePath: String? {
if gameType == .psp {
return Bundle.main.path(forResource: "ppsspp.libretro", ofType: "framework", inDirectory: "Frameworks")
- } else if gameType == .nes {
+ } else if gameType == .nes || gameType == .fds {
return Bundle.main.path(forResource: "nestopia.libretro", ofType: "framework", inDirectory: "Frameworks")
} else if gameType == .snes {
if getExtraBool(key: ExtraKey.snesVRAM.rawValue) ?? false {
@@ -554,7 +554,7 @@ class Game: Object, ObjectUpdatable {
}
lazy var nesPalettes: [NESPalette] = {
- guard gameType == .nes else { return [] }
+ guard gameType == .nes || gameType == .fds else { return [] }
let nestopias = ["cxa2025as", "cxa2025as_jp", "royaltea", "consumer", "canonical", "alternative", "rgb", "pal", "composite-direct-fbx", "pvm-style-d93-fbx", "ntsc-hardware-fbx", "nes-classic-fbx-fs", "restored-wii-vc", "wii-vc", "raw"]
var results: [NESPalette] = []
@@ -588,7 +588,7 @@ class Game: Object, ObjectUpdatable {
}
var nextNesPalette: NESPalette {
- guard gameType == .nes else { return Self.defaultNesPalette }
+ guard gameType == .nes || gameType == .fds else { return Self.defaultNesPalette }
if let nesPalette = getExtraString(key: ExtraKey.nesPalette.rawValue) {
if let index = nesPalettes.firstIndex(where: { $0.name == nesPalette }) {
@@ -603,7 +603,7 @@ class Game: Object, ObjectUpdatable {
}
var currentNesPalette: NESPalette {
- guard gameType == .nes else { return Self.defaultNesPalette }
+ guard gameType == .nes || gameType == .fds else { return Self.defaultNesPalette }
if let nesPalette = getExtraString(key: ExtraKey.nesPalette.rawValue) {
return nesPalettes.first(where: { $0.name == nesPalette }) ?? Self.defaultNesPalette
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Models/GameSetting.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Models/GameSetting.swift
index b41b33aa..c059545a 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Models/GameSetting.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Models/GameSetting.swift
@@ -484,7 +484,7 @@ struct GameSetting: SettingCellItem {
enum ItemType: Int, CaseIterable {
//位置很重要 新增内容一定要接到最后面
- case saveState, quickLoadState, volume, fastForward, stateList, cheatCode, skins, filter, screenShot, haptic, airplay, controllerSetting, orientation, functionSort, reload, quit, swapScreen, resolution, consoleHome, amiibo, toggleFullscreen, simBlowing, palette, swapDisk, retro, airPlayScaling, airPlayLayout, toggleAnalog, gameplayManuals
+ case saveState, quickLoadState, volume, fastForward, stateList, cheatCode, skins, filter, screenShot, haptic, airplay, controllerSetting, orientation, functionSort, reload, quit, swapScreen, resolution, consoleHome, amiibo, toggleFullscreen, simBlowing, palette, swapDisk, retro, airPlayScaling, airPlayLayout, toggleAnalog, gameplayManuals, triggerPro
}
var type: ItemType
@@ -502,6 +502,7 @@ struct GameSetting: SettingCellItem {
var airPlayLayout: AirPlayLayout = .sideBySide
var mappingOnlyType: MappingOnlyType? = nil
var nesPalette = Game.defaultNesPalette
+ var triggerProID: Int? = nil
var image: UIImage {
switch type {
@@ -567,6 +568,8 @@ struct GameSetting: SettingCellItem {
UIImage(symbol: .gamecontroller)
case .gameplayManuals:
UIImage(symbol: .textBookClosed)
+ case .triggerPro:
+ R.image.customXmarkTriangleCircleSquare()!.applySymbolConfig()
}
}
@@ -634,6 +637,8 @@ struct GameSetting: SettingCellItem {
R.string.localizable.toggleAnolog()
case .gameplayManuals:
R.string.localizable.gameplayManuals()
+ case .triggerPro:
+ "TriggerPro"
}
}
@@ -661,12 +666,12 @@ struct GameSetting: SettingCellItem {
return false
}
return true
- case .gba, .gbc, .gb, .nes, .snes, .md, .mcd, ._32x, .gg, .sg1000, .ms, .ss, .vb, .pm:
- if (gameType == .gb || gameType == .vb || gameType == .pm || gameType == .nes) && type == .palette {
+ case .gba, .gbc, .gb, .nes, .fds, .snes, .md, .mcd, ._32x, .gg, .sg1000, .ms, .ss, .vb, .pm:
+ if (gameType == .gb || gameType == .vb || gameType == .pm || gameType == .nes || gameType == .fds) && type == .palette {
return true
}
- if (gameType == .mcd || gameType == .ss || gameType == .nes) && type == .swapDisk {
+ if (gameType == .mcd || gameType == .ss || gameType == .fds) && type == .swapDisk {
return true
}
@@ -674,7 +679,7 @@ struct GameSetting: SettingCellItem {
return false
}
- if gameType == .nes, type == .simBlowing {
+ if (gameType == .nes || gameType == .fds) && type == .simBlowing {
return true
}
@@ -708,7 +713,7 @@ struct GameSetting: SettingCellItem {
var enableLongPress: Bool {
switch self.type {
- case .quickLoadState, .fastForward, .haptic, .orientation, .resolution, .palette, .swapDisk, .airPlayScaling, .airPlayLayout:
+ case .quickLoadState, .fastForward, .haptic, .orientation, .resolution, .palette, .swapDisk, .airPlayScaling, .airPlayLayout, .triggerPro:
return true
default:
return false
@@ -779,6 +784,8 @@ struct GameSetting: SettingCellItem {
return "toggleAnalog"
case .gameplayManuals:
return "gameplayManuals"
+ case .triggerPro:
+ return "triggerPro"
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
index 277f1e95..879e1578 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
@@ -101,6 +101,8 @@ class PlayViewController: GameViewController {
private var progressAchievements: [CheevosAchievement] = []
//挑战中的成就
private var challengeAchievements: [CheevosAchievement] = []
+ ///TriggerProView
+ private var triggerProView: TriggerProView?
deinit {
Log.debug("\(String(describing: Self.self)) deinit")
@@ -170,6 +172,7 @@ class PlayViewController: GameViewController {
private var gameUpdateToken: Any? = nil
private var cheatCodeUpdateToken: Any? = nil
private var settingsUpdateToken: Any? = nil
+ private var triggerProUpdateToken: Any? = nil
private var lastSaveDate: Date? = nil
private var lastLoadDate: Date? = nil
@@ -686,6 +689,8 @@ class PlayViewController: GameViewController {
loadConfig()
//更新皮肤
updateSkin()
+ //更新TriggerPro
+ updateTriggerPro()
}
override func viewWillAppear(_ animated: Bool) {
@@ -960,13 +965,13 @@ class PlayViewController: GameViewController {
} else if input.stringValue == "blowing" {
handleMenuGameSetting(GameSetting(type: .simBlowing), nil)
} else if input.stringValue == "palette" {
- if manicGame.gameType == .nes {
+ if manicGame.gameType == .nes || manicGame.gameType == .fds {
handleMenuGameSetting(GameSetting(type: .palette, nesPalette: manicGame.nextNesPalette), nil)
} else {
handleMenuGameSetting(GameSetting(type: .palette, palette: manicGame.pallete.next), nil)
}
} else if input.stringValue == "swapDisk" {
- if manicGame.gameType == .nes {
+ if manicGame.gameType == .fds {
handleMenuGameSetting(GameSetting(type: .swapDisk, currentDiskIndex: 0), nil)
} else {
let currentIndex = LibretroCore.sharedInstance().getCurrentDiskIndex()
@@ -984,6 +989,14 @@ class PlayViewController: GameViewController {
handleMenuGameSetting(GameSetting(type: .retro, airPlayLayout: Settings.defalut.airPlayLayout.next), nil)
} else if input.stringValue == "gameplayManuals" {
handleMenuGameSetting(GameSetting(type: .gameplayManuals), nil)
+ } else if input.stringValue == "triggerPro" {
+ var id: Int?
+ if let currentID = manicGame.getExtraInt(key: ExtraKey.triggerProID.rawValue), currentID != -1 {
+ id = Trigger.nextTriggerID(gameType: manicGame.gameType, currentID: currentID)
+ } else {
+ id = Trigger.nextTriggerID(gameType: manicGame.gameType, currentID: nil)
+ }
+ handleMenuGameSetting(GameSetting(type: .triggerPro, triggerProID: id), nil)
}
}
@@ -1606,6 +1619,7 @@ extension PlayViewController {
case .toggleFullscreen:
//MARK: handleMenuGameSetting.toggleFullscreen
manicGame.forceFullSkin = item.isFullScreen
+ manicGame.updateExtra(key: ExtraKey.forceFullSkin.rawValue, value: item.isFullScreen)
updateSkin()
case .simBlowing:
@@ -1624,7 +1638,7 @@ extension PlayViewController {
}
LibretroCore.sharedInstance().updateRunningCoreConfigs(["melonds_mic_input": restoreInput], flush: false)
}
- } else if manicGame.gameType == .nes {
+ } else if manicGame.gameType == .nes || manicGame.gameType == .fds {
DispatchQueue.main.asyncAfter(delay: 1) {
LibretroCore.sharedInstance().press(.L3, playerIndex: 0)
DispatchQueue.main.asyncAfter(delay: 0.1) {
@@ -1635,7 +1649,7 @@ extension PlayViewController {
case .palette:
//MARK: handleMenuGameSetting.palette
- if manicGame.gameType == .nes {
+ if manicGame.gameType == .nes || manicGame.gameType == .fds {
updateNESPalette(item.nesPalette)
return true
}
@@ -1670,29 +1684,25 @@ extension PlayViewController {
}
case .swapDisk:
//MARK: handleMenuGameSetting.swapDisk
- if manicGame.gameType == .nes {
- if manicGame.fileExtension.lowercased() == "fds" {
- if item.currentDiskIndex == 0 {
- //(FDS) Disk Side Change
- UIView.makeToast(message: R.string.localizable.diskSideChange())
- DispatchQueue.main.asyncAfter(delay: 1) {
- LibretroCore.sharedInstance().press(.L1, playerIndex: 0)
- DispatchQueue.main.asyncAfter(delay: 0.1) {
- LibretroCore.sharedInstance().release(.L1, playerIndex: 0)
- }
- }
- } else {
- //(FDS) Eject Disk
- UIView.makeToast(message: R.string.localizable.ejectDisk())
- DispatchQueue.main.asyncAfter(delay: 1) {
- LibretroCore.sharedInstance().press(.R1, playerIndex: 0)
- DispatchQueue.main.asyncAfter(delay: 0.1) {
- LibretroCore.sharedInstance().release(.R1, playerIndex: 0)
- }
+ if manicGame.gameType == .fds {
+ if item.currentDiskIndex == 0 {
+ //(FDS) Disk Side Change
+ UIView.makeToast(message: R.string.localizable.diskSideChange())
+ DispatchQueue.main.asyncAfter(delay: 1) {
+ LibretroCore.sharedInstance().press(.L1, playerIndex: 0)
+ DispatchQueue.main.asyncAfter(delay: 0.1) {
+ LibretroCore.sharedInstance().release(.L1, playerIndex: 0)
}
}
} else {
- UIView.makeToast(message: R.string.localizable.fdsAlert())
+ //(FDS) Eject Disk
+ UIView.makeToast(message: R.string.localizable.ejectDisk())
+ DispatchQueue.main.asyncAfter(delay: 1) {
+ LibretroCore.sharedInstance().press(.R1, playerIndex: 0)
+ DispatchQueue.main.asyncAfter(delay: 0.1) {
+ LibretroCore.sharedInstance().release(.R1, playerIndex: 0)
+ }
+ }
}
return true
}
@@ -1795,6 +1805,26 @@ extension PlayViewController {
})
}
return false
+ case .triggerPro:
+ //MARK: handleMenuGameSetting.triggerPro
+ guard !isHardcoreMode else {
+ UIView.makeToast(message: R.string.localizable.notAllowHardcore())
+ return false
+ }
+ let triggers = Trigger.supportTriggers(gameType: manicGame.gameType)
+ if triggers.count == 0 {
+ UIView.makeToast(message: R.string.localizable.noTriggerPro())
+ return false
+ }
+
+ if let fromID = item.triggerProID {
+ manicGame.updateExtra(key: ExtraKey.triggerProID.rawValue, value: fromID)
+ } else {
+ //关闭TriggerPro
+ manicGame.updateExtra(key: ExtraKey.triggerProID.rawValue, value: -1)
+ }
+ self.updateTriggerPro(showToast: true)
+ return true
}
//默认关闭菜单
return true
@@ -1938,6 +1968,11 @@ extension PlayViewController {
//加载默认配置
private func loadConfig() {
+ //设置按钮隐藏
+ if let forceFullSkin = manicGame.getExtraBool(key: ExtraKey.forceFullSkin.rawValue), forceFullSkin {
+ manicGame.forceFullSkin = forceFullSkin
+ }
+
//加载存档
if let saveState = loadSaveState {
DispatchQueue.main.asyncAfter(delay: 1) { [weak self] in
@@ -1977,7 +2012,7 @@ extension PlayViewController {
"ppsspp_texture_replacement": (manicGame.getExtraBool(key: ExtraKey.pspTexture.rawValue) ?? false) ? "enabled" : "disabled"
], reload: false)
updatePSPResolution(manicGame.resolution, reload: false)
- } else if manicGame.gameType == .nes {
+ } else if manicGame.gameType == .nes || manicGame.gameType == .fds {
updateNESPalette(manicGame.currentNesPalette, firstInit: true)
LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Nestopia.name, key: "nestopia_aspect", value: "uncorrected", reload: false)
} else if manicGame.gameType == .snes {
@@ -2196,7 +2231,7 @@ extension PlayViewController {
//更新皮肤
private func updateSkin() {
- func setPrefferedSkin() {
+ func setPreferredSkin() {
showSkinButtons()
isFullScreen = false
var initGameType: GameType?
@@ -2212,7 +2247,7 @@ extension PlayViewController {
controllerSkin.isSwapScreen = manicGame.swapScreen
}
controllerView.controllerSkin = controllerSkin
- } else if let skin = SkinConfig.prefferedLandscapeSkin(gameType: manicGame.gameType), var controllerSkin = ControllerSkin(fileURL: skin.fileURL, initGameType: initGameType, supportGameTypes: supportGameTypes) {
+ } else if let skin = SkinConfig.preferredLandscapeSkin(gameType: manicGame.gameType), var controllerSkin = ControllerSkin(fileURL: skin.fileURL, initGameType: initGameType, supportGameTypes: supportGameTypes) {
if enableSwapScreen() {
controllerSkin.isSwapScreen = manicGame.swapScreen
}
@@ -2225,7 +2260,7 @@ extension PlayViewController {
controllerSkin.isSwapScreen = manicGame.swapScreen
}
controllerView.controllerSkin = controllerSkin
- } else if let skin = SkinConfig.prefferedPortraitSkin(gameType: manicGame.gameType), var controllerSkin = ControllerSkin(fileURL: skin.fileURL, initGameType: initGameType, supportGameTypes: supportGameTypes) {
+ } else if let skin = SkinConfig.preferredPortraitSkin(gameType: manicGame.gameType), var controllerSkin = ControllerSkin(fileURL: skin.fileURL, initGameType: initGameType, supportGameTypes: supportGameTypes) {
if enableSwapScreen() {
controllerSkin.isSwapScreen = manicGame.swapScreen
}
@@ -2249,13 +2284,13 @@ extension PlayViewController {
controllerView.controllerSkin = controllerSkin
hideSkinButtons()
} else {
- setPrefferedSkin()
+ setPreferredSkin()
}
} else {
- setPrefferedSkin()
+ setPreferredSkin()
}
#else
- setPrefferedSkin()
+ setPreferredSkin()
#endif
//设置皮肤控制器的玩家角色
@@ -2362,6 +2397,8 @@ extension PlayViewController {
default:
break
}
+
+ triggerProView?.hapticType = manicGame.haptic
}
/// 更新AirPlay
@@ -2476,7 +2513,7 @@ extension PlayViewController {
case .resolution:
newGameSetting.resolution = self.manicGame.resolution.next
case .palette:
- if self.manicGame.gameType == .nes {
+ if self.manicGame.gameType == .nes || self.manicGame.gameType == .fds {
newGameSetting.nesPalette = self.manicGame.nextNesPalette
} else {
newGameSetting.palette = self.manicGame.pallete.next
@@ -2484,7 +2521,7 @@ extension PlayViewController {
case .toggleFullscreen:
newGameSetting.isFullScreen = !self.manicGame.forceFullSkin
case .swapDisk:
- if self.manicGame.gameType == .nes {
+ if self.manicGame.gameType == .fds {
newGameSetting.currentDiskIndex = 0
} else {
let currentIndex = LibretroCore.sharedInstance().getCurrentDiskIndex()
@@ -2920,7 +2957,7 @@ extension PlayViewController {
let label = UILabel()
label.numberOfLines = message == nil ? 2 : 3
let titleFont = scale == 1.0 ? Constants.Font.title(size: .s, weight: .regular) : UIFont.systemFont(ofSize: 30)
- let matt = NSMutableAttributedString(string: title, attributes: [.font: titleFont, .foregroundColor: UIColor.white])
+ let matt = NSMutableAttributedString(string: title, attributes: [.font: titleFont, .foregroundColor: Constants.Color.LabelPrimary])
if let message {
let messageFont = scale == 1.0 ? Constants.Font.body(size: .s) : UIFont.systemFont(ofSize: 20)
matt.append(NSAttributedString(string: "\n\(message)", attributes: [.font: messageFont, .foregroundColor: Constants.Color.LabelSecondary]))
@@ -3105,6 +3142,63 @@ extension PlayViewController {
}
}
}
+
+ private func updateTriggerPro(showToast: Bool = false) {
+ guard !isHardcoreMode else {
+ if showToast {
+ UIView.makeToast(message: R.string.localizable.notAllowHardcore())
+ }
+ return
+ }
+
+ triggerProView?.removeFromSuperview()
+ triggerProView = nil
+ triggerProUpdateToken = nil
+
+ if let id = manicGame.getExtraInt(key: ExtraKey.triggerProID.rawValue), id != -1 {
+ let realm = Database.realm
+ if let trigger = realm.objects(Trigger.self).where({ $0.id == id }).first {
+ triggerProUpdateToken = trigger.observe(keyPaths: [\Trigger.items]) { [weak self] change in
+ guard let self = self else { return }
+ switch change {
+ case .change(_, _):
+ Log.debug("TriggerPro更新")
+ self.triggerProView?.reloadButtons()
+ default:
+ break
+ }
+ }
+
+ let aView = TriggerProView(trigger: trigger)
+ aView.hapticType = manicGame.haptic
+ aView.activateHandler = { [weak self] inputs in
+ guard let self else { return }
+ for input in inputs {
+ self.controllerView.activate(input)
+ }
+ }
+ aView.deactivateHandler = { [weak self] inputs in
+ guard let self else { return }
+ for input in inputs {
+ self.controllerView.deactivate(input)
+ }
+ }
+ view.addSubview(aView)
+ aView.snp.makeConstraints { make in
+ make.edges.equalTo(controllerView)
+ }
+ triggerProView = aView
+ if showToast {
+ UIView.makeToast(message: R.string.localizable.enableTriggerPro() + ": \(trigger.triggerProName)")
+ }
+ return
+ }
+ }
+ //禁用TriggerPro
+ if showToast {
+ UIView.makeToast(message: R.string.localizable.disableTriggerPro())
+ }
+ }
}
//MARK: GameViewControllerDelegate代理
@@ -3137,4 +3231,22 @@ extension PlayViewController {
}
return .unknown
}
+
+ static var currentSkinID: String? {
+ if let currentPlayViewController {
+ if UIDevice.isLandscape {
+ return currentPlayViewController.manicGame.landscapeSkin?.id
+ } else {
+ return currentPlayViewController.manicGame.portraitSkin?.id
+ }
+ }
+ return nil
+ }
+
+ static var isHideControls: Bool {
+ if let currentPlayViewController {
+ return currentPlayViewController.manicGame.forceFullSkin
+ }
+ return false
+ }
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Views/GameSettingView.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Views/GameSettingView.swift
index 3c7b7daf..ac93948d 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/Views/GameSettingView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Views/GameSettingView.swift
@@ -215,12 +215,15 @@ class GameSettingView: BaseView {
let airPlayScaling = Settings.defalut.airPlayScaling
let airPlayLayout = Settings.defalut.airPlayLayout
let nesPalettes: Game.NESPalette
- if game.gameType == .nes {
+ if game.gameType == .nes || game.gameType == .fds {
nesPalettes = game.currentNesPalette
} else {
nesPalettes = Game.defaultNesPalette
}
-
+ var triggerProId: Int? = nil
+ if let id = game.getExtraInt(key: ExtraKey.triggerProID.rawValue), id != -1 {
+ triggerProId = id
+ }
gameSettings = settings.gameFunctionList.compactMap { itemTypeValue in
if let itemType = GameSetting.ItemType(rawValue: itemTypeValue) {
@@ -239,7 +242,8 @@ class GameSettingView: BaseView {
currentDiskIndex: currentDiskIndex,
airPlayScaling: airPlayScaling,
airPlayLayout: airPlayLayout,
- nesPalette: nesPalettes)
+ nesPalette: nesPalettes,
+ triggerProID: triggerProId)
}
}
return nil
@@ -361,7 +365,7 @@ extension GameSettingView: UICollectionViewDataSource {
specialTitle = item.palette.paletteTitleForVB
} else if game.gameType == .pm {
specialTitle = item.palette.paletteTitleForPM
- } else if game.gameType == .nes {
+ } else if game.gameType == .nes || game.gameType == .fds {
specialTitle = item.nesPalette.name
}
} else if item.type == .resolution {
@@ -370,7 +374,7 @@ extension GameSettingView: UICollectionViewDataSource {
} else if game.isN64ParaLLEl {
specialTitle = R.string.localizable.gameSettingResolution(item.resolution.resolutionTitleForN64ParaLLEl)
}
- } else if item.type == .swapDisk, game.gameType == .nes {
+ } else if item.type == .swapDisk, game.gameType == .fds {
specialTitle = R.string.localizable.diskSideChange()
}
@@ -519,7 +523,7 @@ extension GameSettingView: UICollectionViewDelegate {
item.palette = item.palette.nextForVB
} else if game.gameType == .pm {
item.palette = item.palette.nextForPM
- } else if game.gameType == .nes {
+ } else if game.gameType == .nes || game.gameType == .fds {
item.nesPalette = game.nextNesPalette
} else {
item.palette = item.palette.next
@@ -530,7 +534,7 @@ extension GameSettingView: UICollectionViewDelegate {
item.isFullScreen = !item.isFullScreen
updateCellAndCallBack(item: item, indexPath: indexPath)
case .swapDisk:
- if game.gameType == .nes {
+ if game.gameType == .fds {
item.currentDiskIndex = 0
game.currentDiskIndex = 0
updateCellAndCallBack(item: item, indexPath: indexPath)
@@ -549,6 +553,8 @@ extension GameSettingView: UICollectionViewDelegate {
item.airPlayLayout = item.airPlayLayout.next
updateCellAndCallBack(item: item, indexPath: indexPath, reload: false)
return
+ case .triggerPro:
+ item.triggerProID = Trigger.nextTriggerID(gameType: game.gameType, currentID: item.triggerProID)
default:
break
}
@@ -665,7 +671,7 @@ extension GameSettingView: UICollectionViewDelegate {
}
}
return UIContextMenuConfiguration(actionProvider: { _ in UIMenu(children: actions) })
- } else if game.gameType == .nes {
+ } else if game.gameType == .nes || game.gameType == .fds {
var actions = game.nesPalettes.map { palette in
UIAction(title: palette.name,
image: item.image) { [weak self] _ in
@@ -707,25 +713,21 @@ extension GameSettingView: UICollectionViewDelegate {
}
} else if item.type == .swapDisk {
- if game.gameType == .nes {
- if game.fileExtension.lowercased() == "fds" {
- var actions = [UIAction]()
- actions.append(UIAction(title: R.string.localizable.diskSideChange(),
- handler: { [weak self] _ in
- guard let self = self else { return }
- item.currentDiskIndex = 0
- self.updateCellAndCallBack(item: item, indexPath: indexPath)
- }))
- actions.append(UIAction(title: R.string.localizable.ejectDisk(),
- handler: { [weak self] _ in
- guard let self = self else { return }
- item.currentDiskIndex = 1
- self.updateCellAndCallBack(item: item, indexPath: indexPath)
- }))
- return UIContextMenuConfiguration(actionProvider: { _ in UIMenu(children: actions) })
- } else {
- UIView.makeToast(message: R.string.localizable.fdsAlert())
- }
+ if game.gameType == .fds {
+ var actions = [UIAction]()
+ actions.append(UIAction(title: R.string.localizable.diskSideChange(),
+ handler: { [weak self] _ in
+ guard let self = self else { return }
+ item.currentDiskIndex = 0
+ self.updateCellAndCallBack(item: item, indexPath: indexPath)
+ }))
+ actions.append(UIAction(title: R.string.localizable.ejectDisk(),
+ handler: { [weak self] _ in
+ guard let self = self else { return }
+ item.currentDiskIndex = 1
+ self.updateCellAndCallBack(item: item, indexPath: indexPath)
+ }))
+ return UIContextMenuConfiguration(actionProvider: { _ in UIMenu(children: actions) })
} else if game.supportSwapDisc {
var actions = [UIAction]()
for index in 0..<game.totalDiskCount {
@@ -761,6 +763,46 @@ extension GameSettingView: UICollectionViewDelegate {
}
}
return UIContextMenuConfiguration(actionProvider: { _ in UIMenu(title: R.string.localizable.airPlayLayoutTips(), children: actions) })
+ } else if item.type == .triggerPro {
+ var firstGroup: [UIAction] = []
+ var sectionGroup: [UIAction] = []
+ var thirdGroup: [UIAction] = []
+ let triggers = Trigger.supportTriggers(gameType: game.gameType)
+ if triggers.count > 0 {
+ firstGroup.append(contentsOf: triggers.map({ trigger in
+ var image: UIImage? = nil
+ if let currentID = item.triggerProID, trigger.id == currentID {
+ image = UIImage(symbol: .checkmarkCircleFill)
+ }
+ return UIAction(title: trigger.triggerProName,
+ image: image) { [weak self] _ in
+ guard let self = self else { return }
+ item.triggerProID = trigger.id
+ self.updateCellAndCallBack(item: item, indexPath: indexPath)
+ }
+ }))
+
+ sectionGroup.append(UIAction(title: R.string.localizable.disableTriggerPro(), handler: { [weak self] _ in
+ guard let self = self else { return }
+ item.triggerProID = nil
+ self.updateCellAndCallBack(item: item, indexPath: indexPath)
+ }))
+
+ }
+ //添加管理item
+ thirdGroup.append(UIAction(title: R.string.localizable.manageTriggerPro(), image: R.image.customXmarkTriangleCircleSquare(), handler: { _ in
+ topViewController()?.present(TriggerProListViewController(), animated: true)
+ }))
+
+ var menus: [UIMenu] = []
+ if firstGroup.count > 0 {
+ menus.append(UIMenu(options: .displayInline, children: firstGroup))
+ menus.append(UIMenu(options: .displayInline, children: sectionGroup))
+ }
+ if thirdGroup.count > 0 {
+ menus.append(UIMenu(options: .displayInline, children: thirdGroup))
+ }
+ return UIContextMenuConfiguration(actionProvider: { _ in UIMenu(children: menus) } )
}
return nil
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Models/SettingItem.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Models/SettingItem.swift
index baf6c974..5daa0752 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Models/SettingItem.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Models/SettingItem.swift
@@ -10,7 +10,7 @@
struct SettingItem {
enum ItemType: String {
- case theme, quickGame, airPlay, iCloud, fullScreenWhenConnectController, FAQ, feedback, shareApp, qq, telegram, discord, clearCache, language, userAgreement, privacyPolicy, autoSaveState, bios, respectSilentMode, onlinePlay, about, retro, rumble, appearance
+ case theme, quickGame, airPlay, iCloud, fullScreenWhenConnectController, FAQ, feedback, shareApp, qq, telegram, discord, clearCache, language, userAgreement, privacyPolicy, autoSaveState, bios, respectSilentMode, onlinePlay, about, retro, rumble, appearance, triggerPro
}
var type: ItemType
@@ -29,7 +29,7 @@ struct SettingItem {
return Constants.Color.Indigo
case .iCloud, .userAgreement, .appearance:
return Constants.Color.Blue
- case .fullScreenWhenConnectController, .shareApp:
+ case .fullScreenWhenConnectController, .shareApp, .triggerPro:
return Constants.Color.Orange
case .bios, .language:
return Constants.Color.Pink
@@ -94,6 +94,8 @@ struct SettingItem {
}
case .appearance:
R.image.customMoonphaseFirstQuarter()!.applySymbolConfig(font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ case .triggerPro:
+ R.image.customXmarkTriangleCircleSquare()!.applySymbolConfig(font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
}
}
@@ -145,6 +147,8 @@ struct SettingItem {
"Rumble"
case .appearance:
R.string.localizable.appearance()
+ case .triggerPro:
+ "TriggerPro"
}
}
@@ -167,6 +171,8 @@ struct SettingItem {
return R.string.localizable.rumbleDetail()
} else if type == .appearance {
return Settings.appearance.desc
+ } else if type == .triggerPro {
+ return R.string.localizable.triggerProDesc()
}
return nil
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Models/Settings.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Models/Settings.swift
index e4485285..684d3f68 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Models/Settings.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Models/Settings.swift
@@ -131,15 +131,15 @@ struct SkinConfig: SmartCodable {
var portraitSkins = [String: String]()
var landscapeSkins = [String: String]()
- static func prefferedPortraitSkin(gameType: GameType) -> Skin? {
- prefferedSkin(gameType: gameType, isLandscape: false)
+ static func preferredPortraitSkin(gameType: GameType) -> Skin? {
+ preferredSkin(gameType: gameType, isLandscape: false)
}
- static func prefferedLandscapeSkin(gameType: GameType) -> Skin? {
- prefferedSkin(gameType: gameType, isLandscape: true)
+ static func preferredLandscapeSkin(gameType: GameType) -> Skin? {
+ preferredSkin(gameType: gameType, isLandscape: true)
}
- static func prefferedSkin(gameType: GameType, isLandscape: Bool) -> Skin? {
+ static func preferredSkin(gameType: GameType, isLandscape: Bool) -> Skin? {
if let config = SkinConfig.deserialize(from: Settings.defalut.skinConfig),
let skinId = isLandscape ? config.landscapeSkins[gameType.rawValue] : config.portraitSkins[gameType.rawValue],
let skin = Database.realm.object(ofType: Skin.self, forPrimaryKey: skinId) {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSCollectionViewCell.swift
index a0fd6b3f..23897538 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSCollectionViewCell.swift
@@ -127,8 +127,8 @@ class BIOSCollectionViewCell: UICollectionViewCell {
biosItems = Constants.BIOS.GBCBios
} else if gameType == .gba {
biosItems = Constants.BIOS.GBABios
- } else if gameType == .nes {
- biosItems = Constants.BIOS.NESBios
+ } else if gameType == .fds {
+ biosItems = Constants.BIOS.FDSBios
} else if gameType == .pm {
biosItems = Constants.BIOS.PMBios
} else if gameType == ._3ds {
@@ -355,8 +355,8 @@ class BIOSCollectionViewCell: UICollectionViewCell {
itemCount = Constants.BIOS.GBCBios.count
} else if gameType == .gba {
itemCount = Constants.BIOS.GBABios.count
- } else if gameType == .nes {
- itemCount = Constants.BIOS.NESBios.count
+ } else if gameType == .fds {
+ itemCount = Constants.BIOS.FDSBios.count
} else if gameType == .pm {
itemCount = Constants.BIOS.PMBios.count
} else if gameType == ._3ds {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
index 33716355..e602489e 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/BIOSSelectionView.swift
@@ -14,7 +14,7 @@ import IceCream
class BIOSSelectionView: BaseView {
private enum SectionIndex: Int, CaseIterable {
- case desc, mcd, ss, ds, ps1, dc, gb, gbc, gba, nes, pm, _3ds
+ case desc, mcd, ss, ds, ps1, dc, gb, gbc, gba, fds, pm, _3ds
var title: String {
switch self {
case .desc: ""
@@ -26,7 +26,7 @@ class BIOSSelectionView: BaseView {
case .gb: GameType.gb.localizedName
case .gbc: GameType.gbc.localizedName
case .gba: GameType.gba.localizedName
- case .nes: GameType.nes.localizedName
+ case .fds: GameType.fds.localizedName
case .pm: GameType.pm.localizedName
case ._3ds: GameType._3ds.localizedName
}
@@ -43,7 +43,7 @@ class BIOSSelectionView: BaseView {
case .gb: return .gb
case .gbc: return .gbc
case .gba: return .gba
- case .nes: return .nes
+ case .fds: return .fds
case .pm: return .pm
case ._3ds: return ._3ds
}
@@ -106,18 +106,18 @@ class BIOSSelectionView: BaseView {
self.datas = [.desc, .gbc]
} else if let gameType, gameType == .gba {
self.datas = [.desc, .gba]
- } else if let gameType, gameType == .nes {
- self.datas = [.desc, .nes]
+ } else if let gameType, gameType == .fds {
+ self.datas = [.desc, .fds]
} else if let gameType, gameType == .pm {
self.datas = [.desc, .pm]
} else if let gameType, gameType == ._3ds {
self.datas = [.desc, ._3ds]
} else {
#if SIDE_LOAD
- self.datas = [.desc, ._3ds, .dc, .ps1, .mcd, .ss, .ds, .gb, .gbc, .gba, .nes, .pm]
+ self.datas = [.desc, ._3ds, .dc, .ps1, .mcd, .ss, .ds, .gb, .gbc, .gba, .fds, .pm]
#else
//AppStore版本禁用MCD
- self.datas = [.desc, ._3ds, .dc, .ps1, .ss, .ds, .gb, .gbc, .gba, .nes, .pm]
+ self.datas = [.desc, ._3ds, .dc, .ps1, .ss, .ds, .gb, .gbc, .gba, .fds, .pm]
#endif
}
super.init(frame: .zero)
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DesktopIconCollectionViewCell.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DesktopIconCollectionViewCell.swift
index a25716e5..199f3ecf 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DesktopIconCollectionViewCell.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/DesktopIconCollectionViewCell.swift
@@ -93,7 +93,12 @@ class DesktopIconCollectionViewCell: UICollectionViewCell {
make.height.equalTo(100)
}
- let icons = ["AppIcon", "AppIcon_Dark", "AppIcon_Retro", "AppIcon_Color"]
+ var icons = ["AppIcon", "AppIcon_Dark", "AppIcon_Retro", "AppIcon_Color"]
+ let showUpDate = Date(timeIntervalSince1970: 1761840000)
+ if Date.now.secondsSince(showUpDate) > 0 {
+ //2025/10/31之后才添加万圣节图标
+ icons.append("AppIcon_Halloween")
+ }
let theme = Theme.defalut
for (index, icon) in icons.enumerated() {
let iconView = IconView()
@@ -134,6 +139,7 @@ class DesktopIconCollectionViewCell: UICollectionViewCell {
Theme.change { realm in
Theme.defalut.icon = icons[index]
}
+ Theme.defalut.updateExtra(key: ExtraKey.recoverIcon.rawValue, value: "")
} else {
view.selectImageView.isHidden = true
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift
index 8ad23af2..df3c03cd 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift
@@ -112,7 +112,8 @@ class SettingsListView: BaseView {
SettingItem(type: .respectSilentMode, isOn: Settings.defalut.respectSilentMode),
SettingItem(type: .onlinePlay),
SettingItem(type: .rumble, isOn: Settings.defalut.getExtraBool(key: ExtraKey.rumble.rawValue) ?? false),
- SettingItem(type: .retro)
+ SettingItem(type: .retro),
+ SettingItem(type: .triggerPro)
]
#else
datas[section] = [SettingItem(type: .airPlay, isOn: Settings.defalut.airPlay),
@@ -122,7 +123,8 @@ class SettingsListView: BaseView {
SettingItem(type: .respectSilentMode, isOn: Settings.defalut.respectSilentMode),
SettingItem(type: .onlinePlay),
SettingItem(type: .rumble, isOn: Settings.defalut.getExtraBool(key: ExtraKey.rumble.rawValue) ?? false),
- SettingItem(type: .retro)
+ SettingItem(type: .retro),
+ SettingItem(type: .triggerPro)
]
#endif
} else if section == .support {
@@ -216,7 +218,7 @@ class SettingsListView: BaseView {
trailing: Constants.Size.ContentSpaceMid)
//section布局
let section = NSCollectionLayoutSection(group: group)
- section.contentInsets = NSDirectionalEdgeInsets(top: sectionIndex == 0 ? Constants.Size.ContentSpaceMin : 0, leading: 0, bottom: Constants.Size.ContentSpaceTiny, trailing: 0)
+ section.contentInsets = NSDirectionalEdgeInsets(top: sectionIndex == 0 ? Constants.Size.ContentSpaceMin : 0, leading: 0, bottom: Constants.Size.ContentSpaceMid, trailing: 0)
if sectionIndex > 0 {
//header布局
@@ -527,6 +529,13 @@ extension SettingsListView: UICollectionViewDelegate {
} else {
topViewController()?.present(vc, animated: true)
}
+ case .triggerPro:
+ let vc = TriggerProListViewController(showClose: UIDevice.isPhone)
+ if UIDevice.isPad {
+ didTapDetail?(vc)
+ } else {
+ topViewController()?.present(vc, animated: true)
+ }
default:
break
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinSettingsView.swift b/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinSettingsView.swift
index c4a13193..2c9698c6 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinSettingsView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Skin/Views/SkinSettingsView.swift
@@ -423,7 +423,7 @@ class SkinSettingsView: BaseView {
//去总设置中去寻找有没有配置过皮肤 如果都没有配置过皮肤则默认选中自带默认的皮肤
if portraitInitialSelectedIndex == nil {
- if let storedSkin = SkinConfig.prefferedPortraitSkin(gameType: gameType) {
+ if let storedSkin = SkinConfig.preferredPortraitSkin(gameType: gameType) {
portraitInitialSelectedIndex = getIndex(for: storedSkin, in: portraitSkins) ?? 0
} else {
portraitInitialSelectedIndex = 0
@@ -431,7 +431,7 @@ class SkinSettingsView: BaseView {
}
if landscapeInitialSelectedIndex == nil {
- if let storedSkin = SkinConfig.prefferedLandscapeSkin(gameType: gameType) {
+ if let storedSkin = SkinConfig.preferredLandscapeSkin(gameType: gameType) {
landscapeInitialSelectedIndex = getIndex(for: storedSkin, in: landscapeSkins) ?? 0
} else {
landscapeInitialSelectedIndex = 0
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Models/Trigger.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Models/Trigger.swift
new file mode 100644
index 00000000..04a3153a
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Models/Trigger.swift
@@ -0,0 +1,381 @@
+//
+// Trigger.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/20.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import RealmSwift
+import ManicEmuCore
+import IceCream
+
+extension Trigger: CKRecordConvertible & CKRecordRecoverable {}
+extension TriggerItem: CKRecordConvertible & CKRecordRecoverable {}
+
+class TriggerItem: Object {
+ ///样式
+ ///skeuomorphism 仿真风格
+ ///flat 扁平风格
+ ///custom 自定义按钮
+ enum Style: Int, PersistableEnum {
+ case classic, flat, custom
+
+ func getFont(buttonSize: CGSize) -> UIFont {
+ switch self {
+ case .classic:
+ UIFont.monospacedDigitSystemFont(ofSize: buttonSize.height*0.375, weight: .bold)
+ case .flat:
+ UIFont.monospacedDigitSystemFont(ofSize: buttonSize.height*0.4, weight: .medium)
+ case .custom:
+ Constants.Font.title()
+ }
+ }
+
+ var defaultSize: CGSize {
+ switch self {
+ case .classic:
+ .init(80)
+ case .flat:
+ .init(60)
+ case .custom:
+ .init(60)
+ }
+ }
+
+ var sizeRange: (min: Float, max: Float) {
+ switch self {
+ case .classic:
+ (40, 100)
+ case .flat, .custom:
+ (32, 80)
+ }
+ }
+
+ var cellHeight: CGFloat {
+ if self == .custom {
+ 440
+ } else {
+ 370
+ }
+ }
+
+ var name: String {
+ switch self {
+ case .classic:
+ R.string.localizable.classic()
+ case .flat:
+ R.string.localizable.flat()
+ case .custom:
+ R.string.localizable.custom()
+ }
+ }
+ }
+
+ ///simple: 简单按压
+ ///hold: 长按
+ ///combo: 连招(顺序按压)
+ enum Action: Int, PersistableEnum {
+ case simple, hold, combo
+
+ var desc: String {
+ switch self {
+ case .simple:
+ R.string.localizable.simpleActionDesc()
+ case .hold:
+ R.string.localizable.holdActionDesc()
+ case .combo:
+ R.string.localizable.comboActionDesc()
+ }
+ }
+
+ var name: String {
+ switch self {
+ case .simple:
+ R.string.localizable.simple()
+ case .hold:
+ R.string.localizable.hold()
+ case .combo:
+ R.string.localizable.combo()
+ }
+ }
+ }
+ ///主键 由创建时间戳ms来生成
+ @Persisted(primaryKey: true) var id: Int = PersistedKit.incrementID
+ ///用于iCloud同步删除
+ @Persisted var isDeleted: Bool = false
+ ///样式
+ @Persisted var style: Style = .classic
+ ///自定义样式的图片资源
+ @Persisted var customImage: CreamAsset?
+ ///按钮的文案
+ @Persisted var buttonText: String = "M"
+ ///按钮在iPhone的X坐标
+ @Persisted var iphoneButtonX: Double?
+ ///按钮在iPhone的Y坐标
+ @Persisted var iphoneButtonY: Double?
+ ///按钮在iPad的X坐标
+ @Persisted var ipadButtonX: Double?
+ ///按钮在iPad的Y坐标
+ @Persisted var ipadButtonY: Double?
+ ///设置的时候 需要确保该实例不是数据库实例,否则set的时候会闪退
+ var position: CGPoint? {
+ get {
+ if UIDevice.isPhone, let iphoneButtonX, let iphoneButtonY {
+ return CGPoint(x: iphoneButtonX, y: iphoneButtonY)
+ } else if let ipadButtonX, let ipadButtonY {
+ return CGPoint(x: ipadButtonX, y: ipadButtonY)
+ }
+ return nil
+ }
+ set {
+ if let newValue {
+ if UIDevice.isPhone {
+ iphoneButtonX = Double(newValue.x)
+ iphoneButtonY = Double(newValue.y)
+ } else {
+ ipadButtonX = Double(newValue.x)
+ ipadButtonY = Double(newValue.y)
+ }
+ }
+ }
+ }
+ ///按钮的width
+ @Persisted var buttonWidth: Double = Style.classic.defaultSize.width
+ ///按钮的height
+ @Persisted var buttonHeight: Double = Style.classic.defaultSize.height
+ ///按钮的size
+ var buttonSize: CGSize { .init(width: buttonWidth, height: buttonHeight) }
+ ///按钮透明度 0-1
+ @Persisted var buttonOpacity: Double = 1
+ ///按钮圆角 百分比 0是矩形 100是圆形
+ @Persisted var buttonCornerRadiusRatio: Double = 26.7
+ var buttonCornerRadius: CGFloat {
+ if style == .custom {
+ return (buttonCornerRadiusRatio/100)*(buttonHeight/2)
+ } else {
+ return 0
+ }
+ }
+ ///映射列表
+ @Persisted var mappings: List<String>
+ ///动作类型
+ @Persisted var action: Action = .simple
+ ///简单类型 是否重复点击
+ @Persisted var simpleActionRepeat: Bool = false
+ ///简单类型 重复点击的间隔时间 默认0.1s
+ @Persisted var simpleActionRepeatInterval: Double = 0.1
+ ///长按类型 长按是否自动停止
+ @Persisted var holdActionAutoStop: Bool = false
+ ///长按类型 长按自动停止的持续时间 默认5秒
+ @Persisted var holdActionDuration: Double = 5
+ ///连招类型 每个键的按压持续时间 默认50ms
+ @Persisted var comboActionPressDurationPerKey: Double = 50
+ ///连招类型 每个键的按压间隔时间 默认100ms
+ @Persisted var comboActionIntervalPerKey: Double = 100
+
+ var desc: String {
+ var result = "\(R.string.localizable.buttonStyle()): \(style.name)\n"
+ if UIDevice.isPhone {
+ result += "\(R.string.localizable.position()): (x: \(iphoneButtonX ?? -1) y: \(iphoneButtonY ?? -1))\n"
+ } else {
+ result += "\(R.string.localizable.position()): (x: \(ipadButtonX ?? -1) y: \(ipadButtonY ?? -1))\n"
+ }
+ result += "\(R.string.localizable.size()): (width: \(buttonWidth) height: \(buttonHeight))\n"
+ result += "\(R.string.localizable.action()): \(action.name)\n"
+ if action == .simple {
+ result += "\(R.string.localizable.repeatTrigger()): \(simpleActionRepeat)\n"
+ result += "\(R.string.localizable.repeatInterval()): \(simpleActionRepeatInterval)s\n"
+ } else if action == .hold {
+ result += "\(R.string.localizable.autoStop()): \(holdActionAutoStop)\n"
+ result += "\(R.string.localizable.holdDuration()): \(holdActionDuration)s\n"
+ } else if action == .combo {
+ result += "\(R.string.localizable.pressDurationPerKey()): \(comboActionPressDurationPerKey)ms\n"
+ result += "\(R.string.localizable.intervalPerKey()): \(comboActionIntervalPerKey)ms\n"
+ }
+ if mappings.count > 0 {
+ result += "\(R.string.localizable.mapping()): \(mappings.reduce("", { $0 + " (\($1))" }))"
+ }
+ return result
+ }
+
+ func isCompleteEqual(triggerItem: TriggerItem) -> Bool {
+ if id == triggerItem.id &&
+ style == triggerItem.style &&
+ iphoneButtonX == triggerItem.iphoneButtonX &&
+ iphoneButtonY == triggerItem.iphoneButtonY &&
+ ipadButtonX == triggerItem.ipadButtonX &&
+ ipadButtonY == triggerItem.ipadButtonY &&
+ buttonSize == triggerItem.buttonSize &&
+ buttonOpacity == triggerItem.buttonOpacity &&
+ buttonCornerRadiusRatio == triggerItem.buttonCornerRadiusRatio &&
+ mappings == triggerItem.mappings &&
+ action == triggerItem.action {
+ switch style {
+ case .classic, .flat:
+ if buttonText != triggerItem.buttonText {
+ return false
+ }
+ case .custom:
+ if customImage?.storedData() != triggerItem.customImage?.storedData() {
+ return false
+ }
+ }
+ switch action {
+ case .simple:
+ if simpleActionRepeat == triggerItem.simpleActionRepeat &&
+ simpleActionRepeatInterval == triggerItem.simpleActionRepeatInterval {
+ return true
+ }
+ case .hold:
+ if holdActionAutoStop == triggerItem.holdActionAutoStop &&
+ holdActionDuration == triggerItem.holdActionDuration {
+ return true
+ }
+ case .combo:
+ if comboActionIntervalPerKey == triggerItem.comboActionIntervalPerKey && comboActionPressDurationPerKey == triggerItem.comboActionPressDurationPerKey {
+ return true
+ }
+ }
+ }
+ return false
+ }
+}
+
+class Trigger: Object, ObjectUpdatable {
+ ///主键 由创建时间戳ms来生成
+ @Persisted(primaryKey: true) var id: Int = PersistedKit.incrementID
+ ///游戏平台类型
+ @Persisted var gameType: GameType
+ ///用于iCloud同步删除
+ @Persisted var isDeleted: Bool = false
+ ///额外数据备用
+ @Persisted var extras: Data?
+ ///名称 如果名称为空 则使用 TriggerPro-25-11-1
+ @Persisted var name: String?
+ ///items
+ @Persisted var items: List<TriggerItem>
+
+ var triggerProName: String {
+ if let name, !name.isEmpty {
+ return name
+ } else {
+ return defaultName
+ }
+ }
+
+ var defaultName: String {
+ "TriggerPro " + Date(timeIntervalSince1970: TimeInterval(id/1000)).dateTimeString(ofStyle: .short)
+ }
+
+ func getExtra(key: String) -> Any? {
+ if let extras {
+ return Self.getExtra(extras: extras, key: key)
+ }
+ return nil
+ }
+
+ func updateExtra(key: String, value: Any) {
+ if let extras, let data = Self.updateExtra(extras: extras, key: key, value: value) {
+ Self.change { realm in
+ self.extras = data
+ }
+ } else if let data = [key: value].jsonData() {
+ Self.change { realm in
+ self.extras = data
+ }
+ }
+ }
+
+ func copyTrigger(newId: Bool = false) -> Trigger {
+ let trigger = Trigger()
+ trigger.id = newId ? PersistedKit.incrementID : id
+ trigger.gameType = gameType
+ trigger.extras = extras
+ trigger.name = name
+ trigger.items = List<TriggerItem>()
+ for (index, item) in items.enumerated() {
+ let triggerItem = TriggerItem()
+ triggerItem.id = newId ? PersistedKit.incrementID + index : item.id
+ triggerItem.isDeleted = item.isDeleted
+ triggerItem.style = item.style
+ triggerItem.customImage = item.customImage
+ triggerItem.buttonText = item.buttonText
+ triggerItem.iphoneButtonX = item.iphoneButtonX
+ triggerItem.iphoneButtonY = item.iphoneButtonY
+ triggerItem.ipadButtonX = item.ipadButtonX
+ triggerItem.ipadButtonY = item.ipadButtonY
+ triggerItem.buttonWidth = item.buttonWidth
+ triggerItem.buttonHeight = item.buttonHeight
+ triggerItem.buttonOpacity = item.buttonOpacity
+ triggerItem.buttonCornerRadiusRatio = item.buttonCornerRadiusRatio
+ triggerItem.mappings = item.mappings
+ triggerItem.action = item.action
+ triggerItem.simpleActionRepeat = item.simpleActionRepeat
+ triggerItem.simpleActionRepeatInterval = item.simpleActionRepeatInterval
+ triggerItem.holdActionAutoStop = item.holdActionAutoStop
+ triggerItem.holdActionDuration = item.holdActionDuration
+ triggerItem.comboActionPressDurationPerKey = item.comboActionPressDurationPerKey
+ triggerItem.comboActionIntervalPerKey = item.comboActionIntervalPerKey
+ trigger.items.append(triggerItem)
+ }
+ return trigger
+ }
+
+ func isCompleteEqual(trigger: Trigger) -> Bool {
+ if id == trigger.id &&
+ gameType == trigger.gameType &&
+ extras == trigger.extras &&
+ name == trigger.name &&
+ items.count == trigger.items.count {
+ for (index, item) in items.enumerated() {
+ let newItem = trigger.items[index]
+ if !item.isCompleteEqual(triggerItem: newItem) {
+ return false
+ }
+ }
+ return true
+ }
+ return false
+ }
+
+ func update(realm: Realm, trigger: Trigger) {
+ try? realm.write {
+ gameType = trigger.gameType
+ extras = trigger.extras
+ name = trigger.name
+ realm.delete(items)
+ items = trigger.items
+ }
+ }
+
+ static func supportTriggers(gameType: GameType) -> [Trigger] {
+ let realm = Database.realm
+ let triggers = realm.objects(Trigger.self).where({ $0.gameType == gameType && !$0.isDeleted}).sorted(by: \Trigger.id, ascending: true)
+ var results: [Trigger] = []
+ results.append(contentsOf: triggers)
+ return results
+ }
+
+ static func nextTriggerID(gameType: GameType, currentID: Int?) -> Int? {
+ let triggers = supportTriggers(gameType: gameType)
+ if triggers.count > 0 {
+ //配置存在
+ if let currentID, let currentIndex = triggers.firstIndex(where: { $0.id == currentID }) {
+ //找到配置的index
+ if currentIndex + 1 >= triggers.count {
+ //目前已经使用了最后一个配置
+ return nil
+ } else {
+ //获取下一个配置的id
+ return triggers[currentIndex+1].id
+ }
+ } else {
+ //没找到配置,但是存在配置,直接返回第一个配置ID
+ return triggers[0].id
+ }
+ } else {
+ return nil
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/AddTriggerButtonController.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/AddTriggerButtonController.swift
new file mode 100644
index 00000000..0ed71625
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/AddTriggerButtonController.swift
@@ -0,0 +1,48 @@
+//
+// AddTriggerButtonController.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/21.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import ManicEmuCore
+
+class AddTriggerButtonController: BaseViewController {
+
+ private lazy var addTriggerButtonView: AddTriggerButtonView = {
+ let view = AddTriggerButtonView(triggerItem: triggerItem, gameType: gameType, inputs: inputs)
+ view.didTapClose = {[weak self] in
+ self?.dismiss(animated: true)
+ self?.didPageClose?()
+ }
+ return view
+ }()
+
+ private var triggerItem: TriggerItem
+ private let gameType: GameType
+ private let inputs: [String]
+ var didPageClose: (()->Void)? = nil
+
+ init(triggerItem: TriggerItem, gameType: GameType, inputs: [String]) {
+ self.triggerItem = triggerItem
+ self.gameType = gameType
+ self.inputs = inputs
+ super.init(nibName: nil, bundle: nil)
+ //禁止下滑关闭控制器
+ isModalInPresentation = true
+ }
+
+ @MainActor required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
+ view.addSubview(addTriggerButtonView)
+ addTriggerButtonView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/TriggerProListViewController.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/TriggerProListViewController.swift
new file mode 100644
index 00000000..20ae07cf
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/TriggerProListViewController.swift
@@ -0,0 +1,38 @@
+//
+// TriggerProListViewController.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/21.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+class TriggerProListViewController: BaseViewController {
+
+ private lazy var triggerProListView: TriggerProListView = {
+ let view = TriggerProListView(showClose: showClose)
+ view.didTapClose = {[weak self] in
+ self?.dismiss(animated: true)
+ }
+ return view
+ }()
+
+ private var showClose: Bool
+
+ init(showClose: Bool = true) {
+ self.showClose = showClose
+ super.init(nibName: nil, bundle: nil)
+ }
+
+ @MainActor required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
+ view.addSubview(triggerProListView)
+ triggerProListView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/TriggerProPreviewController.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/TriggerProPreviewController.swift
new file mode 100644
index 00000000..bb9d0d91
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/ViewControllers/TriggerProPreviewController.swift
@@ -0,0 +1,408 @@
+//
+// TriggerProPreviewController.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/21.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import UIKit
+import ManicEmuCore
+import AVFoundation
+import RealmSwift
+import IQKeyboardManagerSwift
+
+class TriggerProPreviewController: BaseViewController {
+
+ private var skin: ControllerSkin {
+ didSet {
+ controlView.controllerSkin = skin
+ }
+ }
+ private let defaultSkin: ControllerSkin
+ private let traits: ControllerSkin.Traits
+ private let trigger: Trigger ///不是真正的数据库对象
+ private let isNewTrigger: Bool
+
+ private lazy var supportSkins: [ControllerSkin] = {
+ let realm = Database.realm
+ let skins = realm.objects(Skin.self).where({ $0.gameType == self.skin.gameType })
+ let controllerSkins = skins.compactMap({
+ if let cs = ControllerSkin(fileURL: $0.fileURL), cs.supports(self.traits) {
+ return cs
+ }
+ return nil
+ })
+ return Array(controllerSkins)
+ }()
+
+ private lazy var controlView: ControllerView = {
+ let view = ControllerView()
+ view.customControllerSkinTraits = traits
+ view.controllerSkin = skin
+ view.alpha = hideControls ? 0 : 1
+ return view
+ }()
+
+ private var gameViewBackgroundView: UIImageView = {
+ let view = UIImageView(image: R.image.triggerPro_bg())
+ view.contentMode = .scaleAspectFill
+ view.masksToBounds = true
+ return view
+ }()
+
+ private var switchPreviewSkinMenuButton: ContextMenuButton = {
+ let view = ContextMenuButton()
+ return view
+ }()
+
+ private lazy var switchPreviewSkinButton: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .chevronUpChevronDown, font: Constants.Font.caption(weight: .bold)),
+ title: R.string.localizable.switchPreviewSkin(),
+ titleFont: Constants.Font.title(size: .s),
+ titleColor: Constants.Color.LabelPrimary.forceStyle(.dark),
+ edgeInsets: .zero,
+ titlePosition: .left,
+ imageAndTitlePadding: Constants.Size.ContentSpaceUltraTiny)
+ view.layerCornerRadius = 0
+ view.backgroundColor = .clear
+ view.addTapGesture { [weak self] gesture in
+ guard let self = self else { return }
+ let itemTitles = self.supportSkins.map { $0.name }
+ var items: [UIAction] = []
+ let currentSkinName = self.skin.name
+ for (index, title) in itemTitles.enumerated() {
+ items.append(UIAction(title: title,
+ image: currentSkinName == title && !self.hideControls ? UIImage(symbol: .checkmarkCircleFill) : nil,
+ handler: { [weak self] _ in
+ guard let self = self else { return }
+ self.skin = self.supportSkins[index]
+ self.hideControls = false
+ }))
+ }
+ self.switchPreviewSkinMenuButton.menu = UIMenu(children: [
+ UIMenu(options: .displayInline,
+ children: items),
+ UIMenu(options: .displayInline,
+ children: [UIAction(title: R.string.localizable.hideControlsTitle(),
+ image: self.hideControls ? UIImage(symbol: .checkmarkCircleFill) : nil,
+ handler: { [weak self] _ in
+ guard let self = self else { return }
+ self.hideControls = true
+ })])
+ ])
+ self.switchPreviewSkinMenuButton.triggerTapGesture()
+ }
+ return view
+ }()
+
+ private lazy var addButton: UIView = {
+ let view = UIView()
+ view.enableInteractive = true
+ let iconContainerView = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid)
+ iconContainerView.backgroundColor = Constants.Color.Background
+ view.addSubview(iconContainerView)
+ iconContainerView.snp.makeConstraints { make in
+ make.size.equalTo(64)
+ make.top.equalToSuperview()
+ make.centerX.equalToSuperview()
+ }
+
+ let iconView = UIImageView(image: UIImage(symbol: .plusCircleFill, font: Constants.Font.body(weight: .bold), colors: [Constants.Color.Background, Constants.Color.LabelPrimary]))
+ iconContainerView.addSubview(iconView)
+ iconView.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ make.size.equalTo(35)
+ }
+
+ let label = UILabel()
+ label.font = Constants.Font.body(size: .l, weight: .semibold)
+ label.textColor = Constants.Color.LabelPrimary.forceStyle(.dark)
+ label.text = R.string.localizable.addButton()
+ view.addSubview(label)
+ label.snp.makeConstraints { make in
+ make.top.equalTo(iconContainerView.snp.bottom).offset(Constants.Size.ContentSpaceMin)
+ make.leading.trailing.bottom.equalToSuperview()
+ }
+
+ view.addTapGesture { [weak self] gesture in
+ guard let self else { return }
+ let item = TriggerItem()
+ self.trigger.items.append(item)
+ let vc = AddTriggerButtonController(triggerItem: item, gameType: self.trigger.gameType, inputs: self.getInputs())
+ vc.didPageClose = { [weak self] in
+ guard let self else { return }
+ self.triggerProView.reloadButtons()
+ }
+ topViewController()?.present(vc, animated: true)
+ self.triggerProView.reloadButtons()
+ }
+
+ return view
+ }()
+
+ private lazy var titleTextField: UITextField = {
+ let view = UITextField()
+ view.textColor = Constants.Color.LabelPrimary
+ view.font = Constants.Font.body(size: .l)
+ view.clearButtonMode = .always
+ view.text = trigger.name ?? ""
+ view.onReturnKeyPress { [weak self] in
+ guard let self = self else { return }
+ self.trigger.name = self.titleTextField.text
+ }
+ view.attributedPlaceholder = NSAttributedString(string: trigger.defaultName, attributes: [.font: Constants.Font.body(size: .l), .foregroundColor: Constants.Color.LabelTertiary])
+ view .returnKeyType = .done
+ return view
+ }()
+
+ private lazy var triggerProView: TriggerProView = {
+ let view = TriggerProView(trigger: trigger, isEditMode: true)
+ view.didTapButton = { [weak self] item in
+ guard let self else { return }
+ UIView.makeAlert(title: R.string.localizable.buttonInfo(),
+ detail: item.desc,
+ detailAlignment: .left,
+ cancelTitle: R.string.localizable.editTitle(),
+ confirmTitle: R.string.localizable.removeTitle(),
+ cancelAction: { [weak self] in
+ guard let self else { return }
+ //编辑
+ let vc = AddTriggerButtonController(triggerItem: item, gameType: self.trigger.gameType, inputs: self.getInputs())
+ vc.didPageClose = { [weak self] in
+ guard let self else { return }
+ self.triggerProView.reloadButtons()
+ }
+ DispatchQueue.main.asyncAfter(delay: 0.15, execute: {
+ topViewController()?.present(vc, animated: true)
+ })
+ }, confirmAction: { [weak self] in
+ guard let self else { return }
+ if let index = self.trigger.items.firstIndex(of: item) {
+ self.trigger.items.remove(at: index)
+ self.triggerProView.reloadButtons()
+ }
+ })
+ }
+ return view
+ }()
+
+ deinit {
+ Task { @MainActor in
+ IQKeyboardManager.shared.isEnabled = false
+ }
+ }
+
+ private var hideControls: Bool {
+ didSet {
+ controlView.alpha = hideControls ? 0 : 1
+ }
+ }
+
+ init(gameType: GameType, trigger: Trigger? = nil, preferredSkinID: String? = nil, hideControls: Bool = false) {
+ let realm = Database.realm
+ self.defaultSkin = ControllerSkin.standardControllerSkin(for: gameType)!
+ if let preferredSkinID,
+ let preferredSkin = realm.objects(Skin.self).where({ $0.id == preferredSkinID}).first,
+ let preferredControllerSkin = ControllerSkin(fileURL: preferredSkin.fileURL) {
+ self.skin = preferredControllerSkin
+ } else {
+ self.skin = self.defaultSkin
+ }
+ self.traits = ControllerSkin.Traits.defaults(for: UIWindow.applicationWindow ?? UIWindow(frame: .init(origin: .zero, size: Constants.Size.WindowSize)))
+ if let trigger {
+ //将数据库实例转换为临时实例 为了更方便的修改 保存的时候统一修改数据库
+ self.trigger = trigger.copyTrigger()
+ self.isNewTrigger = false
+ } else {
+ self.trigger = Trigger()
+ self.trigger.gameType = gameType
+ self.isNewTrigger = true
+ }
+ self.hideControls = hideControls
+ super.init(fullScreen: true)
+
+ view.addSubview(controlView)
+
+ var needToRotate = false
+ if traits.orientation == .portrait && (UIDevice.currentOrientation == .landscapeLeft || UIDevice.currentOrientation == .landscapeRight) {
+ needToRotate = true
+ } else if traits.orientation == .landscape && (UIDevice.currentOrientation == .portrait || UIDevice.currentOrientation == .portraitUpsideDown) {
+ needToRotate = true
+ }
+
+ if needToRotate {
+ controlView.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ if let aspectRatio = skin.aspectRatio(for: traits) {
+ let frame = AVMakeRect(aspectRatio: aspectRatio, insideRect: CGRect(origin: .zero, size: CGSize(width: Constants.Size.WindowHeight, height: Constants.Size.WindowWidth)))
+ make.size.equalTo(frame.size)
+ }
+ }
+ controlView.transform = .init(rotationAngle: .pi/2)
+ } else {
+ controlView.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ if let aspectRatio = skin.aspectRatio(for: traits) {
+ let frame = AVMakeRect(aspectRatio: aspectRatio, insideRect: CGRect(origin: .zero, size: Constants.Size.WindowSize))
+ make.size.equalTo(frame.size)
+ }
+ }
+ }
+
+ view.addSubview(closeButton)
+ closeButton.addTapGesture { [weak self] gesture in
+ self?.dismiss(animated: true)
+ self?.storeTrigger()
+ }
+ closeButton.snp.makeConstraints { make in
+ make.top.equalToSuperview().offset(Constants.Size.SafeAera.top == 0 ? 20 : Constants.Size.SafeAera.top)
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMax)
+ make.size.equalTo(Constants.Size.ItemHeightUltraTiny)
+ }
+
+ view.addSubview(switchPreviewSkinButton)
+ switchPreviewSkinButton.snp.makeConstraints { make in
+ make.leading.equalTo(Constants.Size.ContentSpaceMax)
+ make.centerY.equalTo(closeButton)
+ }
+
+ view.insertSubview(switchPreviewSkinMenuButton, belowSubview: switchPreviewSkinButton)
+ switchPreviewSkinMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(switchPreviewSkinButton)
+ }
+
+ if let skinFrames = skin.getFrames() {
+ controlView.addSubview(gameViewBackgroundView)
+ gameViewBackgroundView.snp.makeConstraints { make in
+ make.leading.equalTo(skinFrames.mainGameViewFrame.minX)
+ make.top.equalTo(skinFrames.mainGameViewFrame.minY)
+ make.size.equalTo(skinFrames.mainGameViewFrame.size)
+ }
+
+ view.addSubview(addButton)
+ addButton.snp.makeConstraints { make in
+ make.center.equalTo(gameViewBackgroundView)
+ }
+
+ let titleEditTextContainerView = UIView()
+ titleEditTextContainerView.layerCornerRadius = Constants.Size.CornerRadiusMid
+ titleEditTextContainerView.backgroundColor = Constants.Color.Background
+ view.addSubview(titleEditTextContainerView)
+ titleEditTextContainerView.snp.makeConstraints { make in
+ make.top.equalTo(addButton.snp.bottom).offset(40)
+ if UIDevice.isPhone {
+ make.leading.trailing.equalTo(gameViewBackgroundView).inset(Constants.Size.ContentSpaceMid)
+ } else {
+ make.width.equalTo(380)
+ make.centerX.equalTo(addButton)
+ }
+ }
+
+ let titleEditLabel = UILabel()
+ titleEditLabel.text = R.string.localizable.triggerProName()
+ titleEditLabel.font = Constants.Font.body(size: .l, weight: .semibold)
+ titleEditLabel.textColor = Constants.Color.LabelPrimary
+ titleEditTextContainerView.addSubview(titleEditLabel)
+ titleEditLabel.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMax)
+ make.top.equalToSuperview().inset(Constants.Size.ContentSpaceMin)
+ }
+
+ let textFieldContainer = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMid)
+ textFieldContainer.backgroundColor = Constants.Color.InputBackground
+ titleEditTextContainerView.addSubview(textFieldContainer)
+ textFieldContainer.snp.makeConstraints { make in
+ make.top.equalTo(titleEditLabel.snp.bottom).offset(Constants.Size.ContentSpaceTiny)
+ make.leading.bottom.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMin)
+ make.height.equalTo(Constants.Size.ItemHeightTiny)
+ }
+
+ textFieldContainer.addSubview(titleTextField)
+ titleTextField.snp.makeConstraints { make in
+ make.top.bottom.equalToSuperview()
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ }
+ }
+
+ view.addSubview(triggerProView)
+ triggerProView.snp.makeConstraints { make in
+ make.edges.equalTo(controlView)
+ }
+
+ IQKeyboardManager.shared.isEnabled = true
+ IQKeyboardManager.shared.keyboardDistance = Constants.Size.ContentSpaceHuge
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+ view.backgroundColor = .black
+ }
+
+ override func viewWillAppear(_ animated: Bool) {
+ super.viewWillAppear(animated)
+ switch UIDevice.currentOrientation {
+ case .portrait:
+ AppDelegate.orientation = .portrait
+ case .portraitUpsideDown:
+ AppDelegate.orientation = .portraitUpsideDown
+ case .landscapeLeft:
+ AppDelegate.orientation = .landscapeLeft
+ case .landscapeRight:
+ AppDelegate.orientation = .landscapeRight
+ default: break
+ }
+ }
+
+ override func viewWillDisappear(_ animated: Bool) {
+ super.viewWillDisappear(animated)
+ AppDelegate.orientation = Constants.Config.DefaultOrientation
+ }
+
+ private func getInputs() -> [String] {
+ if let items = defaultSkin.items(for: traits) {
+ var result: [String] = []
+ for item in items {
+ switch item.kind {
+ case .button:
+ //不支持组合键
+ if let input = item.inputs.allInputs.first {
+ result.append(input.stringValue)
+ }
+ case .dPad, .thumbstick:
+ if case .directional(let up, let down, let left, let right) = item.inputs {
+ result.append(contentsOf: [up.stringValue, down.stringValue, left.stringValue, right.stringValue])
+ }
+ default: break
+ }
+ }
+ return result
+ }
+ return []
+ }
+
+ private func storeTrigger() {
+ if isNewTrigger {
+ //新增Trigger
+ if trigger.items.count > 0 {
+ Trigger.change { realm in
+ realm.add(trigger)
+ }
+ }
+ } else {
+ //更新已有Trigger
+ let realm = Database.realm
+ if let originTrigger = realm.objects(Trigger.self).where({ $0.id == trigger.id }).first {
+ if originTrigger.isCompleteEqual(trigger: trigger) {
+ Log.debug("Trigger没有变更!!!")
+ } else {
+ originTrigger.update(realm: realm, trigger: trigger)
+ }
+ }
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerActionCell.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerActionCell.swift
new file mode 100644
index 00000000..f5d137a6
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerActionCell.swift
@@ -0,0 +1,197 @@
+//
+// AddTriggerActionCell.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/22.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import BetterSegmentedControl
+
+class AddTriggerActionCell: UICollectionViewCell {
+
+ lazy var segmentView: BetterSegmentedControl = {
+ let titles = [
+ R.string.localizable.simple(),
+ R.string.localizable.hold(),
+ R.string.localizable.combo()
+ ]
+ let segments = LabelSegment.segments(withTitles: titles,
+ normalFont: Constants.Font.body(),
+ normalTextColor: Constants.Color.LabelSecondary,
+ selectedTextColor: Constants.Color.LabelPrimary)
+ let options: [BetterSegmentedControl.Option] = [
+ .backgroundColor(Constants.Color.Background),
+ .indicatorViewInset(5),
+ .indicatorViewBackgroundColor(Constants.Color.BackgroundPrimary),
+ .cornerRadius(16)
+ ]
+ let view = BetterSegmentedControl(frame: .zero,
+ segments: segments,
+ options: options)
+ return view
+ }()
+
+ private lazy var simpleActionView: TriggerActionSimpleView = {
+ let view = TriggerActionSimpleView()
+ return view
+ }()
+
+ private lazy var holdActionView: TriggerActionHoldView = {
+ let view = TriggerActionHoldView()
+ return view
+ }()
+
+ private lazy var comboActionView: TriggerActionComboView = {
+ let view = TriggerActionComboView()
+ return view
+ }()
+
+ var didActionTypeChange: ((TriggerItem.Action)->Void)? = nil
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ layerCornerRadius = Constants.Size.CornerRadiusMax
+ backgroundColor = Constants.Color.BackgroundPrimary
+
+ addSubview(segmentView)
+ segmentView.snp.makeConstraints { make in
+ make.leading.top.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceTiny)
+ make.height.equalTo(Constants.Size.ItemHeightMid)
+ }
+ segmentView.on(.valueChanged) { [weak self] sender, forEvent in
+ guard let self = self, let index = (sender as? BetterSegmentedControl)?.index else { return }
+ UIDevice.generateHaptic()
+ if let action = TriggerItem.Action(rawValue: index) {
+ switch action {
+ case .simple:
+ simpleActionView.isHidden = false
+ holdActionView.isHidden = true
+ comboActionView.isHidden = true
+ case .hold:
+ simpleActionView.isHidden = true
+ holdActionView.isHidden = false
+ comboActionView.isHidden = true
+ case .combo:
+ simpleActionView.isHidden = true
+ holdActionView.isHidden = true
+ comboActionView.isHidden = false
+ }
+ self.didActionTypeChange?(action)
+ }
+ }
+
+ addSubview(simpleActionView)
+ simpleActionView.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.top.equalTo(segmentView.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.height.equalTo(120)
+ }
+
+ holdActionView.isHidden = true
+ addSubview(holdActionView)
+ holdActionView.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.top.equalTo(segmentView.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.height.equalTo(120)
+ }
+
+ addSubview(comboActionView)
+ comboActionView.isHidden = true
+ comboActionView.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.top.equalTo(segmentView.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.height.equalTo(120)
+ }
+ }
+
+ func setData(triggerItem: TriggerItem) {
+ segmentView.setIndex(triggerItem.action.rawValue)
+
+ switch triggerItem.action {
+ case .simple:
+ simpleActionView.isHidden = false
+ holdActionView.isHidden = true
+ comboActionView.isHidden = true
+ case .hold:
+ simpleActionView.isHidden = true
+ holdActionView.isHidden = false
+ comboActionView.isHidden = true
+ case .combo:
+ simpleActionView.isHidden = true
+ holdActionView.isHidden = true
+ comboActionView.isHidden = false
+ }
+
+ simpleActionView.repeatSwitchButton.setOn(triggerItem.simpleActionRepeat, animated: false)
+ simpleActionView.repeatSwitchButton.onChange { value in
+ triggerItem.simpleActionRepeat = value
+ }
+ simpleActionView.intervalValueButton.titleLabel.text = "\(triggerItem.simpleActionRepeatInterval)s"
+ simpleActionView.intervalValueButton.addTapGesture { [weak self] gesture in
+ guard let self else { return }
+ //0.1-0.9s //1-60s
+ let values = Array(stride(from: 0.1, through: 0.9, by: 0.1)) + Array(stride(from: 1.0, through: 60.0, by: 1.0))
+ TriggerProTimePickerView.show(title: R.string.localizable.repeatInterval(),
+ values: values,
+ defaultValue: triggerItem.simpleActionRepeatInterval,
+ unitString: "s",
+ didSelectValue: { value in
+ triggerItem.simpleActionRepeatInterval = value
+ self.simpleActionView.intervalValueButton.titleLabel.text = "\(value)s"
+ })
+ }
+
+ holdActionView.autoStopSwitchButton.setOn(triggerItem.holdActionAutoStop, animated: false)
+ holdActionView.autoStopSwitchButton.onChange { value in
+ triggerItem.holdActionAutoStop = value
+ }
+ holdActionView.durationValueButton.titleLabel.text = "\(triggerItem.holdActionDuration)s"
+ holdActionView.durationValueButton.addTapGesture { [weak self] gesture in
+ guard let self else { return }
+ //0.1-0.9s 1-59s 60-3600s
+ let values = Array(stride(from: 1.0, through: 0.9, by: 0.1)) + Array(stride(from: 1.0, through: 59.0, by: 1.0)) + Array(stride(from: 60.0, through: 3600.0, by: 60.0))
+ TriggerProTimePickerView.show(title: R.string.localizable.holdDuration(),
+ values: values,
+ defaultValue: triggerItem.holdActionDuration,
+ unitString: "s",
+ didSelectValue: { value in
+ triggerItem.holdActionDuration = value
+ self.holdActionView.durationValueButton.titleLabel.text = "\(value)s"
+ })
+ }
+
+ comboActionView.durationPerKeyValueButton.titleLabel.text = "\(triggerItem.comboActionPressDurationPerKey)ms"
+ comboActionView.durationPerKeyValueButton.addTapGesture { [weak self] gesture in
+ guard let self else { return }
+ //16.7ms 50.0-1000ms
+ let values = [16.7] + Array(stride(from: 50.0, through: 1000.0, by: 50.0))
+ TriggerProTimePickerView.show(title: R.string.localizable.pressDurationPerKey(),
+ values: values,
+ defaultValue: triggerItem.comboActionPressDurationPerKey,
+ unitString: "ms",
+ didSelectValue: { value in
+ triggerItem.comboActionPressDurationPerKey = value
+ self.comboActionView.durationPerKeyValueButton.titleLabel.text = "\(value)ms"
+ })
+ }
+ comboActionView.intervalPerKeyValueButton.titleLabel.text = "\(triggerItem.comboActionIntervalPerKey)ms"
+ comboActionView.intervalPerKeyValueButton.addTapGesture { [weak self] gesture in
+ guard let self else { return }
+ //16.7ms 50.0-1000ms
+ let values = [16.7] + Array(stride(from: 50.0, through: 1000.0, by: 50.0))
+ TriggerProTimePickerView.show(title: R.string.localizable.intervalPerKey(),
+ values: values,
+ defaultValue: triggerItem.comboActionIntervalPerKey,
+ unitString: "ms",
+ didSelectValue: { value in
+ triggerItem.comboActionIntervalPerKey = value
+ self.comboActionView.intervalPerKeyValueButton.titleLabel.text = "\(value)ms"
+ })
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerButtonStyleCell.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerButtonStyleCell.swift
new file mode 100644
index 00000000..ed7a8748
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerButtonStyleCell.swift
@@ -0,0 +1,431 @@
+//
+// AddTriggerButtonStyleCell.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/22.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import BetterSegmentedControl
+import IceCream
+
+class AddTriggerButtonStyleCell: UICollectionViewCell {
+
+ class ButtonView: UIView {
+ var style: TriggerItem.Style = .classic {
+ didSet {
+ triggerButton.style = style
+ titleTextField.isUserInteractionEnabled = (style != .custom)
+ }
+ }
+ var buttonSize: CGSize = TriggerItem.Style.classic.defaultSize {
+ didSet {
+ triggerButton.buttonSize = buttonSize
+ triggerButton.snp.updateConstraints { make in
+ make.size.equalTo(buttonSize)
+ }
+ }
+ }
+ //0-1
+ var buttonOpacity: CGFloat = 1 {
+ didSet {
+ triggerButton.buttonOpacity = buttonOpacity
+ }
+ }
+ var buttonRadius: CGFloat = Constants.Size.CornerRadiusMid {
+ didSet {
+ guard style == .custom else { return }
+ triggerButton.buttonCornerRadius = buttonRadius
+ }
+ }
+ var buttonText: String = "M" {
+ didSet {
+ guard style != .custom else { return }
+ triggerButton.title = buttonText
+ }
+ }
+
+ var didButtonTextChange: ((String)->Void)? = nil
+ var didImageChange: ((UIImage?)->Void)? = nil
+
+ private let triggerButton: TriggerButton = {
+ let view = TriggerButton(style: .classic,
+ title: "M",
+ buttonSize: TriggerItem.Style.classic.defaultSize,
+ buttonCornerRadius: 0,
+ buttonOpacity: 1,
+ isEditMode: true)
+ return view
+ }()
+
+ private lazy var uploadImageMenuButton: ContextMenuButton = {
+ //点击选择封面照片
+ var titles = [R.string.localizable.readyEditCoverTakePhoto(),
+ R.string.localizable.readyEditCoverAlbum(),
+ R.string.localizable.readyEditCoverFile()]
+
+ var symbols: [SFSymbol] = [.camera, .photoOnRectangleAngled, .folder]
+ var actions: [UIMenuElement] = []
+ for (index, title) in titles.enumerated() {
+ let action = UIAction(title: title, image: .symbolImage(symbols[index])) { [weak self] _ in
+ guard let self = self else { return }
+ if index == 0 {
+ //拍摄
+ ImageFetcher.capture { [weak self] image in
+ self?.triggerButton.image = image
+ self?.didImageChange?(image)
+ }
+ } else if index == 1 {
+ //相册
+ ImageFetcher.pick { [weak self] image in
+ self?.triggerButton.image = image
+ self?.didImageChange?(image)
+ }
+ } else if index == 2 {
+ //文件
+ ImageFetcher.file { [weak self] image in
+ self?.triggerButton.image = image
+ self?.didImageChange?(image)
+ }
+ }
+ }
+ actions.append(action)
+ }
+ let view = ContextMenuButton(image: nil, menu: UIMenu(children: actions))
+ return view
+ }()
+
+ private lazy var editButton: SymbolButton = {
+ let view = SymbolButton(image: R.image.customPencilLine()?.applySymbolConfig(font: Constants.Font.title(size: .s, weight: .regular)))
+ view.enableRoundCorner = true
+ view.backgroundColor = Constants.Color.BackgroundPrimary
+ view.addTapGesture { [weak self] gesture in
+ guard let self = self else { return }
+ if self.style == .custom {
+ //上传照片
+ self.uploadImageMenuButton.triggerTapGesture()
+ } else {
+ self.titleTextField.becomeFirstResponder()
+ }
+ }
+ return view
+ }()
+
+ private lazy var titleTextField: UITextField = {
+ let textField = UITextField()
+ textField.textAlignment = .center
+ textField.textColor = .clear
+ textField.font = style.getFont(buttonSize: buttonSize)
+ textField.text = "M"
+ textField.clearButtonMode = .never
+ textField.returnKeyType = .done
+ textField.onReturnKeyPress { [weak self, weak textField] in
+ guard let self = self else { return }
+ textField?.resignFirstResponder()
+ }
+ textField.onChange { [weak textField, weak self] text in
+ guard let self else { return }
+ if text.count > 1 {
+ if let markRange = textField?.markedTextRange, let _ = textField?.position(from: markRange.start, offset: 0) { } else {
+ textField?.text = String(text.prefix(1))
+ }
+ }
+ let title = textField?.text?.uppercased() ?? ""
+ self.triggerButton.title = title
+ self.didButtonTextChange?(title)
+ }
+ return textField
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: .zero)
+ backgroundColor = Constants.Color.Background
+ layerCornerRadius = Constants.Size.CornerRadiusMax
+
+ addSubview(triggerButton)
+ triggerButton.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ make.size.equalTo(buttonSize)
+ }
+
+ addSubview(editButton)
+ editButton.snp.makeConstraints { make in
+ make.size.equalTo(Constants.Size.ItemHeightUltraTiny)
+ make.trailing.top.equalToSuperview().inset(Constants.Size.ContentSpaceTiny)
+ }
+
+ insertSubview(uploadImageMenuButton, belowSubview: editButton)
+ uploadImageMenuButton.snp.makeConstraints { make in
+ make.edges.equalTo(editButton)
+ }
+
+ addSubview(titleTextField)
+ titleTextField.snp.makeConstraints { make in
+ make.edges.equalTo(triggerButton).inset(Constants.Size.ContentSpaceTiny)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ }
+
+ class SliderView: UIView {
+ private var titleLabel: UILabel = {
+ let label = UILabel()
+ label.font = Constants.Font.body(size: .l)
+ label.textColor = Constants.Color.LabelPrimary
+ return label
+ }()
+
+ private var detailLabel: UILabel = {
+ let label = UILabel()
+ label.font = Constants.Font.body(size: .s)
+ label.textColor = Constants.Color.LabelSecondary
+ return label
+ }()
+
+ private var sliderView: UISlider = {
+ let view = UISlider()
+ view.minimumTrackTintColor = Constants.Color.Main
+ view.maximumTrackTintColor = Constants.Color.BackgroundSecondary
+ return view
+ }()
+
+ var didValueChange: ((CGFloat)->Void)? = nil
+ var valueSufix: String?
+ var value: Float = 0 {
+ didSet {
+ detailLabel.text = "\(value)" + (valueSufix ?? "")
+ sliderView.value = value
+ }
+ }
+
+ init(title: String, valueSufix: String?, minimumValue: Float, maximumValue: Float, numberOfDecimalPlaces: Int = 0) {
+ self.valueSufix = valueSufix
+ super.init(frame: .zero)
+
+ addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.leading.top.equalToSuperview()
+ }
+
+ addSubview(detailLabel)
+ detailLabel.snp.makeConstraints { make in
+ make.leading.equalTo(titleLabel.snp.trailing).offset(Constants.Size.ContentSpaceUltraTiny)
+ make.bottom.equalTo(titleLabel)
+ }
+
+ addSubview(sliderView)
+ sliderView.snp.makeConstraints { make in
+ make.top.equalTo(titleLabel.snp.bottom).offset(Constants.Size.ContentSpaceUltraTiny)
+ make.leading.trailing.equalToSuperview()
+ make.height.equalTo(28)
+ }
+
+ titleLabel.text = title
+ detailLabel.text = "\(value)" + (valueSufix ?? "")
+ sliderView.minimumValue = minimumValue
+ sliderView.maximumValue = maximumValue
+
+ sliderView.on(.valueChanged) { [weak self] sender, forEvent in
+ guard let self = self else { return }
+ let value = self.sliderView.value.rounded(numberOfDecimalPlaces: numberOfDecimalPlaces, rule: .toNearestOrEven)
+ self.didValueChange?(CGFloat(value))
+ self.detailLabel.text = "\(value)" + (self.valueSufix ?? "")
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+ }
+
+ private lazy var segmentView: BetterSegmentedControl = {
+ let titles = [
+ R.string.localizable.classic(),
+ R.string.localizable.flat(),
+ R.string.localizable.custom()
+ ]
+ let segments = LabelSegment.segments(withTitles: titles,
+ normalFont: Constants.Font.body(),
+ normalTextColor: Constants.Color.LabelSecondary,
+ selectedTextColor: Constants.Color.LabelPrimary)
+ let options: [BetterSegmentedControl.Option] = [
+ .backgroundColor(Constants.Color.Background),
+ .indicatorViewInset(5),
+ .indicatorViewBackgroundColor(Constants.Color.BackgroundPrimary),
+ .cornerRadius(16)
+ ]
+ let view = BetterSegmentedControl(frame: .zero,
+ segments: segments,
+ options: options)
+ return view
+ }()
+
+ private var triggerButtonView: ButtonView = {
+ let view = ButtonView()
+ return view
+ }()
+
+ private var sizeSliderView: SliderView = {
+ let defaultStyle = TriggerItem.Style.classic
+ let view = SliderView(title: R.string.localizable.size() + ":",
+ valueSufix: nil,
+ minimumValue: defaultStyle.sizeRange.min,
+ maximumValue: defaultStyle.sizeRange.max,
+ numberOfDecimalPlaces: 1)
+ return view
+ }()
+
+ private var opacitySliderView: SliderView = {
+ let defaultStyle = TriggerItem.Style.classic
+ let view = SliderView(title: R.string.localizable.opacity() + ":",
+ valueSufix: "%",
+ minimumValue: 5,
+ maximumValue: 100)
+ return view
+ }()
+
+ private var cornerRadiusSliderView: SliderView = {
+ let view = SliderView(title: R.string.localizable.cornerRadius() + ":",
+ valueSufix: "%",
+ minimumValue: 0,
+ maximumValue: 100)
+ view.isHidden = true
+ return view
+ }()
+
+ var needToUpdateCellHeight: (()->Void)? = nil
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ layerCornerRadius = Constants.Size.CornerRadiusMax
+ backgroundColor = Constants.Color.BackgroundPrimary
+
+ addSubview(segmentView)
+ segmentView.snp.makeConstraints { make in
+ make.leading.top.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.height.equalTo(Constants.Size.ItemHeightMid)
+ }
+
+ addSubview(triggerButtonView)
+ triggerButtonView.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.top.equalTo(segmentView.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.height.equalTo(120)
+ }
+
+ addSubview(sizeSliderView)
+ sizeSliderView.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceHuge)
+ make.top.equalTo(triggerButtonView.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.height.equalTo(50)
+ }
+
+ addSubview(opacitySliderView)
+ opacitySliderView.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceHuge)
+ make.top.equalTo(sizeSliderView.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.height.equalTo(50)
+ }
+
+ addSubview(cornerRadiusSliderView)
+ cornerRadiusSliderView.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceHuge)
+ make.top.equalTo(opacitySliderView.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.height.equalTo(50)
+ }
+ }
+
+ func setData(item: TriggerItem) {
+ //segmentView
+ segmentView.setIndex(item.style.rawValue)
+ segmentView.on(.valueChanged) { [weak self] sender, forEvent in
+ guard let self = self, let index = (sender as? BetterSegmentedControl)?.index else { return }
+ UIDevice.generateHaptic()
+ if let style = TriggerItem.Style(rawValue: index) {
+ guard item.style != style else { return }
+ item.style = style
+ item.buttonWidth = style.defaultSize.width
+ item.buttonHeight = style.defaultSize.height
+ item.buttonOpacity = 1
+ item.buttonCornerRadiusRatio = 26.7
+ self.triggerButtonView.style = style
+ switch style {
+ case .classic, .flat:
+ cornerRadiusSliderView.isHidden = true
+ case .custom:
+ cornerRadiusSliderView.isHidden = false
+ }
+ self.needToUpdateCellHeight?()
+ }
+ }
+
+ //ButtonView
+ triggerButtonView.style = item.style
+ triggerButtonView.buttonSize = item.buttonSize
+ triggerButtonView.buttonOpacity = item.buttonOpacity
+ if item.style == .custom {
+ triggerButtonView.buttonRadius = item.buttonCornerRadius
+ } else {
+ triggerButtonView.buttonRadius = 0
+ triggerButtonView.buttonText = item.buttonText
+ }
+ triggerButtonView.didButtonTextChange = { title in
+ item.buttonText = title
+ }
+ triggerButtonView.didImageChange = { image in
+ if let image, let imageData = image.jpegData(compressionQuality: 0.7) {
+ if let oldCustomImage = item.customImage {
+ if let _ = oldCustomImage.realm {
+ oldCustomImage.deleteAndClean(realm: Database.realm)
+ } else {
+ try? FileManager.safeRemoveItem(at: oldCustomImage.filePath)
+ }
+ }
+ item.customImage = CreamAsset.create(objectID: "\(PersistedKit.incrementID)", propName: "customImage", data: imageData)
+ }
+ }
+
+ //sizeSliderView
+ sizeSliderView.value = Float(item.buttonWidth)
+ sizeSliderView.didValueChange = { [weak self] size in
+ guard let self else { return }
+ item.buttonWidth = Double(size).rounded(numberOfDecimalPlaces: 1, rule: .toNearestOrEven)
+ item.buttonHeight = item.buttonWidth
+ self.triggerButtonView.buttonSize = .init(CGFloat(size))
+ if item.style == .custom {
+ self.triggerButtonView.buttonRadius = item.buttonCornerRadius
+ }
+ }
+
+ //opacitySliderView
+ opacitySliderView.value = Float(item.buttonOpacity*100)
+ opacitySliderView.didValueChange = { [weak self] opacity in
+ guard let self else { return }
+ let opacity = opacity/100
+ item.buttonOpacity = Double(opacity).rounded(numberOfDecimalPlaces: 1, rule: .toNearestOrEven)
+ self.triggerButtonView.buttonOpacity = opacity
+ }
+
+ //cornerRadiusSliderView
+ if item.style == .custom {
+ cornerRadiusSliderView.isHidden = false
+ cornerRadiusSliderView.value = Float(item.buttonCornerRadiusRatio)
+ cornerRadiusSliderView.didValueChange = { [weak self] cornerRadiusRatio in
+ guard let self else { return }
+ item.buttonCornerRadiusRatio = Double(cornerRadiusRatio).rounded(numberOfDecimalPlaces: 1, rule: .toNearestOrEven)
+ self.triggerButtonView.buttonRadius = item.buttonCornerRadius
+ }
+ } else {
+ cornerRadiusSliderView.isHidden = true
+ cornerRadiusSliderView.didValueChange = nil
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerButtonView.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerButtonView.swift
new file mode 100644
index 00000000..1de34cc3
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerButtonView.swift
@@ -0,0 +1,254 @@
+//
+// AddTriggerButtonView.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/21.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import UIKit
+import RealmSwift
+import ManicEmuCore
+
+class AddTriggerButtonView: BaseView {
+
+ private enum SectionIndex: Int, CaseIterable {
+ case style, mapping, action
+ var title: String {
+ switch self {
+ case .style:
+ R.string.localizable.buttonStyle()
+ case .mapping:
+ R.string.localizable.mapping()
+ case .action:
+ R.string.localizable.action()
+ }
+ }
+ }
+
+ private var topBlurView: UIView = {
+ let view = UIView()
+ view.makeBlur()
+ return view
+ }()
+
+ private lazy var collectionView: UICollectionView = {
+ let view = UICollectionView(frame: .zero, collectionViewLayout: createLayout())
+ view.backgroundColor = .clear
+ view.contentInsetAdjustmentBehavior = .never
+ view.register(cellWithClass: AddTriggerButtonStyleCell.self)
+ view.register(cellWithClass: AddTriggerMappingCell.self)
+ view.register(cellWithClass: AddTriggerActionCell.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BackgroundColorHaderReusableView.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BackgroundColorTitleAndButtonHaderReusableView.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: BackgroundColorTitleAndDetailHaderReusableView.self)
+ view.showsVerticalScrollIndicator = false
+ view.dataSource = self
+ view.delegate = self
+ view.contentInset = UIEdgeInsets(top: Constants.Size.ItemHeightMid, left: 0, bottom: UIDevice.isPad ? (Constants.Size.ContentInsetBottom + Constants.Size.HomeTabBarSize.height + Constants.Size.ContentSpaceMax) : Constants.Size.ContentInsetBottom, right: 0)
+ return view
+ }()
+
+ private lazy var closeButton: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
+ view.enableRoundCorner = true
+ view.addTapGesture { [weak self] gesture in
+ guard let self = self else { return }
+ if self.triggerItem.mappings.count == 0 {
+ UIView.makeAlert(title: R.string.localizable.fatalErrorTitle(),
+ detail: R.string.localizable.noMappingAlert(),
+ confirmTitle: R.string.localizable.multiDiscContinueClose(),
+ confirmAction: {
+ self.didTapClose?()
+ })
+ return
+ }
+ self.didTapClose?()
+ }
+ return view
+ }()
+
+ ///点击关闭按钮回调
+ var didTapClose: (()->Void)? = nil
+
+ private var triggerItem: TriggerItem
+ private let gameType: GameType
+ private let inputs: [String]
+
+ deinit {
+ Log.debug("\(String(describing: Self.self)) deinit")
+ }
+
+ init(triggerItem: TriggerItem, gameType: GameType, inputs: [String]) {
+ self.triggerItem = triggerItem
+ self.gameType = gameType
+ self.inputs = inputs
+ super.init(frame: .zero)
+ Log.debug("\(String(describing: Self.self)) init")
+ backgroundColor = Constants.Color.Background
+
+ addSubview(collectionView)
+ collectionView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+
+ addSubview(topBlurView)
+ topBlurView.snp.makeConstraints { make in
+ make.leading.top.trailing.equalToSuperview()
+ make.height.equalTo(Constants.Size.ItemHeightMid)
+ }
+
+ let icon = UIImageView(image: R.image.customXmarkTriangleCircleSquare()?.applySymbolConfig(color: Constants.Color.LabelPrimary))
+ topBlurView.addSubview(icon)
+ icon.snp.makeConstraints { make in
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
+ make.size.equalTo(Constants.Size.IconSizeMin)
+ make.centerY.equalToSuperview()
+ }
+ let headerTitleLabel = UILabel()
+ headerTitleLabel.text = "TriggerPro"
+ headerTitleLabel.textColor = Constants.Color.LabelPrimary
+ headerTitleLabel.font = Constants.Font.title(size: .s)
+ topBlurView.addSubview(headerTitleLabel)
+ headerTitleLabel.snp.makeConstraints { make in
+ make.leading.equalTo(icon.snp.trailing).offset(Constants.Size.ContentSpaceUltraTiny)
+ make.centerY.equalTo(icon)
+ }
+
+ if UIDevice.isPhone {
+ topBlurView.addSubview(closeButton)
+ closeButton.snp.makeConstraints { make in
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMax)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.ItemHeightUltraTiny)
+ }
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ private func createLayout() -> UICollectionViewLayout {
+ let layout = UICollectionViewCompositionalLayout { [weak self] sectionIndex, env in
+ guard let self else { return nil }
+ //item布局
+ let item = NSCollectionLayoutItem(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1),
+ heightDimension: .fractionalHeight(1)))
+
+ var itemHeight: CGFloat = 0
+ if sectionIndex == SectionIndex.style.rawValue {
+ itemHeight = self.triggerItem.style.cellHeight
+ } else if sectionIndex == SectionIndex.mapping.rawValue {
+ itemHeight = 72
+ } else if sectionIndex == SectionIndex.action.rawValue {
+ itemHeight = 222
+ }
+
+ //group布局
+ let group = NSCollectionLayoutGroup.horizontal(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .absolute(itemHeight)), subitems: [item])
+ group.contentInsets = NSDirectionalEdgeInsets(top: 0,
+ leading: Constants.Size.ContentSpaceMid,
+ bottom: 0,
+ trailing: Constants.Size.ContentSpaceMid)
+
+ //section布局
+ let section = NSCollectionLayoutSection(group: group)
+ section.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 0, bottom: Constants.Size.ContentSpaceMin, trailing: 0)
+
+ //header布局
+ let headerItem = NSCollectionLayoutBoundarySupplementaryItem(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1),
+ heightDimension: .absolute(sectionIndex == SectionIndex.action.rawValue ? 72 : 44)),
+ elementKind: UICollectionView.elementKindSectionHeader,
+ alignment: .top)
+ headerItem.pinToVisibleBounds = true
+ section.boundarySupplementaryItems = [headerItem]
+
+ return section
+ }
+ return layout
+ }
+}
+
+extension AddTriggerButtonView: UICollectionViewDataSource {
+ func numberOfSections(in collectionView: UICollectionView) -> Int {
+ return SectionIndex.allCases.count
+ }
+
+ func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+ return 1
+ }
+
+ func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+ let section = SectionIndex(rawValue: indexPath.section)!
+ switch section {
+ case .style:
+ let cell = collectionView.dequeueReusableCell(withClass: AddTriggerButtonStyleCell.self, for: indexPath)
+ cell.needToUpdateCellHeight = { [weak self] in
+ guard let self else { return }
+ self.collectionView.reloadSections(IndexSet([section.rawValue]))
+ }
+ cell.setData(item: triggerItem)
+ return cell
+ case .mapping:
+ let cell = collectionView.dequeueReusableCell(withClass: AddTriggerMappingCell.self, for: indexPath)
+ cell.setDatas(inputs: triggerItem.mappings.map({ $0 }))
+ cell.mappingListView.didDeleteInput = { [weak self] index in
+ guard let self else { return }
+ if self.triggerItem.mappings.count > index {
+ self.triggerItem.mappings.remove(at: index)
+ }
+ }
+ cell.mappingListView.didChangeInputIndex = { [weak self] fromIndex, toIndex in
+ guard let self else { return }
+ if self.triggerItem.mappings.count > fromIndex, self.triggerItem.mappings.count > toIndex {
+ self.triggerItem.mappings.move(from: fromIndex, to: toIndex)
+ }
+ }
+ return cell
+ case .action:
+ let cell = collectionView.dequeueReusableCell(withClass: AddTriggerActionCell.self, for: indexPath)
+ cell.setData(triggerItem: triggerItem)
+ cell.didActionTypeChange = { [weak self] action in
+ guard let self else { return }
+ self.triggerItem.action = action
+ }
+ return cell
+ }
+ }
+
+ func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+ let section = SectionIndex(rawValue: indexPath.section)!
+ switch section {
+ case .style:
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BackgroundColorHaderReusableView.self, for: indexPath)
+ let section = SectionIndex(rawValue: indexPath.section)!
+ header.titleLabel.text = section.title
+ return header
+ case .mapping:
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BackgroundColorTitleAndButtonHaderReusableView.self, for: indexPath)
+ let section = SectionIndex(rawValue: indexPath.section)!
+ header.titleLabel.text = section.title
+ header.didTapButton = { [weak self] in
+ guard let self else { return }
+ TriggerProMappingListView.show(inputs: self.inputs, gameType: self.gameType) { [weak self] input in
+ guard let self else { return }
+ self.triggerItem.mappings.append(input)
+ self.collectionView.reloadSections(IndexSet([section.rawValue]))
+ }
+ }
+ return header
+ case .action:
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: BackgroundColorTitleAndDetailHaderReusableView.self, for: indexPath)
+ let section = SectionIndex(rawValue: indexPath.section)!
+ header.titleLabel.text = section.title
+ header.detailLabel.text = triggerItem.action.desc
+ return header
+ }
+
+ }
+}
+
+extension AddTriggerButtonView: UICollectionViewDelegate {
+
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerMappingCell.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerMappingCell.swift
new file mode 100644
index 00000000..434caa0a
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/AddTriggerMappingCell.swift
@@ -0,0 +1,34 @@
+//
+// AddTriggerMappingCell.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/22.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+class AddTriggerMappingCell: UICollectionViewCell {
+
+ lazy var mappingListView: TriggerProMappingListView = {
+ let view = TriggerProMappingListView(inputs: [], isHorizontalScroll: true, isEditMode: true)
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ layerCornerRadius = Constants.Size.CornerRadiusMax
+ backgroundColor = Constants.Color.BackgroundPrimary
+
+ addSubview(mappingListView)
+ mappingListView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ }
+
+ func setDatas(inputs: [String]) {
+ mappingListView.inputs = [inputs]
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerButton.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerButton.swift
new file mode 100644
index 00000000..a754b52c
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerButton.swift
@@ -0,0 +1,180 @@
+//
+// TriggerButton.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/22.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+class TriggerButton: UIView {
+ // MARK: - Properties
+ var style: TriggerItem.Style = .classic {
+ didSet {
+ reload()
+ }
+ }
+ var image: UIImage? {
+ didSet {
+ if style == .custom {
+ reload()
+ }
+ }
+ }
+ var title: String? {
+ didSet {
+ if style != .custom {
+ reload()
+ }
+ }
+ }
+ var buttonSize: CGSize {
+ didSet {
+ frame.size = buttonSize
+ reload()
+ }
+ }
+ var buttonCornerRadius: CGFloat {
+ didSet {
+ if style == .custom {
+ reload()
+ }
+ }
+ }
+ var buttonOpacity: CGFloat {
+ didSet {
+ reload()
+ }
+ }
+
+ // MARK: - UI Components
+ private let backgroundImageView: UIImageView = {
+ let imageView = UIImageView()
+ return imageView
+ }()
+
+ private let shadowLabel: ShadowLabel = {
+ let label = ShadowLabel()
+ label.innerShadowBlur = 2.5
+ label.innerShadowColor = .black.withAlphaComponent(0.3)
+ label.innerShadowOffset = .init(width: 0, height: 1.25*UIScreen.main.scale)
+ label.shadowBlur = 2.5
+ label.shadowColor = .black.withAlphaComponent(0.3)
+ label.shadowOffset = .init(width: 0, height: 0)
+ label.textAlignment = .center
+ label.textColor = UIColor(hexString: "#cccccc")
+ label.isHidden = true
+ return label
+ }()
+
+ private let normalLabel: UILabel = {
+ let label = UILabel()
+ label.textColor = .white
+ label.textAlignment = .center
+ label.isHidden = true
+ return label
+ }()
+
+ // MARK: - Initialization
+ init(style: TriggerItem.Style, image: UIImage? = nil, title: String?, buttonSize: CGSize, buttonCornerRadius: CGFloat, buttonOpacity: CGFloat, isEditMode: Bool) {
+ self.style = style
+ self.image = image
+ self.title = title
+ self.buttonSize = buttonSize
+ self.buttonCornerRadius = buttonCornerRadius
+ self.buttonOpacity = buttonOpacity
+ super.init(frame: CGRect(origin: .zero, size: buttonSize))
+ setupViews()
+ if isEditMode {
+ enableInteractive = true
+ isUserInteractionEnabled = false
+ }
+ reload()
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ // MARK: - Setup
+ private func setupViews() {
+ addSubview(backgroundImageView)
+ addSubview(normalLabel)
+ normalLabel.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ }
+ addSubview(shadowLabel)
+ shadowLabel.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ }
+
+ backgroundImageView.frame = bounds
+ }
+
+ // MARK: - Layout
+ override func layoutSubviews() {
+ super.layoutSubviews()
+ backgroundImageView.frame = bounds
+ }
+
+ // MARK: - Configuration
+ private func reload() {
+ switch style {
+ case .classic:
+ layerCornerRadius = 0
+ backgroundImageView.image = R.image.triggerPro_classic_button()?.scaled(toWidth: buttonSize.width)
+ backgroundImageView.contentMode = .scaleAspectFit
+ backgroundImageView.backgroundColor = .clear
+
+ shadowLabel.text = title
+ shadowLabel.font = style.getFont(buttonSize: buttonSize)
+ shadowLabel.isHidden = false
+ normalLabel.isHidden = true
+
+ case .flat:
+ layerCornerRadius = 0
+ backgroundImageView.image = R.image.triggerPro_flat_button()?.scaled(toWidth: buttonSize.width)
+ backgroundImageView.contentMode = .scaleAspectFit
+ backgroundImageView.backgroundColor = .clear
+
+ normalLabel.text = title
+ normalLabel.font = style.getFont(buttonSize: buttonSize)
+ shadowLabel.isHidden = true
+ normalLabel.isHidden = false
+
+ case .custom:
+ layerCornerRadius = buttonCornerRadius
+ let defaultImage = R.image.customPhotoBadgePlusFill()!.applySymbolConfig(font: UIFont.systemFont(ofSize: buttonSize.height*0.46, weight: .medium))
+ backgroundImageView.image = image?.scaled(toWidth: buttonSize.width) ?? defaultImage
+ if let _ = image {
+ backgroundImageView.contentMode = .scaleAspectFill
+ backgroundImageView.backgroundColor = .clear
+ } else {
+ backgroundImageView.contentMode = .center
+ backgroundImageView.backgroundColor = Constants.Color.BackgroundPrimary
+ }
+
+ shadowLabel.isHidden = true
+ normalLabel.isHidden = true
+ }
+ alpha = buttonOpacity
+ }
+
+ func pressEffect() {
+ performButtonTransformation(CGAffineTransform(scaleX: 0.9, y: 0.9), isSelected: false)
+ }
+
+ func releaseEffect() {
+ performButtonTransformation(CGAffineTransform(scaleX: 1, y: 1), isSelected: true)
+ }
+
+ private func performButtonTransformation(_ transformation: CGAffineTransform, isSelected: Bool) {
+ let timingParameters = UISpringTimingParameters(dampingRatio: 1.0, initialVelocity: CGVector(dx: 0.2, dy: 0.2))
+ let animator = UIViewPropertyAnimator(duration: 0.65, timingParameters: timingParameters)
+ animator.addAnimations { [weak self] in
+ guard let self = self else { return }
+ self.transform = transformation
+ }
+ animator.isInterruptible = true
+ animator.startAnimation()
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProActionSettingViews.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProActionSettingViews.swift
new file mode 100644
index 00000000..276f0ba8
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProActionSettingViews.swift
@@ -0,0 +1,456 @@
+//
+// TriggerProActionSettingViews.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/22.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import ProHUD
+
+class TriggerActionSimpleView: UIView {
+ private var repeatIconView: UIImageView = {
+ let view = UIImageView()
+ view.backgroundColor = Constants.Color.Main
+ view.contentMode = .center
+ view.layerCornerRadius = 6
+ view.image = UIImage(symbol: .repeat, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ return view
+ }()
+
+ private var repeatTitleLabel: UILabel = {
+ let label = UILabel()
+ label.text = R.string.localizable.repeatTrigger()
+ label.font = Constants.Font.body(size: .l, weight: .semibold)
+ label.textColor = Constants.Color.LabelPrimary
+ return label
+ }()
+
+ var repeatSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
+ return view
+ }()
+
+ private var intervalIconView: UIImageView = {
+ let view = UIImageView()
+ view.backgroundColor = Constants.Color.Main
+ view.contentMode = .center
+ view.layerCornerRadius = 6
+ view.image = R.image.customClockArrowTriangleheadCounterclockwiseRotate90()?.applySymbolConfig(font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ return view
+ }()
+
+ private var intervalTitleLabel: UILabel = {
+ let label = UILabel()
+ label.text = R.string.localizable.repeatInterval()
+ label.font = Constants.Font.body(size: .l, weight: .semibold)
+ label.textColor = Constants.Color.LabelPrimary
+ return label
+ }()
+
+ var intervalValueButton: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .chevronRight,
+ font: Constants.Font.caption(size: .l, weight: .bold),
+ color: Constants.Color.BackgroundSecondary),
+ title: "",
+ titleFont: Constants.Font.caption(size: .l),
+ titleColor: Constants.Color.LabelSecondary,
+ titleAlignment: .left,
+ edgeInsets: .init(inset: Constants.Size.ContentSpaceUltraTiny),
+ titlePosition: .left,
+ imageAndTitlePadding: Constants.Size.ContentSpaceUltraTiny,
+ enableGlass: false)
+ view.backgroundColor = .clear
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ backgroundColor = Constants.Color.Background
+ layerCornerRadius = Constants.Size.CornerRadiusMid
+
+ addSubview(repeatIconView)
+ repeatIconView.snp.makeConstraints { make in
+ make.top.equalToSuperview().inset(18)
+ make.leading.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.size.equalTo(24)
+ }
+
+ addSubview(repeatTitleLabel)
+ repeatTitleLabel.snp.makeConstraints { make in
+ make.centerY.equalTo(repeatIconView)
+ make.leading.equalTo(repeatIconView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ }
+
+ addSubview(repeatSwitchButton)
+ repeatSwitchButton.snp.makeConstraints { make in
+ make.centerY.equalTo(repeatIconView)
+ make.leading.equalTo(repeatTitleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ repeatSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
+ }
+
+ addSubview(intervalIconView)
+ intervalIconView.snp.makeConstraints { make in
+ make.top.equalTo(repeatIconView.snp.bottom).offset(36)
+ make.leading.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.size.equalTo(24)
+ }
+
+ addSubview(intervalTitleLabel)
+ intervalTitleLabel.snp.makeConstraints { make in
+ make.centerY.equalTo(intervalIconView)
+ make.leading.equalTo(intervalIconView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ }
+
+ addSubview(intervalValueButton)
+ intervalValueButton.snp.makeConstraints { make in
+ make.centerY.equalTo(intervalIconView)
+ make.leading.greaterThanOrEqualTo(intervalTitleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
+
+class TriggerActionHoldView: UIView {
+ private var autoStopIconView: UIImageView = {
+ let view = UIImageView()
+ view.backgroundColor = Constants.Color.Main
+ view.contentMode = .center
+ view.layerCornerRadius = 6
+ view.image = UIImage(symbol: .stopCircle, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ return view
+ }()
+
+ private var autoStopTitleLabel: UILabel = {
+ let label = UILabel()
+ label.text = R.string.localizable.autoStop()
+ label.font = Constants.Font.body(size: .l, weight: .semibold)
+ label.textColor = Constants.Color.LabelPrimary
+ return label
+ }()
+
+ var autoStopSwitchButton: DisabledTapSwitch = {
+ let view = DisabledTapSwitch()
+ view.onTintColor = Constants.Color.Main
+ view.tintColor = Constants.Color.BackgroundSecondary
+ return view
+ }()
+
+ private var durationIconView: UIImageView = {
+ let view = UIImageView()
+ view.backgroundColor = Constants.Color.Main
+ view.contentMode = .center
+ view.layerCornerRadius = 6
+ view.image = UIImage(symbol: .timer, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ return view
+ }()
+
+ private var durationTitleLabel: UILabel = {
+ let label = UILabel()
+ label.text = R.string.localizable.holdDuration()
+ label.font = Constants.Font.body(size: .l, weight: .semibold)
+ label.textColor = Constants.Color.LabelPrimary
+ return label
+ }()
+
+ var durationValueButton: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .chevronRight,
+ font: Constants.Font.caption(size: .l, weight: .bold),
+ color: Constants.Color.BackgroundSecondary),
+ title: "",
+ titleFont: Constants.Font.caption(size: .l),
+ titleColor: Constants.Color.LabelSecondary,
+ titleAlignment: .left,
+ edgeInsets: .init(inset: Constants.Size.ContentSpaceUltraTiny),
+ titlePosition: .left,
+ imageAndTitlePadding: Constants.Size.ContentSpaceUltraTiny,
+ enableGlass: false)
+ view.backgroundColor = .clear
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ backgroundColor = Constants.Color.Background
+ layerCornerRadius = Constants.Size.CornerRadiusMid
+
+ addSubview(autoStopIconView)
+ autoStopIconView.snp.makeConstraints { make in
+ make.top.equalToSuperview().inset(18)
+ make.leading.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.size.equalTo(24)
+ }
+
+ addSubview(autoStopTitleLabel)
+ autoStopTitleLabel.snp.makeConstraints { make in
+ make.centerY.equalTo(autoStopIconView)
+ make.leading.equalTo(autoStopIconView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ }
+
+ addSubview(autoStopSwitchButton)
+ autoStopSwitchButton.snp.makeConstraints { make in
+ make.centerY.equalTo(autoStopIconView)
+ make.leading.equalTo(autoStopTitleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ if #available(iOS 26.0, *) {
+ make.size.equalTo(CGSize(width: 63, height: 28))
+ } else {
+ make.size.equalTo(CGSize(width: 51, height: 31))
+ }
+ }
+ if #available(iOS 26.0, *) {} else {
+ autoStopSwitchButton.transform = CGAffineTransformMakeScale(0.9, 0.9)
+ }
+
+ addSubview(durationIconView)
+ durationIconView.snp.makeConstraints { make in
+ make.top.equalTo(autoStopIconView.snp.bottom).offset(36)
+ make.leading.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.size.equalTo(24)
+ }
+
+ addSubview(durationTitleLabel)
+ durationTitleLabel.snp.makeConstraints { make in
+ make.centerY.equalTo(durationIconView)
+ make.leading.equalTo(durationIconView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ }
+
+ addSubview(durationValueButton)
+ durationValueButton.snp.makeConstraints { make in
+ make.centerY.equalTo(durationIconView)
+ make.leading.greaterThanOrEqualTo(durationTitleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
+
+class TriggerActionComboView: UIView {
+ private var durationPerKeyIconView: UIImageView = {
+ let view = UIImageView()
+ view.backgroundColor = Constants.Color.Main
+ view.contentMode = .center
+ view.layerCornerRadius = 6
+ view.image = UIImage(symbol: .timer, font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ return view
+ }()
+
+ private var durationPerKeyTitleLabel: UILabel = {
+ let label = UILabel()
+ label.text = R.string.localizable.pressDurationPerKey()
+ label.font = Constants.Font.body(size: .l, weight: .semibold)
+ label.textColor = Constants.Color.LabelPrimary
+ return label
+ }()
+
+ var durationPerKeyValueButton: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .chevronRight,
+ font: Constants.Font.caption(size: .l, weight: .bold),
+ color: Constants.Color.BackgroundSecondary),
+ title: "",
+ titleFont: Constants.Font.caption(size: .l),
+ titleColor: Constants.Color.LabelSecondary,
+ titleAlignment: .left,
+ edgeInsets: .init(inset: Constants.Size.ContentSpaceUltraTiny),
+ titlePosition: .left,
+ imageAndTitlePadding: Constants.Size.ContentSpaceUltraTiny,
+ enableGlass: false)
+ view.backgroundColor = .clear
+ return view
+ }()
+
+ private var intervalPerKeyIconView: UIImageView = {
+ let view = UIImageView()
+ view.backgroundColor = Constants.Color.Main
+ view.contentMode = .center
+ view.layerCornerRadius = 6
+ view.image = R.image.customClockArrowTriangleheadCounterclockwiseRotate90()?.applySymbolConfig(font: Constants.Font.body(size: .s, weight: .medium), color: Constants.Color.LabelPrimary.forceStyle(.dark))
+ return view
+ }()
+
+ private var intervalPerKeyTitleLabel: UILabel = {
+ let label = UILabel()
+ label.text = R.string.localizable.intervalPerKey()
+ label.font = Constants.Font.body(size: .l, weight: .semibold)
+ label.textColor = Constants.Color.LabelPrimary
+ return label
+ }()
+
+ var intervalPerKeyValueButton: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .chevronRight,
+ font: Constants.Font.caption(size: .l, weight: .bold),
+ color: Constants.Color.BackgroundSecondary),
+ title: "",
+ titleFont: Constants.Font.caption(size: .l),
+ titleColor: Constants.Color.LabelSecondary,
+ titleAlignment: .left,
+ edgeInsets: .init(inset: Constants.Size.ContentSpaceUltraTiny),
+ titlePosition: .left,
+ imageAndTitlePadding: Constants.Size.ContentSpaceUltraTiny,
+ enableGlass: false)
+ view.backgroundColor = .clear
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ backgroundColor = Constants.Color.Background
+ layerCornerRadius = Constants.Size.CornerRadiusMid
+
+ addSubview(durationPerKeyIconView)
+ durationPerKeyIconView.snp.makeConstraints { make in
+ make.top.equalToSuperview().inset(18)
+ make.leading.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.size.equalTo(24)
+ }
+
+ addSubview(durationPerKeyTitleLabel)
+ durationPerKeyTitleLabel.snp.makeConstraints { make in
+ make.centerY.equalTo(durationPerKeyIconView)
+ make.leading.equalTo(durationPerKeyIconView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ }
+
+ addSubview(durationPerKeyValueButton)
+ durationPerKeyValueButton.snp.makeConstraints { make in
+ make.centerY.equalTo(durationPerKeyIconView)
+ make.leading.greaterThanOrEqualTo(durationPerKeyTitleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ }
+
+ addSubview(intervalPerKeyIconView)
+ intervalPerKeyIconView.snp.makeConstraints { make in
+ make.top.equalTo(durationPerKeyIconView.snp.bottom).offset(36)
+ make.leading.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.size.equalTo(24)
+ }
+
+ addSubview(intervalPerKeyTitleLabel)
+ intervalPerKeyTitleLabel.snp.makeConstraints { make in
+ make.centerY.equalTo(intervalPerKeyIconView)
+ make.leading.equalTo(intervalPerKeyIconView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ }
+
+ addSubview(intervalPerKeyValueButton)
+ intervalPerKeyValueButton.snp.makeConstraints { make in
+ make.centerY.equalTo(intervalPerKeyIconView)
+ make.leading.greaterThanOrEqualTo(intervalPerKeyTitleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
+
+
+class TriggerProTimePickerView: UIView {
+ static func show(title: String, values: [Double], defaultValue: Double, unitString: String, didSelectValue: ((Double)->Void)? = nil) {
+ Sheet { sheet in
+ sheet.contentMaskView.alpha = 0
+ sheet.config.windowEdgeInset = 0
+ sheet.onTappedBackground { sheet in
+ sheet.pop()
+ }
+ sheet.config.backgroundViewMask { mask in
+ mask.backgroundColor = .black.withAlphaComponent(0.2)
+ }
+
+ let view = UIView()
+ let grabber = UIImageView(image: R.image.grabber_icon())
+ grabber.isUserInteractionEnabled = true
+ grabber.contentMode = .center
+ view.addPanGesture { [weak view, weak sheet] gesture in
+ guard let view = view, let sheet = sheet else { return }
+ let point = gesture.translation(in: gesture.view)
+ view.transform = .init(translationX: 0, y: point.y <= 0 ? 0 : point.y)
+ if gesture.state == .recognized {
+ let v = gesture.velocity(in: gesture.view)
+ if (view.y > view.height*2/3 && v.y > 0) || v.y > 1200 {
+ sheet.pop()
+ }
+ UIView.animate(withDuration: 0.8, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.5, options: [.allowUserInteraction, .curveEaseOut], animations: {
+ view.transform = .identity
+ })
+ }
+ }
+ view.addSubview(grabber)
+ grabber.snp.makeConstraints { make in
+ make.leading.top.trailing.equalToSuperview()
+ make.height.equalTo(Constants.Size.ContentSpaceTiny*3)
+ }
+
+ let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape) ? .allCorners : [.topLeft, .topRight])
+ containerView.backgroundColor = Constants.Color.Background
+ containerView.makeBlur()
+ view.addSubview(containerView)
+ containerView.snp.makeConstraints { make in
+ make.top.equalTo(grabber.snp.bottom)
+ make.leading.bottom.trailing.equalToSuperview()
+ }
+
+ let titleLabel = UILabel()
+ titleLabel.text = title
+ titleLabel.font = Constants.Font.title(size: .s, weight: .semibold)
+ titleLabel.textColor = Constants.Color.LabelPrimary
+ containerView.addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
+ make.top.equalToSuperview().offset(Constants.Size.ContentSpaceMid)
+ }
+
+ let closeButton = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ closeButton.addTapGesture { [weak sheet] gesture in
+ sheet?.pop()
+ }
+ closeButton.enableRoundCorner = true
+ containerView.addSubview(closeButton)
+ closeButton.snp.makeConstraints { make in
+ make.leading.equalTo(titleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMid)
+ make.centerY.equalTo(titleLabel)
+ make.size.equalTo(Constants.Size.IconSizeMid)
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMax)
+ }
+
+
+ let selectionView = UIPickerView()
+ selectionView.addComponents([values.map({ "\($0.rounded(numberOfDecimalPlaces: 1, rule: .toNearestOrEven))\(unitString)"})]) { element, component, row in
+ didSelectValue?(values[row])
+ }
+ if let defaultRow = values.firstIndex(of: defaultValue) {
+ DispatchQueue.main.asyncAfter(delay: 0.35, execute: {
+ selectionView.selectRow(defaultRow, inComponent: 0, animated: true)
+ })
+ }
+
+ containerView.addSubview(selectionView)
+ selectionView.snp.makeConstraints { make in
+ make.top.equalTo(titleLabel.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.leading.trailing.equalToSuperview()
+ make.height.equalTo(350)
+ make.bottom.equalToSuperview()
+ }
+
+ sheet.set(customView: view).snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListBlankSlateView.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListBlankSlateView.swift
new file mode 100644
index 00000000..ff132b35
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListBlankSlateView.swift
@@ -0,0 +1,80 @@
+//
+// TriggerProListBlankSlateView.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/23.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+class TriggerProListBlankSlateView: BaseView {
+ deinit {
+ Log.debug("\(String(describing: Self.self)) deinit")
+ }
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ Log.debug("\(String(describing: Self.self)) init")
+ let containerView = UIView()
+ addSubview(containerView)
+ containerView.snp.makeConstraints { make in
+ make.center.equalToSuperview()
+ }
+
+ let iconImageView = UIImageView(image: R.image.empty_icon())
+ iconImageView.contentMode = .center
+ containerView.addSubview(iconImageView)
+ iconImageView.snp.makeConstraints { make in
+ make.top.centerX.equalToSuperview()
+ make.size.equalTo(100)
+ }
+
+ let titleLabel = UILabel()
+ titleLabel.textColor = Constants.Color.LabelPrimary
+ titleLabel.font = Constants.Font.title(size: .s, weight: .semibold)
+ titleLabel.text = R.string.localizable.noContentResult()
+ containerView.addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.centerX.equalToSuperview()
+ make.top.equalTo(iconImageView.snp.bottom).offset(Constants.Size.ContentSpaceHuge)
+ }
+
+ //引导导入游戏
+ let guideContainer = UIView()
+ containerView.addSubview(guideContainer)
+ guideContainer.snp.makeConstraints { make in
+ make.top.equalTo(titleLabel.snp.bottom).offset(Constants.Size.ContentSpaceTiny)
+ make.centerX.equalToSuperview()
+ make.bottom.equalToSuperview()
+ }
+ let guideLabelLeft = UILabel()
+ guideLabelLeft.textColor = Constants.Color.LabelSecondary
+ guideLabelLeft.font = Constants.Font.body(size: .l)
+ guideLabelLeft.text = R.string.localizable.cheatCodeEmptyGuideLeft()
+ guideContainer.addSubview(guideLabelLeft)
+ guideLabelLeft.snp.makeConstraints { make in
+ make.leading.centerY.equalToSuperview()
+ }
+ let guideImageView = SymbolButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)))
+ guideImageView.enableRoundCorner = true
+ guideContainer.addSubview(guideImageView)
+ guideImageView.snp.makeConstraints { make in
+ make.leading.equalTo(guideLabelLeft.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.top.bottom.equalToSuperview()
+ make.size.equalTo(Constants.Size.ItemHeightUltraTiny)
+ }
+ let guideLabelRight = UILabel()
+ guideLabelRight.textColor = Constants.Color.LabelSecondary
+ guideLabelRight.font = Constants.Font.body(size: .l)
+ guideLabelRight.text = R.string.localizable.addTriggerPro()
+ guideContainer.addSubview(guideLabelRight)
+ guideLabelRight.snp.makeConstraints { make in
+ make.leading.equalTo(guideImageView.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.trailing.centerY.equalToSuperview()
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListCell.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListCell.swift
new file mode 100644
index 00000000..5cbd791c
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListCell.swift
@@ -0,0 +1,74 @@
+//
+// TriggerProListCell.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/21.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import SwipeCellKit
+
+class TriggerProListCell: SwipeTableViewCell {
+ private var titleLabel: UILabel = {
+ let view = UILabel()
+ view.font = Constants.Font.body(size: .l)
+ view.textColor = Constants.Color.LabelPrimary
+ return view
+ }()
+
+ var chevronIconView: UIImageView = {
+ let view = UIImageView()
+ view.image = UIImage(symbol: .chevronRight, font: Constants.Font.caption(size: .l, weight: .bold), color: Constants.Color.BackgroundSecondary)
+ if Locale.isRTLLanguage {
+ view.transform = CGAffineTransform(scaleX: -1, y: 1)
+ }
+ return view
+ }()
+
+ private var mainColorChangeNotification: Any? = nil
+
+ deinit {
+ if let mainColorChangeNotification = mainColorChangeNotification {
+ NotificationCenter.default.removeObserver(mainColorChangeNotification)
+ }
+ }
+
+ override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+ super.init(style: style, reuseIdentifier: reuseIdentifier)
+ backgroundColor = .clear
+ selectionStyle = .none
+
+ let containerView = UIView()
+ contentView.addSubview(containerView)
+ containerView.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.top.bottom.equalToSuperview().inset(10)
+ }
+ containerView.layerCornerRadius = Constants.Size.CornerRadiusMid
+ containerView.backgroundColor = Constants.Color.BackgroundPrimary
+
+ containerView.addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.centerY.equalToSuperview()
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMid)
+ }
+
+ containerView.addSubview(chevronIconView)
+ chevronIconView.snp.makeConstraints { make in
+ make.centerY.equalTo(titleLabel)
+ make.leading.greaterThanOrEqualTo(titleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMin)
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMid)
+ make.size.equalTo(CGSize(width: 10, height: 14))
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ func setData(trigger: Trigger?) {
+ guard let trigger else { return }
+ titleLabel.text = trigger.triggerProName
+ }
+
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListView.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListView.swift
new file mode 100644
index 00000000..dbf04658
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProListView.swift
@@ -0,0 +1,365 @@
+//
+// TriggerProListView.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/21.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import SwipeCellKit
+import RealmSwift
+import ManicEmuCore
+import ProHUD
+
+class TriggerProListView: BaseView {
+ /// 充当导航条
+ private var navigationBlurView: UIView = {
+ let view = UIView()
+ view.makeBlur()
+ return view
+ }()
+
+ private lazy var addButton: ContextMenuButton = {
+ let allGameTypes = System.allCases.map { $0.gameType }
+ var actions: [UIMenuElement] = []
+ for gameType in allGameTypes {
+ actions.append(UIAction(title: gameType.localizedShortName) { [weak self] gesture in
+ guard let self = self else { return }
+ if !PurchaseManager.isMember, self.triggers.count >= Constants.Numbers.NonMemberTriggerProCount {
+ topViewController()?.present(PurchaseViewController(), animated: true)
+ return
+ }
+ topViewController()?.present(TriggerProPreviewController(gameType: gameType,
+ preferredSkinID: PlayViewController.currentSkinID,
+ hideControls: PlayViewController.isHideControls), animated: true)
+ })
+ }
+
+ let view = ContextMenuButton(image: UIImage(symbol: .plus, font: Constants.Font.body(size: .m, weight: .bold)), menu: UIMenu(children: actions), enableGlass: true)
+ view.layerCornerRadius = Constants.Size.IconSizeMid.height/2
+ if #available(iOS 26.0, *) {
+ view.backgroundColor = .clear
+ } else {
+ view.backgroundColor = Constants.Color.BackgroundPrimary
+ }
+ return view
+ }()
+
+ private lazy var closeButton: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)), enableGlass: true)
+ view.enableRoundCorner = true
+ view.addTapGesture { [weak self] gesture in
+ guard let self = self else { return }
+ self.didTapClose?()
+ }
+ return view
+ }()
+
+ private lazy var deleteImage = UIImage(symbol: .trash, color: Constants.Color.LabelPrimary.forceStyle(.dark), backgroundColor: Constants.Color.Red, imageSize: .init(Constants.Size.ItemHeightMin)).withRoundedCorners()
+
+ private lazy var copyImage = UIImage(symbol: .docOnDoc, color: Constants.Color.LabelPrimary.forceStyle(.dark), backgroundColor: Constants.Color.Yellow, imageSize: .init(Constants.Size.ItemHeightMin)).withRoundedCorners()
+
+ private lazy var tableView: UITableView = {
+ let view = BlankSlateTableView(frame: .zero, style: .grouped)
+ view.backgroundColor = .clear
+ view.contentInsetAdjustmentBehavior = .never
+ view.delegate = self
+ view.dataSource = self
+ view.separatorStyle = .none
+ view.showsVerticalScrollIndicator = false
+ view.contentInset = UIEdgeInsets(top: Constants.Size.ItemHeightMid, left: 0, bottom: Constants.Size.ContentInsetBottom, right: 0)
+ view.register(cellWithClass: TriggerProListCell.self)
+ view.register(headerFooterViewClassWith: TriggerProHeaderView.self)
+ view.blankSlateView = TriggerProListBlankSlateView()
+ view.sectionHeaderTopPadding = 0
+ view.sectionHeaderHeight = 46;
+ view.sectionFooterHeight = 0;
+ return view
+ }()
+
+ private var triggers: Results<Trigger> = {
+ let realm = Database.realm
+ let triggers = realm.objects(Trigger.self).where { !$0.isDeleted }
+ return triggers
+ }()
+
+ private var datas: [GameType: [Trigger]] = [:]
+
+ var didTapClose: (()->Void)? = nil
+
+ deinit {
+ Log.debug("\(String(describing: Self.self)) deinit")
+ }
+
+ private var triggersUpdateToken: NotificationToken? = nil
+ init(showClose: Bool = true) {
+ super.init(frame: .zero)
+ Log.debug("\(String(describing: Self.self)) init")
+
+ datas = Dictionary(grouping: triggers, by: { $0.gameType })
+
+ triggersUpdateToken = triggers.observe { [weak self] changes in
+ guard let self = self else { return }
+ switch changes {
+ case .update(_, _, _, _):
+ self.datas = Dictionary(grouping: self.triggers, by: { $0.gameType })
+ self.tableView.reloadData()
+ default:
+ break
+ }
+ }
+
+ addSubview(tableView)
+ tableView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+
+ addSubview(navigationBlurView)
+ navigationBlurView.snp.makeConstraints { make in
+ make.leading.top.trailing.equalToSuperview()
+ make.height.equalTo(Constants.Size.ItemHeightMid)
+ }
+
+ navigationBlurView.addSubview(addButton)
+ addButton.snp.makeConstraints { make in
+ make.leading.equalTo(Constants.Size.ContentSpaceMax)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.ItemHeightUltraTiny)
+ }
+
+ let titleLabel = UILabel()
+ titleLabel.font = Constants.Font.title(size: .s)
+ titleLabel.textColor = Constants.Color.LabelPrimary
+ titleLabel.text = "TriggerPro"
+ navigationBlurView.addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.leading.equalTo(addButton.snp.trailing).offset(Constants.Size.ContentSpaceTiny)
+ make.centerY.equalToSuperview()
+ }
+
+ if showClose {
+ navigationBlurView.addSubview(closeButton)
+ closeButton.snp.makeConstraints { make in
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMax)
+ make.centerY.equalToSuperview()
+ make.size.equalTo(Constants.Size.ItemHeightUltraTiny)
+ }
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
+
+extension TriggerProListView: SwipeTableViewCellDelegate {
+ func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath, for orientation: SwipeActionsOrientation) -> [SwipeAction]? {
+ guard let trigger = getTrigger(at: indexPath) else { return nil }
+ UIDevice.generateHaptic()
+ if orientation == .right {
+ let delete = SwipeAction(style: .default, title: nil) { action, indexPath in
+ UIDevice.generateHaptic()
+ action.fulfill(with: .reset)
+ Trigger.change { realm in
+ if Settings.defalut.iCloudSyncEnable {
+ trigger.isDeleted = true
+ trigger.items.forEach({
+ $0.customImage?.deleteAndClean(realm: realm)
+ $0.isDeleted = true
+ })
+ } else {
+ trigger.items.forEach({
+ $0.customImage?.deleteAndClean(realm: realm)
+ })
+ realm.delete(trigger.items)
+ realm.delete(trigger)
+ }
+ }
+ }
+ delete.backgroundColor = .clear
+ delete.image = deleteImage
+ let edit = SwipeAction(style: .default, title: nil) { action, indexPath in
+ let newTrigger = trigger.copyTrigger(newId: true)
+ if let name = newTrigger.name {
+ newTrigger.name = name + "_copy"
+ }
+ Trigger.change { realm in
+ realm.add(newTrigger)
+ }
+ }
+ edit.hidesWhenSelected = true
+ edit.backgroundColor = .clear
+ edit.image = copyImage
+ return [delete, edit]
+ } else {
+ return nil
+ }
+ }
+
+ func tableView(_ tableView: UITableView, editActionsOptionsForRowAt indexPath: IndexPath, for orientation: SwipeActionsOrientation) -> SwipeOptions {
+ var options = SwipeOptions()
+ options.expansionStyle = SwipeExpansionStyle(target: .percentage(0.6),
+ elasticOverscroll: true,
+ completionAnimation: .fill(.manual(timing: .with)))
+ options.expansionDelegate = self
+ options.transitionStyle = .border
+ options.backgroundColor = Constants.Color.Background
+ options.maximumButtonWidth = Constants.Size.ItemHeightMin + Constants.Size.ContentSpaceTiny*2
+ return options
+ }
+}
+
+extension TriggerProListView: SwipeExpanding {
+ func animationTimingParameters(buttons: [UIButton], expanding: Bool) -> SwipeCellKit.SwipeExpansionAnimationTimingParameters {
+ ScaleAndAlphaExpansion.default.animationTimingParameters(buttons: buttons, expanding: expanding)
+ }
+
+ func actionButton(_ button: UIButton, didChange expanding: Bool, otherActionButtons: [UIButton]) {
+ ScaleAndAlphaExpansion.default.actionButton(button, didChange: expanding, otherActionButtons: otherActionButtons)
+ if expanding {
+ UIDevice.generateHaptic()
+ }
+ }
+}
+
+extension TriggerProListView: UITableViewDataSource, UITableViewDelegate {
+ private func sortDatasKeys() -> [GameType] {
+ var predefinedOrder: [GameType]
+ if let customPlatformOrder = Constants.Config.PlatformOrder {
+ predefinedOrder = customPlatformOrder.compactMap { GameType(shortName: $0) }
+ } else {
+ predefinedOrder = System.allCases.map { $0.gameType }
+ }
+ let sortedKeys: [GameType] = predefinedOrder.filter { datas.keys.contains($0) }
+ return sortedKeys
+ }
+
+ private func getTriggers(at section: Int) -> [Trigger] {
+ let gameTypes = sortDatasKeys()
+ let gameType = gameTypes[section]
+ if let results = datas[gameType] {
+ return results
+ }
+ return []
+ }
+
+ private func getTrigger(at indexPath: IndexPath) -> Trigger? {
+ let triggers = getTriggers(at: indexPath.section)
+ if triggers.count > indexPath.row {
+ return triggers[indexPath.row]
+ }
+ return nil
+ }
+
+ func numberOfSections(in tableView: UITableView) -> Int {
+ sortDatasKeys().count
+ }
+
+ func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+ getTriggers(at: section).count
+ }
+
+ func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+ let cell = tableView.dequeueReusableCell(withClass: TriggerProListCell.self)
+ cell.setData(trigger: getTrigger(at: indexPath))
+ cell.delegate = self
+ return cell
+ }
+
+ func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+ return 70
+ }
+
+ func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+ guard let trigger = getTrigger(at: indexPath) else { return }
+ topViewController()?.present(TriggerProPreviewController(gameType: trigger.gameType,
+ trigger: trigger,
+ preferredSkinID: PlayViewController.currentSkinID,
+ hideControls: PlayViewController.isHideControls), animated: true)
+ }
+
+ func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+ let header = tableView.dequeueReusableHeaderFooterView(withClass: TriggerProHeaderView.self)
+ header.titleLabel.attributedText = NSAttributedString(string: sortDatasKeys()[section].localizedName, attributes: [.foregroundColor: Constants.Color.LabelSecondary, .font: Constants.Font.body(size: .s)])
+ return header
+ }
+}
+
+class TriggerProHeaderView: UITableViewHeaderFooterView {
+ let titleLabel: UILabel = {
+ let titleLabel = UILabel()
+ return titleLabel
+ }()
+
+ override init(reuseIdentifier: String?) {
+ super.init(reuseIdentifier: reuseIdentifier)
+ addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.SafeAera.left + Constants.Size.ContentSpaceMid)
+ make.bottom.equalToSuperview().offset(-Constants.Size.ContentSpaceUltraTiny)
+ }
+ }
+
+ override func layoutSubviews() {
+ super.layoutSubviews()
+ titleLabel.snp.updateConstraints { make in
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.SafeAera.left + Constants.Size.ContentSpaceMid)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
+
+extension TriggerProListView {
+ static var isShow: Bool {
+ Sheet.find(identifier: String(describing: TriggerProListView.self)).count > 0 ? true : false
+ }
+
+ static func show(game: Game, gameViewRect: CGRect, menuInsets: UIEdgeInsets? = nil, hideCompletion: (()->Void)? = nil, didTapClose: (()->Void)? = nil) {
+ Sheet.lazyPush(identifier: String(describing: TriggerProListView.self)) { sheet in
+ sheet.configGamePlayingStyle(gameViewRect: gameViewRect, menuInsets: menuInsets, hideCompletion: hideCompletion)
+
+ let view = UIView()
+ let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape || menuInsets != nil) ? .allCorners : [.topLeft, .topRight])
+ containerView.backgroundColor = Constants.Color.Background
+ view.addSubview(containerView)
+ containerView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ if let maxHeight = sheet.config.cardMaxHeight {
+ make.height.equalTo(maxHeight)
+ }
+ }
+ view.addPanGesture { [weak view, weak sheet] gesture in
+ guard let view = view, let sheet = sheet else { return }
+ let point = gesture.translation(in: gesture.view)
+ view.transform = .init(translationX: 0, y: point.y <= 0 ? 0 : point.y)
+ if gesture.state == .recognized {
+ let v = gesture.velocity(in: gesture.view)
+ if (view.y > view.height*2/3 && v.y > 0) || v.y > 1200 {
+ // 达到移除的速度
+ sheet.pop()
+ }
+ UIView.animate(withDuration: 0.8, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.5, options: [.allowUserInteraction, .curveEaseOut], animations: {
+ view.transform = .identity
+ })
+ }
+ }
+
+ let listView = TriggerProListView()
+ listView.didTapClose = { [weak sheet] in
+ sheet?.pop()
+ didTapClose?()
+ }
+ containerView.addSubview(listView)
+ listView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+
+ sheet.set(customView: view).snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProMappingListView.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProMappingListView.swift
new file mode 100644
index 00000000..9a3dad69
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProMappingListView.swift
@@ -0,0 +1,446 @@
+//
+// TriggerProMappingListView.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/22.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+
+import ProHUD
+import ManicEmuCore
+
+class TriggerProMappingListView: UIView {
+ class TriggerProMappingEditCell: UICollectionViewCell {
+ let titleLabel: UILabel = {
+ let view = UILabel()
+ view.textColor = Constants.Color.LabelPrimary
+ view.font = Constants.Font.body(size: .s)
+ return view
+ }()
+
+ lazy var deleteButton: SymbolButton = {
+ let view = SymbolButton(image: UIImage(symbol: .minusCircleFill, font: UIFont.systemFont(ofSize: 20), colors: [Constants.Color.LabelPrimary.forceStyle(.dark), Constants.Color.Red]), enableGlass: true)
+ view.enableRoundCorner = true
+ view.addTapGesture { [weak self] gesture in
+ guard let self else { return }
+ self.didDeleteItem?()
+ }
+ return view
+ }()
+
+ var didDeleteItem: (()->Void)? = nil
+
+
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ backgroundColor = .clear
+
+ let containerView = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMin)
+ containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ addSubview(containerView)
+ containerView.snp.makeConstraints { make in
+ make.leading.equalToSuperview()
+ make.top.bottom.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ make.height.equalTo(40)
+ }
+
+ containerView.addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.centerY.equalToSuperview()
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ }
+
+ addSubview(deleteButton)
+ deleteButton.snp.makeConstraints { make in
+ make.size.equalTo(20)
+ make.trailing.equalTo(containerView).offset(10)
+ make.top.equalTo(containerView).offset(-10)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+ }
+
+ class TriggerProMappingNormalCell: UICollectionViewCell {
+ let titleLabel: UILabel = {
+ let view = UILabel()
+ view.textColor = Constants.Color.LabelPrimary
+ view.font = Constants.Font.body(size: .s)
+ return view
+ }()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+
+ enableInteractive = true
+ delayInteractiveTouchEnd = true
+
+ let containerView = RoundAndBorderView(roundCorner: .allCorners, radius: Constants.Size.CornerRadiusMin)
+ containerView.backgroundColor = Constants.Color.BackgroundPrimary
+ addSubview(containerView)
+ containerView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ make.height.equalTo(40)
+ }
+
+ containerView.addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.centerY.equalToSuperview()
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+ }
+
+ class SeperatorHeader: UICollectionReusableView {
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ let sparkleSeperatorView = SparkleSeperatorView(starSize: 16)
+ addSubview(sparkleSeperatorView)
+ sparkleSeperatorView.snp.makeConstraints { make in
+ make.top.bottom.equalToSuperview()
+ make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceHuge)
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+ }
+
+ private lazy var collectionView: UICollectionView = {
+ let view = UICollectionView(frame: .zero, collectionViewLayout: createLayout())
+ view.backgroundColor = .clear
+ view.contentInsetAdjustmentBehavior = .never
+ view.register(cellWithClass: TriggerProMappingEditCell.self)
+ view.register(cellWithClass: TriggerProMappingNormalCell.self)
+ view.register(supplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withClass: SeperatorHeader.self)
+ view.showsVerticalScrollIndicator = false
+ view.dataSource = self
+ view.delegate = self
+ view.dragInteractionEnabled = isEditMode
+ view.dragDelegate = self
+ view.dropDelegate = self
+ view.alwaysBounceHorizontal = isEditMode ? true : false
+ view.alwaysBounceVertical = isEditMode ? false : true
+ return view
+ }()
+
+ var inputs: [[String]] {
+ didSet {
+ collectionView.reloadData()
+ }
+ }
+ private var isHorizontalScroll: Bool
+ private var isEditMode: Bool
+ var didSelectInput: ((String)->Void)? = nil
+ var didDeleteInput: ((_ index: Int)->Void)? = nil
+ var didChangeInputIndex: ((_ fromIndex: Int, _ toIndex: Int)->Void)? = nil
+
+ deinit {
+ Log.debug("\(String(describing: Self.self)) deinit")
+ }
+
+ init(inputs: [[String]], isHorizontalScroll: Bool = false, isEditMode: Bool = false) {
+ self.inputs = inputs
+ self.isHorizontalScroll = isHorizontalScroll
+ self.isEditMode = isEditMode
+ super.init(frame: .zero)
+ Log.debug("\(String(describing: Self.self)) init")
+
+ addSubview(collectionView)
+ collectionView.snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ private func createLayout() -> UICollectionViewLayout {
+ let layout = UICollectionViewCompositionalLayout { [weak self] sectionIndex, env in
+ guard let self else { return nil }
+ if self.isEditMode {
+ //item布局
+ let item = NSCollectionLayoutItem(layoutSize: NSCollectionLayoutSize(widthDimension: .estimated(56),
+ heightDimension: .estimated(72)))
+
+
+
+ //group布局
+ let group = NSCollectionLayoutGroup.horizontal(layoutSize: NSCollectionLayoutSize(widthDimension: .estimated(56), heightDimension: .estimated(72)), subitems: [item])
+ group.interItemSpacing = NSCollectionLayoutSpacing.fixed(0)
+ group.contentInsets = NSDirectionalEdgeInsets(top: 0,
+ leading: 0,
+ bottom: 0,
+ trailing: 0)
+
+ //section布局
+ let section = NSCollectionLayoutSection(group: group)
+ if self.isHorizontalScroll {
+ section.orthogonalScrollingBehavior = .continuous
+ }
+ section.interGroupSpacing = 0
+
+
+ section.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: Constants.Size.ContentSpaceMid, bottom: 0, trailing: Constants.Size.ContentSpaceMid)
+
+ return section
+ } else {
+ //item布局
+ let item = NSCollectionLayoutItem(layoutSize: NSCollectionLayoutSize(widthDimension: .estimated(40),
+ heightDimension: .estimated(40)))
+
+
+
+ //group布局
+ let group = NSCollectionLayoutGroup.horizontal(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .absolute(40)), subitems: [item])
+ group.interItemSpacing = NSCollectionLayoutSpacing.fixed(Constants.Size.ContentSpaceMin)
+ group.contentInsets = NSDirectionalEdgeInsets(top: 0,
+ leading: Constants.Size.ContentSpaceMid,
+ bottom: 0,
+ trailing: Constants.Size.ContentSpaceMid)
+
+ //section布局
+ let section = NSCollectionLayoutSection(group: group)
+ if self.isHorizontalScroll {
+ section.orthogonalScrollingBehavior = .continuous
+ }
+ section.interGroupSpacing = Constants.Size.ContentSpaceMin
+
+
+ let isLastSection = sectionIndex == (self.inputs.count - 1)
+ section.contentInsets = NSDirectionalEdgeInsets(top: sectionIndex == 0 ? Constants.Size.ContentSpaceMin : Constants.Size.ContentSpaceHuge, leading: 0, bottom: Constants.Size.ContentSpaceHuge + (isLastSection ? Constants.Size.SafeAera.bottom : 0), trailing: 0)
+
+ //header
+ if sectionIndex != 0 {
+ let headerItem = NSCollectionLayoutBoundarySupplementaryItem(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1),
+ heightDimension: .absolute(16)),
+ elementKind: UICollectionView.elementKindSectionHeader,
+ alignment: .top)
+ section.boundarySupplementaryItems = [headerItem]
+ }
+
+ return section
+ }
+ }
+ return layout
+ }
+}
+
+extension TriggerProMappingListView: UICollectionViewDataSource {
+ func numberOfSections(in collectionView: UICollectionView) -> Int {
+ return inputs.count
+ }
+
+ func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+ return inputs[section].count
+ }
+
+ func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+ if isEditMode {
+ let cell = collectionView.dequeueReusableCell(withClass: TriggerProMappingEditCell.self, for: indexPath)
+ cell.titleLabel.text = inputs[indexPath.section][indexPath.row]
+ cell.didDeleteItem = { [weak self, weak cell] in
+ guard let self, let cell else { return }
+ collectionView.performBatchUpdates({
+ if let indexPath = collectionView.indexPath(for: cell) {
+ self.inputs[indexPath.section].remove(at: indexPath.row)
+ self.collectionView.deleteItems(at: [indexPath])
+ self.didDeleteInput?(indexPath.row)
+ }
+ }) { _ in
+
+ }
+ }
+ return cell
+ } else {
+ let cell = collectionView.dequeueReusableCell(withClass: TriggerProMappingNormalCell.self, for: indexPath)
+ cell.titleLabel.text = inputs[indexPath.section][indexPath.row]
+ return cell
+ }
+ }
+
+ func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+ let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withClass: SeperatorHeader.self, for: indexPath)
+ return header
+ }
+}
+
+extension TriggerProMappingListView: UICollectionViewDelegate {
+ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+ if !isEditMode {
+ didSelectInput?(inputs[indexPath.section][indexPath.row])
+ }
+ }
+}
+
+extension TriggerProMappingListView: UICollectionViewDragDelegate, UICollectionViewDropDelegate {
+ func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: any UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
+ let input = inputs[indexPath.section][indexPath.row]
+ let itemProvider = NSItemProvider(object: input as NSString)
+ let dragItem = UIDragItem(itemProvider: itemProvider)
+ dragItem.localObject = input
+ return [dragItem]
+ }
+
+ func collectionView(_ collectionView: UICollectionView, dragPreviewParametersForItemAt indexPath: IndexPath) -> UIDragPreviewParameters? {
+ if let cell = collectionView.cellForItem(at: indexPath) {
+ let parameters = UIDragPreviewParameters()
+ parameters.backgroundColor = .clear
+ parameters.visiblePath = UIBezierPath(roundedRect: cell.bounds, cornerRadius: Constants.Size.CornerRadiusMid)
+ return parameters
+ }
+ return nil
+ }
+
+ func collectionView(_ collectionView: UICollectionView,
+ performDropWith coordinator: UICollectionViewDropCoordinator) {
+ guard let destinationIndexPath = coordinator.destinationIndexPath else { return }
+
+ coordinator.items.forEach { dropItem in
+ guard let sourceIndexPath = dropItem.sourceIndexPath,
+ let input = dropItem.dragItem.localObject as? String else { return }
+
+ collectionView.performBatchUpdates({
+ inputs[sourceIndexPath.section].remove(at: sourceIndexPath.item)
+ inputs[destinationIndexPath.section].insert(input, at: destinationIndexPath.item)
+ collectionView.deleteItems(at: [sourceIndexPath])
+ collectionView.insertItems(at: [destinationIndexPath])
+ didChangeInputIndex?(sourceIndexPath.item, destinationIndexPath.item)
+ }) { _ in
+
+ }
+
+ coordinator.drop(dropItem.dragItem, toItemAt: destinationIndexPath)
+ }
+ }
+
+ func collectionView(_ collectionView: UICollectionView,
+ canHandle session: UIDropSession) -> Bool {
+ return session.localDragSession != nil
+ }
+
+ func collectionView(_ collectionView: UICollectionView,
+ dropSessionDidUpdate session: UIDropSession,
+ withDestinationIndexPath destinationIndexPath: IndexPath?) -> UICollectionViewDropProposal {
+ guard let _ = destinationIndexPath else {
+ return UICollectionViewDropProposal(operation: .forbidden)
+ }
+ return UICollectionViewDropProposal(operation: .move, intent: .insertAtDestinationIndexPath)
+ }
+}
+
+extension TriggerProMappingListView {
+ static func show(inputs:[String], gameType: GameType, didSelectInput: ((String)->Void)? = nil) {
+ Sheet { sheet in
+
+ let mappingOnlyTypes = GameSetting.MappingOnlyType.allCases.compactMap({
+ if $0.enable(for: gameType, defaultCore: 0) {
+ return $0.inputKey
+ } else {
+ return nil
+ }
+ })
+
+ let gameSettingTypes = GameSetting.ItemType.allCases.compactMap({
+ let gameSetting = GameSetting(type: $0)
+ if gameSetting.enable(for: gameType, defaultCore: 0) {
+ return gameSetting.inputKey
+ } else {
+ return nil
+ }
+ })
+
+ let listView = TriggerProMappingListView(inputs: [inputs, gameSettingTypes + mappingOnlyTypes])
+ listView.didSelectInput = { [weak sheet] input in
+ sheet?.pop()
+ didSelectInput?(input)
+ }
+
+ sheet.contentMaskView.alpha = 0
+ sheet.config.windowEdgeInset = 0
+ sheet.onTappedBackground { sheet in
+ sheet.pop()
+ }
+ sheet.config.backgroundViewMask { mask in
+ mask.backgroundColor = .black.withAlphaComponent(0.2)
+ }
+
+ let view = UIView()
+ let grabber = UIImageView(image: R.image.grabber_icon())
+ grabber.isUserInteractionEnabled = true
+ grabber.contentMode = .center
+ view.addPanGesture { [weak view, weak sheet] gesture in
+ guard let view = view, let sheet = sheet else { return }
+ let point = gesture.translation(in: gesture.view)
+ view.transform = .init(translationX: 0, y: point.y <= 0 ? 0 : point.y)
+ if gesture.state == .recognized {
+ let v = gesture.velocity(in: gesture.view)
+ if (view.y > view.height*2/3 && v.y > 0) || v.y > 1200 {
+ sheet.pop()
+ }
+ UIView.animate(withDuration: 0.8, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.5, options: [.allowUserInteraction, .curveEaseOut], animations: {
+ view.transform = .identity
+ })
+ }
+ }
+ view.addSubview(grabber)
+ grabber.snp.makeConstraints { make in
+ make.leading.top.trailing.equalToSuperview()
+ make.height.equalTo(Constants.Size.ContentSpaceTiny*3)
+ }
+
+ let containerView = RoundAndBorderView(roundCorner: (UIDevice.isPad || UIDevice.isLandscape) ? .allCorners : [.topLeft, .topRight])
+ containerView.backgroundColor = Constants.Color.Background
+ containerView.makeBlur()
+ view.addSubview(containerView)
+ containerView.snp.makeConstraints { make in
+ make.top.equalTo(grabber.snp.bottom)
+ make.leading.bottom.trailing.equalToSuperview()
+ }
+
+ let titleLabel = UILabel()
+ titleLabel.text = R.string.localizable.mapping()
+ titleLabel.font = Constants.Font.title(size: .s, weight: .semibold)
+ titleLabel.textColor = Constants.Color.LabelPrimary
+ containerView.addSubview(titleLabel)
+ titleLabel.snp.makeConstraints { make in
+ make.leading.equalToSuperview().offset(Constants.Size.ContentSpaceMax)
+ make.top.equalToSuperview().offset(Constants.Size.ContentSpaceMid)
+ }
+
+ let closeButton = SymbolButton(image: UIImage(symbol: .xmark, font: Constants.Font.body(weight: .bold)))
+ closeButton.addTapGesture { [weak sheet] gesture in
+ sheet?.pop()
+ }
+ closeButton.enableRoundCorner = true
+ containerView.addSubview(closeButton)
+ closeButton.snp.makeConstraints { make in
+ make.leading.equalTo(titleLabel.snp.trailing).offset(Constants.Size.ContentSpaceMid)
+ make.centerY.equalTo(titleLabel)
+ make.size.equalTo(Constants.Size.IconSizeMid)
+ make.trailing.equalToSuperview().offset(-Constants.Size.ContentSpaceMax)
+ }
+
+ containerView.addSubview(listView)
+ listView.snp.makeConstraints { make in
+ make.top.equalTo(titleLabel.snp.bottom).offset(Constants.Size.ContentSpaceMax)
+ make.leading.trailing.equalToSuperview()
+ make.height.equalTo(Constants.Size.WindowHeight/2 - Constants.Size.ItemHeightMid)
+ make.bottom.equalToSuperview()
+ }
+
+ sheet.set(customView: view).snp.makeConstraints { make in
+ make.edges.equalToSuperview()
+ }
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProView.swift b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProView.swift
new file mode 100644
index 00000000..b61eae74
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Business/TriggerPro/Views/TriggerProView.swift
@@ -0,0 +1,675 @@
+//
+// TriggerProView.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/22.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+import ManicEmuCore
+import Haptica
+
+class TriggerProView: UIView {
+ var hapticType: GameSetting.HapticType = .soft {
+ didSet {
+ isHapticEnabled = true
+ switch hapticType {
+ case .off:
+ isHapticEnabled = false
+ case .soft:
+ hapticFeedbackStyle = .soft
+ case .light:
+ hapticFeedbackStyle = .light
+ case .medium:
+ hapticFeedbackStyle = .medium
+ case .heavy:
+ hapticFeedbackStyle = .heavy
+ case .rigid:
+ hapticFeedbackStyle = .rigid
+ }
+ }
+ }
+
+ ///EditMode回调
+ var didTapButton: ((TriggerItem)->Void)? = nil
+
+ ///非EditMode回调
+ var activateHandler: ((Set<SomeInput>) -> Void)?
+ var deactivateHandler: ((Set<SomeInput>) -> Void)?
+
+ private var isHapticEnabled = true
+ private var hapticFeedbackStyle: HapticFeedbackStyle = .soft
+ /// TriggerPro拥有两套触摸系统
+ /// isEditMode = true 将使用UIGestureRecognizer
+ /// isEditMode = false 将使用touchesBegan
+ private var isEditMode: Bool
+ private var trigger: Trigger
+
+ private var touchMappingDic: [UITouch: Set<TriggerButton>] = [:]
+ private var preTouchButtons = Set<TriggerButton>()
+ private var touchButtons: Set<TriggerButton> {
+ return self.touchMappingDic.values.reduce(Set<TriggerButton>(), { $0.union($1) })
+ }
+
+ private var buttonItemMap: [TriggerButton: TriggerItem] = [:]
+
+ private var buttonsWithoutPosition: [TriggerButton] = []
+ private var needsLayoutButtons: Bool = false
+
+ // MARK: - Action State Management
+
+ /// Item 配置数据(值类型,可以安全地在线程间传递)
+ private struct ItemConfig {
+ let mappings: [String]
+ let action: TriggerItem.Action
+ let simpleActionRepeat: Bool
+ let simpleActionRepeatInterval: Double
+ let holdActionAutoStop: Bool
+ let holdActionDuration: Double
+ let comboActionPressDurationPerKey: Double
+ let comboActionIntervalPerKey: Double
+
+ init(item: TriggerItem) {
+ self.mappings = Array(item.mappings)
+ self.action = item.action
+ self.simpleActionRepeat = item.simpleActionRepeat
+ self.simpleActionRepeatInterval = item.simpleActionRepeatInterval
+ self.holdActionAutoStop = item.holdActionAutoStop
+ self.holdActionDuration = item.holdActionDuration
+ self.comboActionPressDurationPerKey = item.comboActionPressDurationPerKey
+ self.comboActionIntervalPerKey = item.comboActionIntervalPerKey
+ }
+ }
+
+ /// 按钮状态管理
+ private class ButtonState {
+ var isHoldActive: Bool = false
+ var pendingHoldToggle: Bool = false
+ var repeatTimer: DispatchSourceTimer?
+ var holdTimer: DispatchSourceTimer?
+ var comboTimer: DispatchSourceTimer?
+ var comboIndex: Int = 0
+ var config: ItemConfig
+
+ init(config: ItemConfig) {
+ self.config = config
+ }
+ }
+
+ private var buttonStates: [TriggerButton: ButtonState] = [:]
+ private var buttonConfigMap: [TriggerButton: ItemConfig] = [:]
+ private let timerQueue = DispatchQueue(label: "com.manicemu.trigger.timer", qos: .userInteractive)
+
+ init(trigger: Trigger, isEditMode: Bool = false) {
+ self.trigger = trigger
+ self.isEditMode = isEditMode
+ super.init(frame: .zero)
+ backgroundColor = .clear
+ DispatchQueue.main.asyncAfter(delay: 0.35) {
+ self.reloadButtons()
+ }
+ if !isEditMode {
+ isMultipleTouchEnabled = true
+ }
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ deinit {
+ cancelAllActions()
+ }
+
+ override func layoutSubviews() {
+ super.layoutSubviews()
+ if needsLayoutButtons {
+ layoutButtonsInCenter(buttonsWithoutPosition)
+ }
+ }
+
+ func reloadButtons() {
+ // 取消所有正在进行的动作
+ cancelAllActions()
+
+ self.subviews.forEach({ $0.removeFromSuperview() })
+ buttonItemMap.removeAll()
+ buttonStates.removeAll()
+ buttonConfigMap.removeAll()
+ buttonsWithoutPosition.removeAll()
+
+ // 第一遍:创建所有按钮,有坐标的直接设置位置
+ for item in trigger.items {
+ var image: UIImage? = nil
+ if let imageFilePath = item.customImage?.filePath {
+ image = UIImage(contentsOfFile: imageFilePath.path)
+ }
+ let button = TriggerButton(style: item.style,
+ image: image,
+ title: item.buttonText,
+ buttonSize: item.buttonSize,
+ buttonCornerRadius: item.buttonCornerRadius,
+ buttonOpacity: item.buttonOpacity,
+ isEditMode: isEditMode)
+ addSubview(button)
+
+ // 建立按钮和 item 的映射关系
+ buttonItemMap[button] = item
+
+ // 提取配置数据(值类型,可以安全地在线程间传递)
+ buttonConfigMap[button] = ItemConfig(item: item)
+
+ // 添加手势识别器
+ setupGestures(for: button)
+ if let position = item.position {
+ if self.frame.contains(position) {
+ button.x = position.x
+ button.y = position.y
+ } else {
+ //超出屏幕外部了
+ buttonsWithoutPosition.append(button)
+ }
+ } else {
+ // 收集没有坐标的按钮,稍后统一布局
+ buttonsWithoutPosition.append(button)
+ }
+ }
+
+ // 第二遍:为没有坐标的按钮进行自动布局
+ if !buttonsWithoutPosition.isEmpty {
+ needsLayoutButtons = true
+ setNeedsLayout()
+ }
+ }
+
+ private func layoutButtonsInCenter(_ buttons: [TriggerButton]) {
+ needsLayoutButtons = false
+ guard !buttons.isEmpty else { return }
+
+ let spacing: CGFloat = Constants.Size.ContentSpaceMin // 按钮之间的间距
+ let padding: CGFloat = Constants.Size.ContentSpaceMax // 边距
+ let maxWidth = bounds.width - padding * 2
+
+ // 使用流式布局计算每个按钮的位置
+ var rows: [[TriggerButton]] = [[]]
+ var currentRowWidth: CGFloat = 0
+
+ for button in buttons {
+ let buttonWidth = button.bounds.width
+
+ if currentRowWidth + buttonWidth <= maxWidth {
+ // 当前行可以放下这个按钮
+ rows[rows.count - 1].append(button)
+ currentRowWidth += buttonWidth + spacing
+ } else {
+ // 需要换行
+ rows.append([button])
+ currentRowWidth = buttonWidth + spacing
+ }
+ }
+
+ // 计算总高度
+ let rowHeight = buttons.first?.bounds.height ?? 0
+ let totalHeight = CGFloat(rows.count) * rowHeight + CGFloat(max(0, rows.count - 1)) * spacing
+
+ // 计算起始Y坐标(居中)
+ var startY = (bounds.height - totalHeight) / 2
+
+ // 为每一行的按钮设置位置
+ for row in rows {
+ // 计算当前行的总宽度
+ let rowWidth = row.reduce(0) { $0 + $1.bounds.width } + CGFloat(max(0, row.count - 1)) * spacing
+
+ // 计算当前行的起始X坐标(居中)
+ var currentX = (bounds.width - rowWidth) / 2
+
+ // 设置当前行每个按钮的位置
+ for button in row {
+ button.x = currentX
+ button.y = startY
+ currentX += button.bounds.width + spacing
+ }
+
+ // 移动到下一行
+ startY += rowHeight + spacing
+ }
+ }
+
+ // MARK: - Gesture Setup
+
+ private func setupGestures(for button: TriggerButton) {
+ if isEditMode {
+ // 编辑模式:添加拖动手势
+ let panGesture = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
+ button.addGestureRecognizer(panGesture)
+
+ //编辑模式:添加点击手势
+ let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTap(_:)))
+ button.addGestureRecognizer(tapGesture)
+ }
+ }
+
+ // MARK: - Gesture Handlers
+ @objc private func handlePan(_ gesture: UIPanGestureRecognizer) {
+ guard let button = gesture.view as? TriggerButton else {
+ return
+ }
+
+ let translation = gesture.translation(in: self)
+
+ switch gesture.state {
+ case .began, .changed:
+ // 计算新位置
+ let newX = button.x + translation.x
+ let newY = button.y + translation.y
+
+ // 限制按钮不超出父视图边界
+ let minX: CGFloat = 0
+ let minY: CGFloat = 0
+ let maxX = bounds.width - button.bounds.width
+ let maxY = bounds.height - button.bounds.height
+
+ button.x = max(minX, min(newX, maxX))
+ button.y = max(minY, min(newY, maxY))
+
+ // 重置 translation
+ gesture.setTranslation(.zero, in: self)
+
+ case .ended, .cancelled:
+ // 拖动结束,更新 TriggerItem 的坐标
+ updateItemPosition(for: button)
+
+ default:
+ break
+ }
+ }
+
+ @objc private func handleTap(_ gesture: UITapGestureRecognizer) {
+ guard let button = gesture.view as? TriggerButton else {
+ return
+ }
+ if let item = buttonItemMap[button] {
+ didTapButton?(item)
+ }
+ }
+
+ private func updateItemPosition(for button: TriggerButton) {
+ guard let item = buttonItemMap[button] else {
+ return
+ }
+
+ // 根据设备类型更新对应的坐标
+ item.position = CGPoint(x: button.x.rounded(numberOfDecimalPlaces: 1, rule: .toNearestOrEven), y: button.y.rounded(numberOfDecimalPlaces: 1, rule: .toNearestOrEven))
+ }
+
+ // MARK: - Hit Test
+
+ override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+ // 遍历所有子视图(按钮),检查点击是否在某个按钮上
+ for subview in subviews.reversed() {
+ let convertedPoint = subview.convert(point, from: self)
+ if subview.bounds.contains(convertedPoint) {
+ if isEditMode {
+ //编辑模式响应具体的按钮
+ return subview
+ } else {
+ //非编辑模式只让父View响应
+ return self
+ }
+ }
+ }
+ // 点击不在任何按钮上,返回 nil 让点击穿透
+ return nil
+ }
+
+ override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+ guard !isEditMode else { return }
+ for touch in touches {
+ touchMappingDic[touch] = []
+ }
+ updateInputs(for: touches)
+ }
+
+ override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
+ guard !isEditMode else { return }
+ updateInputs(for: touches)
+ }
+
+ override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
+ guard !isEditMode else { return }
+ for touch in touches {
+ touchMappingDic[touch] = nil
+ }
+ updateInputs(for: touches)
+ }
+
+ override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
+ guard !isEditMode else { return }
+ touchesEnded(touches, with: event)
+ }
+
+ private func updateInputs(for touches: Set<UITouch>) {
+ for touch in touches where touchMappingDic[touch] != nil {
+ guard touch.view == self else { continue }
+
+ let point = touch.location(in: self)
+
+ var needsActivetedbuttons: [TriggerButton] = []
+
+ for button in buttonItemMap.keys {
+ let convertedPoint = button.convert(point, from: self)
+ if button.bounds.contains(convertedPoint), let _ = buttonItemMap[button] {
+ needsActivetedbuttons.append(button)
+ }
+ }
+ touchMappingDic[touch] = Set(needsActivetedbuttons)
+ }
+
+ let activatedButtons = touchButtons.subtracting(preTouchButtons)
+ let deactivatedButtons = preTouchButtons.subtracting(touchButtons)
+
+ preTouchButtons = touchButtons
+
+ if !activatedButtons.isEmpty {
+ activateButtons(activatedButtons)
+ activatedButtons.forEach({ $0.pressEffect() })
+
+ if isHapticEnabled {
+ UIDevice.generateHaptic(style: hapticFeedbackStyle)
+ }
+ }
+
+ if !deactivatedButtons.isEmpty {
+ deactivateButtons(deactivatedButtons)
+ deactivatedButtons.forEach({ $0.releaseEffect() })
+ }
+ }
+
+ // MARK: - Action Management
+
+ /// 取消所有动作
+ private func cancelAllActions() {
+ for (_, state) in buttonStates {
+ state.repeatTimer?.cancel()
+ state.holdTimer?.cancel()
+ state.comboTimer?.cancel()
+ }
+ buttonStates.removeAll()
+ }
+
+ /// 取消特定按钮的动作
+ private func cancelButtonAction(_ button: TriggerButton) {
+ guard let state = buttonStates[button] else { return }
+
+ state.repeatTimer?.cancel()
+ state.repeatTimer = nil
+
+ state.holdTimer?.cancel()
+ state.holdTimer = nil
+
+ state.comboTimer?.cancel()
+ state.comboTimer = nil
+ }
+
+ private func activateButtons(_ buttons: Set<TriggerButton>) {
+ for button in buttons {
+ guard let config = buttonConfigMap[button] else { continue }
+
+ switch config.action {
+ case .simple:
+ handleSimpleAction(button: button, config: config)
+ case .hold:
+ handleHoldAction(button: button, config: config)
+ case .combo:
+ break
+ }
+ }
+ }
+
+ private func deactivateButtons(_ buttons: Set<TriggerButton>) {
+ for button in buttons {
+ guard let config = buttonConfigMap[button] else { continue }
+
+ switch config.action {
+ case .simple:
+ handleSimpleDeactivate(button: button, config: config)
+ case .hold:
+ handleHoldDeactivate(button: button, config: config)
+ case .combo:
+ handleComboAction(button: button, config: config)
+ break
+ }
+ }
+ }
+
+ // MARK: - Simple Action
+
+ private func handleSimpleAction(button: TriggerButton, config: ItemConfig) {
+ // 立即激活一次
+ let inputs = Set(config.mappings.map {
+ SomeInput(stringValue: $0, intValue: 1, type: .controller(.controllerSkin))
+ })
+ activateHandler?(inputs)
+
+ // 如果需要重复
+ if config.simpleActionRepeat {
+ startRepeatTimer(for: button, config: config)
+ }
+ }
+
+ private func handleSimpleDeactivate(button: TriggerButton, config: ItemConfig) {
+ // 停止重复定时器
+ if config.simpleActionRepeat {
+ cancelButtonAction(button)
+ }
+
+ // 发送 deactivate
+ let inputs = Set(config.mappings.map {
+ SomeInput(stringValue: $0, intValue: 1, type: .controller(.controllerSkin))
+ })
+ deactivateHandler?(inputs)
+ }
+
+ private func startRepeatTimer(for button: TriggerButton, config: ItemConfig) {
+ let state = buttonStates[button] ?? ButtonState(config: config)
+ buttonStates[button] = state
+
+ // 创建高精度定时器,用于重复按键
+ let timer = DispatchSource.makeTimerSource(flags: .strict, queue: timerQueue)
+ let interval = max(0.001, config.simpleActionRepeatInterval) // 最小 1ms
+ timer.schedule(deadline: .now() + interval, repeating: interval, leeway: .microseconds(100))
+
+ // 捕获配置数据(值类型),避免在后台线程访问 Realm 对象
+ let mappings = config.mappings
+
+ timer.setEventHandler { [weak self] in
+ guard let self = self else { return }
+
+ let inputs = Set(mappings.map {
+ SomeInput(stringValue: $0, intValue: 1, type: .controller(.controllerSkin))
+ })
+
+ // 在主线程执行回调 - 每次重复都是一次完整的按键操作
+ DispatchQueue.main.async {
+ // 先 deactivate 上一次的按压
+ self.deactivateHandler?(inputs)
+ }
+
+ // 使用高精度定时器来确保 activate 在 deactivate 后立即触发 60hz刷新率的一帧时间大概是16.7ms 如果小于16.7毫秒则输入会失效 这里取20ms
+ self.timerQueue.asyncAfter(deadline: .now() + .milliseconds(20)) { [weak self] in
+ guard let self = self else { return }
+ DispatchQueue.main.async {
+ self.activateHandler?(inputs)
+ }
+ }
+ }
+
+ state.repeatTimer = timer
+ timer.resume()
+ }
+
+ // MARK: - Hold Action
+
+ private func handleHoldAction(button: TriggerButton, config: ItemConfig) {
+ let state = buttonStates[button] ?? ButtonState(config: config)
+ buttonStates[button] = state
+
+ // 在 activate 时标记待切换,不立即切换状态
+ state.pendingHoldToggle = true
+ }
+
+ private func handleHoldDeactivate(button: TriggerButton, config: ItemConfig) {
+ guard let state = buttonStates[button] else { return }
+
+ // 只有在有待切换标记时才处理(确保是完整的点击)
+ guard state.pendingHoldToggle else { return }
+ state.pendingHoldToggle = false
+
+ if state.isHoldActive {
+ // 当前已经在 hold 状态,点击则停止 hold
+ stopHold(for: button, config: config)
+ } else {
+ // 开始 hold
+ startHold(for: button, config: config)
+ }
+ }
+
+ private func startHold(for button: TriggerButton, config: ItemConfig) {
+ guard let state = buttonStates[button] else { return }
+
+ state.isHoldActive = true
+
+ let inputs = Set(config.mappings.map {
+ SomeInput(stringValue: $0, intValue: 1, type: .controller(.controllerSkin))
+ })
+
+ // 激活 hold
+ DispatchQueue.main.async { [weak self] in
+ UIView.makeToast(message: R.string.localizable.activateHold(inputs.reduce("", { $0 + " " + "[\($1.stringValue)]" })))
+ self?.activateHandler?(inputs)
+ }
+
+ // 如果设置了自动停止
+ if config.holdActionAutoStop {
+ let timer = DispatchSource.makeTimerSource(flags: .strict, queue: timerQueue)
+ let duration = max(0.1, config.holdActionDuration)
+ timer.schedule(deadline: .now() + duration)
+
+ // 捕获配置数据(值类型),避免在后台线程访问 Realm 对象
+ let mappings = config.mappings
+
+ timer.setEventHandler { [weak self] in
+ guard let self = self else { return }
+ self.stopHold(for: button, mappings: mappings)
+ }
+
+ state.holdTimer = timer
+ timer.resume()
+ }
+ }
+
+ private func stopHold(for button: TriggerButton, config: ItemConfig) {
+ stopHold(for: button, mappings: config.mappings)
+ }
+
+ private func stopHold(for button: TriggerButton, mappings: [String]) {
+ guard let state = buttonStates[button] else { return }
+ guard state.isHoldActive else { return }
+
+ state.isHoldActive = false
+ state.holdTimer?.cancel()
+ state.holdTimer = nil
+
+ let inputs = Set(mappings.map {
+ SomeInput(stringValue: $0, intValue: 1, type: .controller(.controllerSkin))
+ })
+
+ // 停用 hold
+ DispatchQueue.main.async { [weak self] in
+ UIView.makeToast(message: R.string.localizable.deactivateHold(inputs.reduce("", { $0 + " " + "[\($1.stringValue)]" })))
+ self?.deactivateHandler?(inputs)
+ }
+ }
+
+ // MARK: - Combo Action
+
+ private func handleComboAction(button: TriggerButton, config: ItemConfig) {
+ // 取消之前的 combo
+ cancelButtonAction(button)
+
+ guard !config.mappings.isEmpty else { return }
+
+ let state = buttonStates[button] ?? ButtonState(config: config)
+ state.comboIndex = 0
+ buttonStates[button] = state
+
+ // 开始执行 combo 序列
+ executeComboSequence(button: button, config: config)
+ }
+
+ private func executeComboSequence(button: TriggerButton, config: ItemConfig) {
+ guard let state = buttonStates[button] else { return }
+
+ let mappings = config.mappings
+ let pressDuration = max(0.001, config.comboActionPressDurationPerKey / 1000.0)
+ let interval = max(0.001, config.comboActionIntervalPerKey / 1000.0)
+
+ // 立即执行第一个 input
+ executeComboInput(mapping: mappings[0], pressDuration: pressDuration)
+
+ // 如果有多个 input,创建定时器按间隔执行后续的 input
+ if mappings.count > 1 {
+ let timer = DispatchSource.makeTimerSource(flags: .strict, queue: timerQueue)
+ // 第一个在 interval 后执行,然后每隔 interval 执行一次
+ timer.schedule(deadline: .now() + interval, repeating: interval, leeway: .microseconds(100))
+
+ var currentIndex = 1
+
+ timer.setEventHandler { [weak self] in
+ guard let self = self else { return }
+ guard self.buttonStates[button] != nil else {
+ timer.cancel()
+ return
+ }
+
+ if currentIndex < mappings.count {
+ self.executeComboInput(mapping: mappings[currentIndex], pressDuration: pressDuration)
+ currentIndex += 1
+ } else {
+ // 所有 input 都已触发,取消定时器
+ timer.cancel()
+
+ // 在最后一个 input deactivate 后清理状态
+ // 最后一个 input 的 deactivate 时间是 pressDuration
+ self.timerQueue.asyncAfter(deadline: .now() + pressDuration) { [weak self] in
+ self?.buttonStates[button] = nil
+ }
+ }
+ }
+
+ state.comboTimer = timer
+ timer.resume()
+ } else {
+ // 只有一个 input,在 deactivate 后清理状态
+ timerQueue.asyncAfter(deadline: .now() + pressDuration) { [weak self] in
+ self?.buttonStates[button] = nil
+ }
+ }
+ }
+
+ /// 执行单个 combo input 的 activate 和 deactivate
+ private func executeComboInput(mapping: String, pressDuration: TimeInterval) {
+ let input = SomeInput(stringValue: mapping, intValue: 1, type: .controller(.controllerSkin))
+
+ // Activate
+ DispatchQueue.main.async { [weak self] in
+ self?.activateHandler?(Set([input]))
+ }
+
+ // 设置定时器在 pressDuration 后 deactivate
+ timerQueue.asyncAfter(deadline: .now() + pressDuration) { [weak self] in
+ DispatchQueue.main.async { [weak self] in
+ self?.deactivateHandler?(Set([input]))
+ }
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Cores/FDS.swift b/ManicEmu/ManicEmu/Sources/Tools/Cores/FDS.swift
new file mode 100644
index 00000000..9f6beffd
--- /dev/null
+++ b/ManicEmu/ManicEmu/Sources/Tools/Cores/FDS.swift
@@ -0,0 +1,173 @@
+//
+// FDS.swift
+// ManicEmu
+//
+// Created by Daiuno on 2025/10/26.
+// Copyright © 2025 Manic EMU. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import ManicEmuCore
+import AVFoundation
+
+extension GameType {
+ static let fds = GameType("public.aoshuang.game.fds")
+}
+
+@objc enum FDSGameInput: Int, Input {
+ case a
+ case b
+ case start
+ case select
+ case up
+ case down
+ case left
+ case right
+
+ case x//Turbo A
+ case y//Turbo B
+ case l1//(FDS) Disk Side Change
+ case r1//(FDS) Eject Disk
+ case l2//(VSSystem) Coin 1
+ case r2//(VSSystem) Coin 2
+ case l3//(Famicom) Microphone
+ case r3
+
+ case flex
+ case menu
+
+ public var type: InputType {
+ return .game(.fds)
+ }
+
+ init?(stringValue: String) {
+ if stringValue == "a" { self = .a }
+ else if stringValue == "b" { self = .b }
+ else if stringValue == "start" { self = .start }
+ else if stringValue == "select" { self = .select }
+ else if stringValue == "menu" { self = .menu }
+ else if stringValue == "up" { self = .up }
+ else if stringValue == "down" { self = .down }
+ else if stringValue == "left" { self = .left }
+ else if stringValue == "right" { self = .right }
+ else if stringValue == "flex" { self = .flex }
+ else if stringValue == "x" { self = .x }
+ else if stringValue == "y" { self = .y }
+ else if stringValue == "l1" { self = .l1 }
+ else if stringValue == "r1" { self = .r1 }
+ else if stringValue == "l2" { self = .l2 }
+ else if stringValue == "r2" { self = .r2 }
+ else if stringValue == "l3" { self = .l3 }
+ else if stringValue == "r3" { self = .r3 }
+ else { return nil }
+ }
+}
+
+struct FDS: ManicEmuCoreProtocol {
+ public static let core = FDS()
+
+ public var name: String { "FDS" }
+ public var identifier: String { "com.aoshuang.FDSCore" }
+
+ public var gameType: GameType { GameType.fds }
+ public var gameInputType: Input.Type { FDSGameInput.self }
+ public var gameSaveExtension: String { "srm" }
+
+ public let audioFormat = AVAudioFormat(commonFormat: .pcmFormatInt16, sampleRate: 44100, channels: 1, interleaved: true)!
+ public let videoFormat = VideoFormat(format: .bitmap(.rgb565), dimensions: CGSize(width: 256, height: 240))
+
+ public var supportCheatFormats: Set<CheatFormat> {
+ let gameGenie6Format = CheatFormat(name: NSLocalizedString("Game Genie (6)", comment: ""), format: "XXXXXX", type: .gameGenie6, allowedCodeCharacters: .letters)
+ let gameGenie8Format = CheatFormat(name: NSLocalizedString("Game Genie (8)", comment: ""), format: "XXXXXXXX", type: .gameGenie8, allowedCodeCharacters: .letters)
+ return [gameGenie6Format, gameGenie8Format]
+ }
+
+ public var emulatorConnector: EmulatorBase { FDSEmulatorBridge.shared }
+
+ private init() {}
+}
+
+
+class FDSEmulatorBridge : NSObject, EmulatorBase {
+ static let shared = FDSEmulatorBridge()
+
+ var gameURL: URL?
+
+ private(set) var frameDuration: TimeInterval = (1.0 / 60.0)
+
+ var audioRenderer: (any ManicEmuCore.AudioRenderProtocol)?
+
+ var videoRenderer: (any ManicEmuCore.VideoRenderProtocol)?
+
+ var saveUpdateHandler: (() -> Void)?
+
+ private var thumbstickPosition: CGPoint = .zero
+
+ func start(withGameURL gameURL: URL) {}
+
+ func stop() {}
+
+ func pause() {}
+
+ func resume() {}
+
+ func runFrame(processVideo: Bool) {}
+
+ func activateInput(_ input: Int, value: Double, playerIndex: Int) {
+ guard playerIndex >= 0 else { return }
+ if let gameInput = FDSGameInput(rawValue: input),
+ let libretroButton = gameInputToCoreInput(gameInput: gameInput) {
+#if DEBUG
+Log.debug("\(String(describing: Self.self))点击了:\(gameInput)")
+#endif
+ LibretroCore.sharedInstance().press(libretroButton, playerIndex: UInt32(playerIndex))
+ }
+ }
+
+ func gameInputToCoreInput(gameInput: FDSGameInput) -> LibretroButton? {
+ if gameInput == .a { return .A }
+ else if gameInput == .b { return .B }
+ else if gameInput == .start { return .start }
+ else if gameInput == .select { return .select }
+ else if gameInput == .up { return .up }
+ else if gameInput == .down { return .down }
+ else if gameInput == .left { return .left }
+ else if gameInput == .right { return .right }
+ else if gameInput == .x { return .X }
+ else if gameInput == .y { return .Y }
+ else if gameInput == .l1 { return .L1 }
+ else if gameInput == .r1 { return .R1 }
+ else if gameInput == .l2 { return .L2 }
+ else if gameInput == .r2 { return .R2 }
+ else if gameInput == .l3 { return .L3 }
+ else if gameInput == .r3 { return .R3 }
+ return nil
+ }
+
+ func deactivateInput(_ input: Int, playerIndex: Int) {
+ if let gameInput = FDSGameInput(rawValue: input),
+ let libretroButton = gameInputToCoreInput(gameInput: gameInput) {
+ LibretroCore.sharedInstance().release(libretroButton, playerIndex: UInt32(playerIndex))
+ }
+ }
+
+ func resetInputs() {}
+
+ func saveSaveState(to url: URL) {}
+
+ func loadSaveState(from url: URL) {}
+
+ func saveGameSave(to url: URL) {}
+
+ func loadGameSave(from url: URL) {}
+
+ func addCheatCode(_ cheatCode: String, type: String) -> Bool {
+ return false
+ }
+
+ func resetCheats() {}
+
+ func updateCheats() {}
+
+}
+
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift
index 7889b3da..34b29669 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift
@@ -50,9 +50,11 @@ extension GameType {
self = .gb
} else if ["ds", "nds"].contains(ext) {
self = .ds
- } else if ["nes", "fc", "fds", "unf", "unif"].contains(ext) {
+ } else if ["nes", "fc", "unf", "unif"].contains(ext) {
self = .nes
- } else if ["smc", "sfc", "fig", "snes"].contains(ext) {
+ } else if ["fds"].contains(ext) {
+ self = .fds
+ }else if ["smc", "sfc", "fig", "snes"].contains(ext) {
self = .snes
} else if ["3ds", "cia", "app", "cci", "cxi", "3dsx"].contains(ext) {
self = ._3ds
@@ -108,8 +110,10 @@ extension GameType {
self = .gbc
} else if shortName.uppercased() == "GB" {
self = .gb
- } else if shortName.uppercased() == "NES" {
+ } else if shortName.uppercased() == "NES" {
self = .nes
+ } else if shortName.uppercased() == "FDS" {
+ self = .fds
} else if shortName.uppercased() == "SNES" {
self = .snes
} else if shortName.uppercased() == "PSP" {
@@ -154,6 +158,7 @@ extension GameType {
switch self
{
case .nes: return "Nintendo"
+ case .fds: return "Famicom Disk System"
case .snes: return "Super Nintendo"
case ._3ds: return "Nintendo 3DS"
case .gbc: return "Game Boy Color"
@@ -181,6 +186,7 @@ extension GameType {
switch self
{
case .nes: return NSLocalizedString("NES", comment: "")
+ case .fds: return NSLocalizedString("FDS", comment: "")
case .snes: return NSLocalizedString("SNES", comment: "")
case ._3ds: return NSLocalizedString("3DS", comment: "")
case .gbc: return NSLocalizedString("GBC", comment: "")
@@ -209,6 +215,7 @@ extension GameType {
switch self
{
case .nes: return 1985
+ case .fds: return 1986
case .snes: return 1990
case ._3ds: return 2011
case .gb: return 1989
@@ -236,6 +243,7 @@ extension GameType {
switch self
{
case .nes: return NES.core
+ case .fds: return FDS.core
case .snes: return SNES.core
case ._3ds: return ThreeDS.core
case .gbc: return GBC.core
@@ -262,8 +270,8 @@ extension GameType {
func reuseGameType() -> GameType {
if self == .mcd || self == ._32x {
return .md
- } else if self == .sg1000 {
- return .ms
+ } else if self == .fds {
+ return .nes
}
return self
}
@@ -290,6 +298,8 @@ extension GameType {
return [.md, .mcd, ._32x]
} else if self == .ms || self == .gg || self == .sg1000 {
return [.ms, .gg, .sg1000]
+ } else if self == .nes || self == .fds {
+ return [.nes, .fds]
}
return [self]
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIViewExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIViewExtensions.swift
index 2e03f68d..6f0978d2 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIViewExtensions.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIViewExtensions.swift
@@ -114,8 +114,13 @@ extension UIView {
toast.config.customTextLabel { label in
label.textColor = Constants.Color.LabelPrimary
label.font = font
+ label.textAlignment = .natural
+ label.lineBreakMode = .byWordWrapping
}
- let textSize = NSAttributedString(string: message, attributes: [.font: font]).size()
+ let paragraphStyle = NSMutableParagraphStyle()
+ paragraphStyle.alignment = .natural
+ paragraphStyle.lineBreakMode = .byWordWrapping
+ let textSize = NSAttributedString(string: message, attributes: [.font: font, .paragraphStyle: paragraphStyle]).size()
let textMaxWidth = textSize.width.ceil
let cornerRadius = (insets.top + textSize.height + insets.bottom)/2
toast.config.cardCornerRadius = cornerRadius > 24 ? Constants.Size.CornerRadiusMax : cornerRadius
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/Database.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/Database.swift
index 52a5c329..d02a31a6 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/Database.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/Database.swift
@@ -299,6 +299,29 @@ struct Database {
}
#endif
}
+
+ //1.7.3之后将nes和fds区分开
+ if systemCoreVersionNumber <= 173 {
+ var needsUpdate: Bool = systemCoreVersionNumber < 173
+ if !needsUpdate {
+ let systemCoreBuildVersion = UserDefaults.standard.integer(forKey: Constants.DefaultKey.SystemCoreBuildVersion)
+ let appBuildVersion = Int(Constants.Config.AppBuildVersion)!
+ if appBuildVersion > systemCoreBuildVersion {
+ needsUpdate = true
+ }
+ }
+
+ if needsUpdate {
+ let nesGames = realm.objects(Game.self).where({ $0.gameType == .nes })
+ for nes in nesGames {
+ if nes.fileExtension.lowercased() == "fds" {
+ try? realm.write({
+ nes.gameType = .fds
+ })
+ }
+ }
+ }
+ }
}
} catch {
Log.error("初始化数据错误 \(error)")
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/OnlineCoverManager.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/OnlineCoverManager.swift
index e3e2f177..9659d7d9 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/OnlineCoverManager.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/OnlineCoverManager.swift
@@ -84,11 +84,9 @@ class OnlineCoverManager {
case .gb:
boxArtUrl = host.appendingPathComponent("Nintendo - Game Boy/Named_Boxarts/")
case .nes:
- if coverMatch.fileExtension.lowercased() == "fds" {
- boxArtUrl = host.appendingPathComponent("Nintendo - Family Computer Disk System/Named_Boxarts/")
- } else {
- boxArtUrl = host.appendingPathComponent("Nintendo - Nintendo Entertainment System/Named_Boxarts/")
- }
+ boxArtUrl = host.appendingPathComponent("Nintendo - Nintendo Entertainment System/Named_Boxarts/")
+ case .fds:
+ boxArtUrl = host.appendingPathComponent("Nintendo - Family Computer Disk System/Named_Boxarts/")
case .snes:
boxArtUrl = host.appendingPathComponent("Nintendo - Super Nintendo Entertainment System/Named_Boxarts/")
case .psp:
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/PlatformSelectionView.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/PlatformSelectionView.swift
index d7027647..6bb44fdf 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/PlatformSelectionView.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/PlatformSelectionView.swift
@@ -206,7 +206,7 @@ class PlatformSelectionView: BaseView {
var backgroundView: UIView = {
let view = UIView()
view.layerCornerRadius = Constants.Size.CornerRadiusMax
- view.backgroundColor = Constants.Color.BackgroundSecondary
+ view.backgroundColor = Constants.Color.BackgroundPrimary
return view
}()
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/SyncManager.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/SyncManager.swift
index bc603c50..4df30204 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/SyncManager.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/SyncManager.swift
@@ -88,7 +88,9 @@ class SyncManager: NSObject {
SyncObject(realmConfiguration: configuration, type: ImportService.self),
SyncObject(realmConfiguration: configuration, type: Settings.self),
SyncObject(realmConfiguration: configuration, type: ControllerMapping.self),
- SyncObject(realmConfiguration: configuration, type: Theme.self)
+ SyncObject(realmConfiguration: configuration, type: Theme.self),
+ SyncObject(realmConfiguration: configuration, type: Trigger.self, uListElementType: TriggerItem.self),
+ SyncObject(realmConfiguration: configuration, type: TriggerItem.self)
])
realmSyncEngine?.setupCompletion = { error in
//同步设定完成之后 尝试将本地所有数据推到云端
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/System.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/System.swift
index 6c3aa802..46909f9c 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/System.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/System.swift
@@ -30,6 +30,7 @@ enum System: CaseIterable
case gbc
case gb
case nes
+ case fds
case snes
static var registeredSystems: [System] {
@@ -38,7 +39,7 @@ enum System: CaseIterable
}
static var allCores: [ManicEmuCoreProtocol] {
- return [NES.core, SNES.core, ThreeDS.core, GBC.core, GBA.core, PSP.core, MD.core, MCD.core, S2X.core, SG1000.core, GG.core, MS.core, SS.core, N64.core, GB.core, VB.core, PM.core, PS1.core, DC.core, DS.core]
+ return [NES.core, SNES.core, ThreeDS.core, GBC.core, GBA.core, PSP.core, MD.core, MCD.core, S2X.core, SG1000.core, GG.core, MS.core, SS.core, N64.core, GB.core, VB.core, PM.core, PS1.core, DC.core, DS.core, FDS.core]
}
}
@@ -67,6 +68,7 @@ extension System {
case .pm: return .pm
case .ps1: return .ps1
case .dc: return .dc
+ case .fds: return .fds
}
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/ThemeManager.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/ThemeManager.swift
index 5d95a9b3..ce057674 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/ThemeManager.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/ThemeManager.swift
@@ -44,14 +44,56 @@ class ThemeManager {
}
updateAppearance()
- updateIcon()
+ updateIcon(isSetup: true)
updateThemeColor()
updateCoverStyle()
updatePlatformOrder()
updateGamelist()
}
- private func updateIcon() {
+ private func updateIcon(isSetup: Bool = false) {
+ //每年的10月31日都尝试展示Halloween图标
+ var showHalloweenIcon = false
+ if isSetup && Date.now.month == 10 && Date.now.day == 31 {
+ //检查上一次自动展示Halloween图标的时间
+ if let halloweenIconShowUpDate = UserDefaults.standard.object(forKey: Constants.DefaultKey.HalloweenIconShowUpDate) as? Date {
+ if halloweenIconShowUpDate.isInToday {
+ //已经展示过了 不再展示
+ } else {
+ //今天还没展示过 展示
+ showHalloweenIcon = true
+ }
+ } else {
+ //从没展示过 展示
+ showHalloweenIcon = true
+ }
+ }
+ if showHalloweenIcon {
+ Log.debug("开始更新图标 今天是万圣节 直接使用万圣节图标")
+ UserDefaults.standard.set(Date.now, forKey: Constants.DefaultKey.HalloweenIconShowUpDate)
+ UserDefaults.standard.synchronize()
+ let theme = Theme.defalut
+ theme.updateExtra(key: ExtraKey.recoverIcon.rawValue, value: theme.icon)
+ Theme.change { realm in
+ theme.icon = "AppIcon_Halloween"
+ }
+ return
+ }
+
+ if Date.now.string(withFormat: "MMdd") != "1031" {
+ //万圣节已经过了 需要恢复图标
+ let theme = Theme.defalut
+ if let icon = theme.getExtraString(key: ExtraKey.recoverIcon.rawValue), !icon.isEmpty {
+ //有待恢复的图标
+ let theme = Theme.defalut
+ theme.updateExtra(key: ExtraKey.recoverIcon.rawValue, value: "")
+ Theme.change { realm in
+ theme.icon = icon
+ }
+ return
+ }
+ }
+
Log.debug("开始更新图标")
let theme = Theme.defalut
Log.debug("主题图标:\(theme.icon)")
diff --git a/ManicSupport/Resources/System.core b/ManicSupport/Resources/System.core
index b46193fb..2521caed 100644
--- a/ManicSupport/Resources/System.core
+++ b/ManicSupport/Resources/System.core
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7dd3b8c7a4ecb710eabec5fd82c4aeaa95ca43f74602a56825fa2f3f905db2ec
-size 66414947
+oid sha256:53d14dbdc58ed4c78f0b679e07a9beda588e6ef6fb4357f5149c50295d08d04e
+size 72892032