sam_oneal/fx_cast
1
0
Fork 0
mirror of https://github.com/hensm/fx_cast.git synced 2026-06-09 09:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing i18n to native macOS receiver selector and refactor

Browse Source
This commit is contained in:
hensm
2019-05-15 13:38:11 +01:00
parent 474dbad1aa
commit e368c4d09c
13 changed files with 155 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/NativeMacReceiverSelector/AppDelegate.swift
View File

@@ -1,14 +1,13 @@
import Cocoa
class AppDelegate: NSObject {
class AppDelegate : NSObject, NSApplicationDelegate {
var mainWindow: NSWindow?
var mainWindowController: NSWindowController?
var mainWindowViewController: ViewController?
}
extension AppDelegate: NSApplicationDelegate {
func applicationDidFinishLaunching(_ aNotification: Notification) {
func applicationDidFinishLaunching (_ aNotification: Notification) {
let window = NSPanel(
contentRect: NSZeroRect
, styleMask: [
@@ -21,7 +20,7 @@ extension AppDelegate: NSApplicationDelegate {
, backing: .buffered
, defer: false)
window.title = "fx_cast"
window.titleVisibility = .hidden
window.orderFrontRegardless()
window.center()
@@ -39,13 +38,12 @@ extension AppDelegate: NSApplicationDelegate {
NSApp.activate(ignoringOtherApps: true)
}
func applicationDidResignActive(_ aNotification: Notification) {
func applicationDidResignActive (_ aNotification: Notification) {
self.mainWindow?.performClose(aNotification)
}
func applicationWillTerminate(_ aNotification: Notification) {}
func applicationShouldTerminateAfterLastWindowClosed(_ app: NSApplication) -> Bool {
func applicationShouldTerminateAfterLastWindowClosed (
_ app: NSApplication) -> Bool {
return true
}
}

72
app/NativeMacReceiverSelector/ReceiverView.swift
View File

@@ -1,17 +1,29 @@
import Cocoa
protocol ReceiverViewDelegate: AnyObject {
protocol ReceiverViewDelegate : AnyObject {
func didCast (_ receiver: Receiver)
}
class ReceiverView: NSStackView {
class ReceiverView : NSStackView {
weak var receiverViewDelegate: ReceiverViewDelegate?
var receiver: Receiver!
var constraintsSet = false
var button: NSButton!
var spinner: NSProgressIndicator!
var castButton: NSButton!
var castingSpinner: NSProgressIndicator!
var isEnabled: Bool {
get {
return self.castButton.isEnabled
}
set {
self.castButton.isEnabled = newValue
}
}
override init (frame: CGRect) {
super.init(frame: frame)
@@ -20,8 +32,8 @@ class ReceiverView: NSStackView {
super.init(coder: coder)
}
init (receiver: Receiver) {
super.init(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
init (receiver: Receiver, initData: InitData) {
super.init(frame: NSZeroRect)
self.receiver = receiver
@@ -37,21 +49,23 @@ class ReceiverView: NSStackView {
metaStackView.spacing = 4
self.button = WideButton(
title: "Cast"
self.castButton = NSButton(
title: initData.i18n_castButtonTitle
, target: self
, action: #selector(ReceiverView.onCast))
self.button.bezelStyle = .rounded
self.castButton.bezelStyle = .rounded
self.castButton.widthAnchor.constraint(equalToConstant: 100).isActive = true
self.spinner = NSProgressIndicator()
self.spinner.style = .spinning
self.spinner.controlSize = .small
self.spinner.isHidden = true
self.castingSpinner = NSProgressIndicator()
self.castingSpinner.style = .spinning
self.castingSpinner.controlSize = .small
self.castingSpinner.isHidden = true
self.addArrangedSubview(metaStackView)
self.addArrangedSubview(self.spinner)
self.addArrangedSubview(self.button)
self.addArrangedSubview(self.castingSpinner)
self.addArrangedSubview(self.castButton)
self.distribution = .fill
}
@@ -61,34 +75,24 @@ class ReceiverView: NSStackView {
if !constraintsSet {
self.translatesAutoresizingMaskIntoConstraints = false
self.leadingAnchor.constraint(equalTo: superview!.leadingAnchor, constant: 8).isActive = true
self.trailingAnchor.constraint(equalTo: superview!.trailingAnchor, constant: -8).isActive = true
self.leadingAnchor.constraint(
equalTo: superview!.leadingAnchor
, constant: 8).isActive = true
self.trailingAnchor.constraint(
equalTo: superview!.trailingAnchor
, constant: -8).isActive = true
constraintsSet = true
}
}
func disable () {
self.button.isEnabled = false
}
@objc
func onCast () {
self.receiverViewDelegate?.didCast(self.receiver)
self.spinner.isHidden = false
self.spinner.startAnimation(nil)
}
}
class WideButton: NSButton {
override var intrinsicContentSize: NSSize {
var size = super.intrinsicContentSize
if size.width < 100 {
size.width = 100
}
return size
self.castingSpinner.isHidden = false
self.castingSpinner.startAnimation(nil)
}
}

116
app/NativeMacReceiverSelector/ViewController.swift
View File

@@ -1,60 +1,13 @@
import Cocoa
import Foundation
func makeLabel(_ text: String,
size: CGFloat = 0,
color: NSColor = NSColor.textColor) -> NSTextField {
class ViewController : NSViewController {
var initData: InitData!
let textField = NSTextField()
textField.stringValue = text
textField.backgroundColor = .clear
textField.isEditable = false
textField.isBezeled = false
textField.sizeToFit()
// Text
textField.font = NSFont.systemFont(ofSize: size)
textField.textColor = color
return textField
}
struct InitData: Codable {
let receivers: [Receiver]
let defaultMediaType: MediaType
let i18n_mediaTypeApp: String
let i18n_mediaTypeTab: String
let i18n_mediaTypeScreen: String
let i18n_mediaSelectCastLabel: String
let i18n_mediaSelectToLabel: String
}
struct ReceiverSelection: Codable {
let receiver: Receiver
let mediaType: MediaType
}
enum MediaType: Int, Codable {
case app
case tab
case screen
}
struct Receiver: Codable {
let friendlyName: String
let host: String
let id: String
let port: Int
}
class ViewController: NSViewController {
var mediaTypePopUpButton: NSPopUpButton!
var receiverViews = [ReceiverView]()
override func loadView () {
let visualEffectView = NSVisualEffectView()
visualEffectView.blendingMode = .behindWindow
@@ -76,17 +29,35 @@ class ViewController: NSViewController {
exit(1)
}
let initData: InitData!
do {
initData = try JSONDecoder().decode(InitData.self, from: data)
// Decode and store initialization JSON data
self.initData = try JSONDecoder().decode(InitData.self, from: data)
} catch {
fputs("Error: Failed to parse input data\n", stderr)
exit(1)
}
/**
* View Hierarchy
* --------------
*
* stackView \ (NSStackView)
* ├ mediaTypeStackView \ (NSStackView)
* │ ├ mediaSelectCastLabel \ (NSTextField)
* │ ├ mediaTypePopUpButton \ (NSPopUpButton)
* │ └ mediaSelectToLabel \ (NSTextField)
* │
* ├ receiverSeparator \ (NSBox) ┐
* └ receiverView \ (ReceiverView:NSStackView) │
* ├ metaStackView \ (NSStackView) │
* │ ├ receiver name \ (NSTextField) ├ Repeats
* │ └ receiver host \ (NSTextField) │
* ├ spinner \ (NSProgressIndicator) │
* └ button \ (NSButton) ┘
*/
let stackView = NSStackView()
stackView.orientation = .vertical
stackView.alignment = .leading
@@ -101,7 +72,9 @@ class ViewController: NSViewController {
, initData.i18n_mediaTypeScreen
])
self.mediaTypePopUpButton.selectItem(at: initData.defaultMediaType.rawValue)
self.mediaTypePopUpButton.selectItem(
at: initData.defaultMediaType.rawValue)
let mediaTypeStackView = NSStackView(views: [
makeLabel(initData.i18n_mediaSelectCastLabel),
@@ -109,17 +82,29 @@ class ViewController: NSViewController {
makeLabel(initData.i18n_mediaSelectToLabel)
])
stackView.addArrangedSubview(mediaTypeStackView)
/**
* For each receiver in the initData list, create a new
* ReceiverView, set self as a ReceiverViewDelegate and
* appends to main stack view.
*
* Keeps a reference to the receiver view to call disable()
* later.
*/
for receiver in initData.receivers {
// Create separator between last receiver / media type
let receiverSeparator = NSBox()
receiverSeparator.boxType = .separator
let receiverView = ReceiverView(receiver: receiver)
let receiverView = ReceiverView(
receiver: receiver
, initData: self.initData)
receiverView.receiverViewDelegate = self
self.receiverViews.append(receiverView)
stackView.addArrangedSubview(receiverSeparator)
@@ -127,17 +112,30 @@ class ViewController: NSViewController {
}
// Add to main view and set width to resize window
self.view.addSubview(stackView)
self.view.autoresizesSubviews = true
self.view.frame.size.width = 350
}
override func viewDidAppear () {
// Set window title and update visibility
let window = self.view.window!
window.title = initData.i18n_extensionName
window.titleVisibility = .visible
}
}
extension ViewController: ReceiverViewDelegate {
extension ViewController : ReceiverViewDelegate {
func didCast (_ receiver: Receiver) {
// Disable media type UI
self.mediaTypePopUpButton.isEnabled = false
// Disable cast buttons
for receiverView in self.receiverViews {
receiverView.disable()
receiverView.isEnabled = false
}
do {

BIN
app/NativeMacReceiverSelector/main Executable file
View File

Binary file not shown.

12
app/NativeMacReceiverSelector/models/InitData.swift Normal file
View File

@@ -0,0 +1,12 @@
struct InitData : Codable {
let receivers: [Receiver]
let defaultMediaType: MediaType
let i18n_extensionName: String
let i18n_castButtonTitle: String
let i18n_mediaTypeApp: String
let i18n_mediaTypeTab: String
let i18n_mediaTypeScreen: String
let i18n_mediaSelectCastLabel: String
let i18n_mediaSelectToLabel: String
}

3
app/NativeMacReceiverSelector/models/MediaType.swift Normal file
View File

@@ -0,0 +1,3 @@
enum MediaType : Int, Codable {
case app, tab, screen
}

6
app/NativeMacReceiverSelector/models/Receiver.swift Normal file
View File

@@ -0,0 +1,6 @@
struct Receiver : Codable {
let friendlyName: String
let host: String
let id: String
let port: Int
}

4
app/NativeMacReceiverSelector/models/ReceiverSelection.swift Normal file
View File

@@ -0,0 +1,4 @@
struct ReceiverSelection : Codable {
let receiver: Receiver
let mediaType: MediaType
}

19
app/NativeMacReceiverSelector/util.swift Normal file
View File

@@ -0,0 +1,19 @@
import Cocoa
func makeLabel(_ text: String,
size: CGFloat = 0,
color: NSColor = NSColor.textColor) -> NSTextField {
let textField = NSTextField()
textField.stringValue = text
textField.backgroundColor = .clear
textField.isEditable = false
textField.isBezeled = false
textField.sizeToFit()
// Text
textField.font = NSFont.systemFont(ofSize: size)
textField.textColor = color
return textField
}

4
ext/src/_locales/en/messages.json
View File

@@ -21,10 +21,10 @@
, "popupMediaSelectToLabel": {
"message": "to:"
}
, "popupCastButtonLabel": {
, "popupCastButtonTitle": {
"message": "Cast"
}
, "popupCastingButtonLabel": {
, "popupCastingButtonTitle": {
"message": "Casting"
}

4
ext/src/_locales/nl/messages.json
View File

@@ -6,10 +6,10 @@
"message": ""
}
, "popupCastButtonLabel": {
, "popupCastButtonTitle": {
"message": "Casten"
}
, "popupCastingButtonLabel": {
, "popupCastingButtonTitle": {
"message": "Aan het casten"
}

3
ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts
View File

@@ -60,6 +60,9 @@ export default class NativeMacReceiverSelectorManager
, data: JSON.stringify({
receivers
, defaultMediaType
, i18n_extensionName: _("extensionName")
, i18n_castButtonTitle: _("popupCastButtonTitle")
, i18n_mediaTypeApp: _("popupMediaTypeApp")
, i18n_mediaTypeTab: _("popupMediaTypeTab")
, i18n_mediaTypeScreen: _("popupMediaTypeScreen")

4
ext/src/ui/popup/index.tsx
View File

@@ -187,11 +187,11 @@ class ReceiverEntry extends Component<ReceiverEntryProps, ReceiverEntryState> {
onClick={ this.handleCast }
disabled={this.props.isLoading}>
{ this.state.isLoading
? _("popupCastingButtonLabel") +
? _("popupCastingButtonTitle") +
(this.state.isLoading
? this.state.ellipsis
: "")
: _("popupCastButtonLabel") }
: _("popupCastButtonTitle") }
</button>
</li>
);