Skip to content

Commit 459f5a5

Browse files
committed
Merge branch 'develop'
2 parents bcdab8d + 5f99b33 commit 459f5a5

File tree

26 files changed

+1534
-507
lines changed

26 files changed

+1534
-507
lines changed

IINA+.xcodeproj/project.pbxproj

Lines changed: 109 additions & 15 deletions
Large diffs are not rendered by default.

IINA+.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 141 deletions
This file was deleted.

IINA+/AppDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
5656
Processes.shared.httpServer.start()
5757

5858
showUpdateAlert()
59+
5960
}
6061

6162

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "zsh_example.png",
5+
"idiom" : "universal"
6+
},
7+
{
8+
"appearances" : [
9+
{
10+
"appearance" : "luminosity",
11+
"value" : "dark"
12+
}
13+
],
14+
"filename" : "zsh_example_dark 1.png",
15+
"idiom" : "universal"
16+
}
17+
],
18+
"info" : {
19+
"author" : "xcode",
20+
"version" : 1
21+
}
22+
}
64.2 KB
Loading
66.4 KB
Loading

IINA+/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</dict>
6262
</dict>
6363
<key>NSHumanReadableCopyright</key>
64-
<string>Copyright © 2018-2023 xjbeta. All rights reserved.</string>
64+
<string>Copyright © 2018-2025 xjbeta. All rights reserved.</string>
6565
<key>NSMainStoryboardFile</key>
6666
<string>Main</string>
6767
<key>NSPrincipalClass</key>

IINA+/Localizable.xcstrings

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
{
22
"sourceLanguage" : "en",
33
"strings" : {
4+
"" : {
5+
"shouldTranslate" : false
6+
},
7+
"# %lld" : {
8+
"shouldTranslate" : false
9+
},
10+
"%@ - Index %lld" : {
11+
"extractionState" : "stale",
12+
"localizations" : {
13+
"en" : {
14+
"stringUnit" : {
15+
"state" : "translated",
16+
"value" : "%1$@ - Index %2$lld"
17+
}
18+
}
19+
},
20+
"shouldTranslate" : false
21+
},
22+
"19080" : {
23+
"shouldTranslate" : false
24+
},
425
"Cancel" : {
526
"comment" : "Cancel button title",
627
"localizations" : {
@@ -124,6 +145,19 @@
124145
}
125146
}
126147
}
148+
},
149+
"Example" : {
150+
"localizations" : {
151+
"zh-Hans" : {
152+
"stringUnit" : {
153+
"state" : "translated",
154+
"value" : "示例"
155+
}
156+
}
157+
}
158+
},
159+
"GitHub" : {
160+
127161
},
128162
"LiveSite.All" : {
129163
"comment" : "All",
@@ -185,6 +219,26 @@
185219
}
186220
}
187221
},
222+
"mpv path" : {
223+
"localizations" : {
224+
"zh-Hans" : {
225+
"stringUnit" : {
226+
"state" : "translated",
227+
"value" : "mpv路径"
228+
}
229+
}
230+
}
231+
},
232+
"Open Terminal" : {
233+
"localizations" : {
234+
"zh-Hans" : {
235+
"stringUnit" : {
236+
"state" : "translated",
237+
"value" : "打开终端"
238+
}
239+
}
240+
}
241+
},
188242
"PluginInstaller.tips" : {
189243
"comment" : "plugin install finish",
190244
"localizations" : {
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import SwiftUI
2+
import AppKit
3+
4+
extension Color {
5+
/// Convert SwiftUI Color to NSColor if possible
6+
var nsColor: NSColor {
7+
NSColor(cgColor: cgColor ?? .black) ?? .black
8+
}
9+
}
10+
11+
extension NSColor {
12+
/// Convert NSColor to SwiftUI Color
13+
var color: Color {
14+
Color(self)
15+
}
16+
}
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
//
2+
// AboutPrefsView.swift
3+
// IINA+
4+
//
5+
// Created by xjbeta on 2025/8/10.
6+
// Copyright © 2025 xjbeta. All rights reserved.
7+
//
8+
9+
import SwiftUI
10+
11+
struct AboutPrefsView: View {
12+
13+
private var appName: String {
14+
Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") as? String ??
15+
Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as? String ?? "Unknown"
16+
}
17+
18+
private var version: String {
19+
let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "Unknown"
20+
let build = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String ?? "Unknown"
21+
return "version: \(version) (\(build))"
22+
}
23+
24+
private var copyright: String {
25+
Bundle.main.object(forInfoDictionaryKey: "NSHumanReadableCopyright") as? String ??
26+
"Copyright Unknown."
27+
}
28+
29+
private let githubURL = URL(string: "https://github.com/xjbeta/iina-plus")!
30+
31+
var body: some View {
32+
VStack(alignment: .center) {
33+
Image("WX_Payment")
34+
.resizable()
35+
.frame(width: 250, height: 250)
36+
37+
Spacer(minLength: 12)
38+
39+
HStack(alignment: .center) {
40+
Text(appName)
41+
.font(.title2)
42+
.fontWeight(.medium)
43+
44+
Link(destination: githubURL) {
45+
HStack(spacing: 2) {
46+
Image(systemName: "link")
47+
Text("GitHub")
48+
}
49+
.font(.callout)
50+
.foregroundColor(.blue)
51+
}
52+
}
53+
54+
Text(version)
55+
56+
Text(copyright)
57+
.font(.footnote)
58+
.multilineTextAlignment(.center)
59+
}
60+
.padding(EdgeInsets(top: 28, leading: 35, bottom: 28, trailing: 35))
61+
}
62+
}
63+
64+
#Preview {
65+
AboutPrefsView()
66+
}

0 commit comments

Comments
 (0)