Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions MeoAsstMac.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
45384FB22E7E89560094C5A2 /* InstantTooltip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45384FB12E7E89560094C5A2 /* InstantTooltip.swift */; };
830C3D1C29BC7D8600B13A9F /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 830C3D1B29BC7D8600B13A9F /* Sparkle */; };
830C3D1E29BC7DE200B13A9F /* CheckForUpdatesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 830C3D1D29BC7DE200B13A9F /* CheckForUpdatesView.swift */; };
8315B0BD290E48F300AE7FDC /* StartupSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8315B0BC290E48F300AE7FDC /* StartupSettingsView.swift */; };
Expand Down Expand Up @@ -128,6 +129,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
45384FB12E7E89560094C5A2 /* InstantTooltip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstantTooltip.swift; sourceTree = "<group>"; };
830C3D1D29BC7DE200B13A9F /* CheckForUpdatesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckForUpdatesView.swift; sourceTree = "<group>"; };
830C3D1F29BC86EE00B13A9F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8315B0BC290E48F300AE7FDC /* StartupSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartupSettingsView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -309,6 +311,7 @@
838FF82629FDD0F9000566A0 /* GachaView.swift */,
92F78D4C2A0A7B2E00999BD0 /* TaskTimerView.swift */,
8347B5A72CDF85A000AEB627 /* ResourceUpdateView.swift */,
45384FB12E7E89560094C5A2 /* InstantTooltip.swift */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -564,6 +567,7 @@
8355E7B429E918A2005D5A1C /* TasksContent.swift in Sources */,
832985AA29EE9958009F7ED5 /* RecruitView.swift in Sources */,
83264A3B29EC0F2E0074E33A /* LogView.swift in Sources */,
45384FB22E7E89560094C5A2 /* InstantTooltip.swift in Sources */,
83812ED22D5B0B8100CB39D6 /* Binding+semicolonString.swift in Sources */,
8341195329EC25A900044F45 /* MAALog.swift in Sources */,
83BFABC82AF1D5BA001A79F4 /* AwardSettingsView.swift in Sources */,
Expand Down
9 changes: 9 additions & 0 deletions MeoAsstMac/Navigation/CopilotContent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ struct CopilotContent: View {
Label("移除", systemImage: "trash")
}
.help("移除作业")
.instantTooltip(content: {
Text("移除作业")
})
.disabled(shouldDisableDeletion)
.keyboardShortcut(.delete, modifiers: [.command])
}
Expand All @@ -88,11 +91,17 @@ struct CopilotContent: View {
Label("停止", systemImage: "stop.fill")
}
.help("停止")
.instantTooltip(content: {
Text("停止")
})
case .idle:
Button(action: start) {
Label("开始", systemImage: "play.fill")
}
.help("开始")
.instantTooltip(content: {
Text("开始")
})
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions MeoAsstMac/Navigation/CopilotDetail.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ struct CopilotDetail: View {
Label("添加", systemImage: "plus")
}
.help("添加作业")
.instantTooltip(content: {
Text("添加作业")
})
.popover(isPresented: $showAdd, arrowEdge: .bottom, content: addPopover)
}

Expand All @@ -46,6 +49,9 @@ struct CopilotDetail: View {
.foregroundColor(url == nil ? Color.accentColor : nil)
}
.help("运行日志")
.instantTooltip(content: {
Text("运行日志")
})
}
}

Expand Down
15 changes: 14 additions & 1 deletion MeoAsstMac/Navigation/TaskDetail.swift
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,29 @@ struct TaskDetail: View {
Label("添加", systemImage: "plus")
}
.help("添加任务")
.instantTooltip(content: {
Text("添加任务")
})
}

ToolbarItemGroup {
HStack {
Divider()

ViewDetaiTabButton(mode: .taskConfig, icon: "gearshape", selection: $viewModel.dailyTasksDetailMode)
.instantTooltip(content: {
Text("任务设置")
})
ViewDetaiTabButton(mode: .log, icon: "note.text", selection: $viewModel.dailyTasksDetailMode)
.instantTooltip(content: {
Text("运行日志")
})
ViewDetaiTabButton(
mode: .timerConfig, icon: "clock.arrow.2.circlepath", selection: $viewModel.dailyTasksDetailMode)
mode: .timerConfig, icon: "clock.arrow.2.circlepath", selection: $viewModel.dailyTasksDetailMode
)
.instantTooltip(content: {
Text("设置定时")
})
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions MeoAsstMac/Navigation/TasksContent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ struct TasksContent: View {
Label("删除", systemImage: "trash")
}
.help("删除任务")
.instantTooltip(content: {
Text("删除任务")
})
.disabled(shouldDisableDeletion)
}

Expand All @@ -66,11 +69,17 @@ struct TasksContent: View {
Label("停止", systemImage: "stop.fill")
}
.help("停止")
.instantTooltip(content: {
Text("停止")
})
case .idle:
Button(action: start) {
Label("开始", systemImage: "play.fill")
}
.help("开始")
.instantTooltip(content: {
Text("开始")
})
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions MeoAsstMac/Navigation/UtilityContent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,17 @@ struct UtilityContent: View {
Label("停止", systemImage: "stop.fill")
}
.help("停止")
.instantTooltip(content: {
Text("停止")
})
case .idle:
Button(action: start) {
Label("开始", systemImage: "play.fill")
}
.help("开始")
.instantTooltip(content: {
Text("开始")
})
}
}
}
Expand Down
Loading