Make OPML import and export respect multiple accounts
This commit is contained in:
Maurice Parker
parent
63eeeb55ca
commit
73f035c5b7
@ -51,6 +51,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
|
|||||||
private var mainWindowController: MainWindowController?
|
private var mainWindowController: MainWindowController?
|
||||||
private var addFeedController: AddFeedController?
|
private var addFeedController: AddFeedController?
|
||||||
private var addFolderWindowController: AddFolderWindowController?
|
private var addFolderWindowController: AddFolderWindowController?
|
||||||
|
private var importOPMLController: ImportOPMLWindowController?
|
||||||
|
private var exportOPMLController: ExportOPMLWindowController?
|
||||||
private var keyboardShortcutsWindowController: WebViewWindowController?
|
private var keyboardShortcutsWindowController: WebViewWindowController?
|
||||||
private var inspectorWindowController: InspectorWindowController?
|
private var inspectorWindowController: InspectorWindowController?
|
||||||
private var crashReportWindowController: CrashReportWindowController? // For testing only
|
private var crashReportWindowController: CrashReportWindowController? // For testing only
|
||||||
@ -362,54 +364,26 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
|
|||||||
|
|
||||||
@IBAction func importOPMLFromFile(_ sender: Any?) {
|
@IBAction func importOPMLFromFile(_ sender: Any?) {
|
||||||
|
|
||||||
let panel = NSOpenPanel()
|
createAndShowMainWindow()
|
||||||
panel.canDownloadUbiquitousContents = true
|
if mainWindowController!.isDisplayingSheet {
|
||||||
panel.canResolveUbiquitousConflicts = true
|
return
|
||||||
panel.canChooseFiles = true
|
}
|
||||||
panel.allowsMultipleSelection = false
|
|
||||||
panel.canChooseDirectories = false
|
importOPMLController = ImportOPMLWindowController()
|
||||||
panel.resolvesAliases = true
|
importOPMLController?.runSheetOnWindow(mainWindowController!.window!)
|
||||||
panel.allowedFileTypes = ["opml", "xml"]
|
|
||||||
panel.allowsOtherFileTypes = false
|
|
||||||
|
|
||||||
let result = panel.runModal()
|
|
||||||
if result == NSApplication.ModalResponse.OK, let url = panel.url {
|
|
||||||
DispatchQueue.main.async {
|
|
||||||
do {
|
|
||||||
try OPMLImporter.parseAndImport(fileURL: url, account: AccountManager.shared.defaultAccount)
|
|
||||||
}
|
|
||||||
catch let error as NSError {
|
|
||||||
NSApplication.shared.presentError(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@IBAction func exportOPML(_ sender: Any?) {
|
@IBAction func exportOPML(_ sender: Any?) {
|
||||||
|
|
||||||
let panel = NSSavePanel()
|
createAndShowMainWindow()
|
||||||
panel.allowedFileTypes = ["opml"]
|
if mainWindowController!.isDisplayingSheet {
|
||||||
panel.allowsOtherFileTypes = false
|
return
|
||||||
panel.prompt = NSLocalizedString("Export OPML", comment: "Export OPML")
|
}
|
||||||
panel.title = NSLocalizedString("Export OPML", comment: "Export OPML")
|
|
||||||
panel.nameFieldLabel = NSLocalizedString("Export to:", comment: "Export OPML")
|
exportOPMLController = ExportOPMLWindowController()
|
||||||
panel.message = NSLocalizedString("Choose a location for the exported OPML file.", comment: "Export OPML")
|
exportOPMLController?.runSheetOnWindow(mainWindowController!.window!)
|
||||||
panel.isExtensionHidden = false
|
|
||||||
panel.nameFieldStringValue = "MySubscriptions.opml"
|
|
||||||
|
|
||||||
let result = panel.runModal()
|
|
||||||
if result == NSApplication.ModalResponse.OK, let url = panel.url {
|
|
||||||
DispatchQueue.main.async {
|
|
||||||
let filename = url.lastPathComponent
|
|
||||||
let opmlString = OPMLExporter.OPMLString(with: AccountManager.shared.defaultAccount, title: filename)
|
|
||||||
do {
|
|
||||||
try opmlString.write(to: url, atomically: true, encoding: String.Encoding.utf8)
|
|
||||||
}
|
|
||||||
catch let error as NSError {
|
|
||||||
NSApplication.shared.presentError(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@IBAction func addAppNews(_ sender: Any?) {
|
@IBAction func addAppNews(_ sender: Any?) {
|
||||||
|
|||||||
101
Mac/MainWindow/OPML/ExportOPMLSheet.xib
Normal file
101
Mac/MainWindow/OPML/ExportOPMLSheet.xib
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
|
||||||
|
<dependencies>
|
||||||
|
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
|
||||||
|
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||||
|
</dependencies>
|
||||||
|
<objects>
|
||||||
|
<customObject id="-2" userLabel="File's Owner" customClass="ExportOPMLWindowController" customModule="NetNewsWire" customModuleProvider="target">
|
||||||
|
<connections>
|
||||||
|
<outlet property="accountPopUpButton" destination="bbC-2g-e3k" id="sK9-0j-WyF"/>
|
||||||
|
<outlet property="window" destination="QvC-M9-y7g" id="Z1E-pd-3QE"/>
|
||||||
|
</connections>
|
||||||
|
</customObject>
|
||||||
|
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||||
|
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||||
|
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
|
||||||
|
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
|
||||||
|
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
||||||
|
<rect key="contentRect" x="196" y="240" width="350" height="98"/>
|
||||||
|
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
|
||||||
|
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="350" height="98"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="o6E-UX-65J">
|
||||||
|
<rect key="frame" x="20" y="57" width="310" height="21"/>
|
||||||
|
<subviews>
|
||||||
|
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xJz-HU-L4i">
|
||||||
|
<rect key="frame" x="-2" y="4" width="63" height="17"/>
|
||||||
|
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Account:" id="Dao-jI-G6i">
|
||||||
|
<font key="font" metaFont="systemBold"/>
|
||||||
|
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</textFieldCell>
|
||||||
|
</textField>
|
||||||
|
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bbC-2g-e3k" userLabel="Account Popup">
|
||||||
|
<rect key="frame" x="65" y="-3" width="248" height="25"/>
|
||||||
|
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="MJb-Bf-UJG" id="xZd-AP-nuM">
|
||||||
|
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="menu"/>
|
||||||
|
<menu key="menu" id="TP8-jd-M1D">
|
||||||
|
<items>
|
||||||
|
<menuItem title="Item 1" state="on" id="MJb-Bf-UJG"/>
|
||||||
|
<menuItem title="Item 2" id="7U3-Y5-qeM"/>
|
||||||
|
<menuItem title="Item 3" id="Uii-dd-siy"/>
|
||||||
|
</items>
|
||||||
|
</menu>
|
||||||
|
</popUpButtonCell>
|
||||||
|
</popUpButton>
|
||||||
|
</subviews>
|
||||||
|
<visibilityPriorities>
|
||||||
|
<integer value="1000"/>
|
||||||
|
<integer value="1000"/>
|
||||||
|
</visibilityPriorities>
|
||||||
|
<customSpacing>
|
||||||
|
<real value="3.4028234663852886e+38"/>
|
||||||
|
<real value="3.4028234663852886e+38"/>
|
||||||
|
</customSpacing>
|
||||||
|
</stackView>
|
||||||
|
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eZ4-Ej-Hks">
|
||||||
|
<rect key="frame" x="215" y="13" width="121" height="32"/>
|
||||||
|
<buttonCell key="cell" type="push" title="Export OPML" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="bRz-cx-bmm">
|
||||||
|
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
<string key="keyEquivalent" base64-UTF8="YES">
|
||||||
|
DQ
|
||||||
|
</string>
|
||||||
|
</buttonCell>
|
||||||
|
<connections>
|
||||||
|
<action selector="exportOPML:" target="-2" id="Lcs-Xm-HfK"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PPB-R8-A9a">
|
||||||
|
<rect key="frame" x="133" y="13" width="82" height="32"/>
|
||||||
|
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6lK-bV-Vwd">
|
||||||
|
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
<string key="keyEquivalent" base64-UTF8="YES">
|
||||||
|
Gw
|
||||||
|
</string>
|
||||||
|
</buttonCell>
|
||||||
|
<connections>
|
||||||
|
<action selector="cancel:" target="-2" id="oun-pb-pQs"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="eZ4-Ej-Hks" secondAttribute="bottom" constant="20" symbolic="YES" id="ES8-CX-Cvn"/>
|
||||||
|
<constraint firstItem="o6E-UX-65J" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="Ffh-rT-vN7"/>
|
||||||
|
<constraint firstItem="eZ4-Ej-Hks" firstAttribute="top" secondItem="o6E-UX-65J" secondAttribute="bottom" constant="16" id="Ir1-CQ-4jm"/>
|
||||||
|
<constraint firstItem="eZ4-Ej-Hks" firstAttribute="leading" secondItem="PPB-R8-A9a" secondAttribute="trailing" constant="12" symbolic="YES" id="Lfs-g3-crb"/>
|
||||||
|
<constraint firstItem="PPB-R8-A9a" firstAttribute="centerY" secondItem="eZ4-Ej-Hks" secondAttribute="centerY" id="OVP-4p-nXp"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="eZ4-Ej-Hks" secondAttribute="trailing" constant="20" symbolic="YES" id="RDU-0d-O0Q"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="o6E-UX-65J" secondAttribute="trailing" constant="20" symbolic="YES" id="Xhe-ek-MZi"/>
|
||||||
|
<constraint firstItem="o6E-UX-65J" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="mvL-Y1-uSn"/>
|
||||||
|
</constraints>
|
||||||
|
</view>
|
||||||
|
<point key="canvasLocation" x="79" y="61"/>
|
||||||
|
</window>
|
||||||
|
</objects>
|
||||||
|
</document>
|
||||||
85
Mac/MainWindow/OPML/ExportOPMLWindowController.swift
Normal file
85
Mac/MainWindow/OPML/ExportOPMLWindowController.swift
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
//
|
||||||
|
// ExportOPMLWindowController.swift
|
||||||
|
// NetNewsWire
|
||||||
|
//
|
||||||
|
// Created by Maurice Parker on 5/1/19.
|
||||||
|
// Copyright © 2019 Ranchero Software. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import AppKit
|
||||||
|
import Account
|
||||||
|
|
||||||
|
class ExportOPMLWindowController: NSWindowController {
|
||||||
|
|
||||||
|
@IBOutlet weak var accountPopUpButton: NSPopUpButton!
|
||||||
|
private weak var hostWindow: NSWindow?
|
||||||
|
|
||||||
|
convenience init() {
|
||||||
|
self.init(windowNibName: NSNib.Name("ExportOPMLSheet"))
|
||||||
|
}
|
||||||
|
|
||||||
|
override func windowDidLoad() {
|
||||||
|
|
||||||
|
accountPopUpButton.removeAllItems()
|
||||||
|
let menu = NSMenu()
|
||||||
|
for oneAccount in AccountManager.shared.sortedAccounts {
|
||||||
|
let oneMenuItem = NSMenuItem()
|
||||||
|
oneMenuItem.title = oneAccount.nameForDisplay
|
||||||
|
oneMenuItem.representedObject = oneAccount
|
||||||
|
menu.addItem(oneMenuItem)
|
||||||
|
}
|
||||||
|
accountPopUpButton.menu = menu
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: API
|
||||||
|
|
||||||
|
func runSheetOnWindow(_ hostWindow: NSWindow) {
|
||||||
|
self.hostWindow = hostWindow
|
||||||
|
hostWindow.beginSheet(window!)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Actions
|
||||||
|
|
||||||
|
@IBAction func cancel(_ sender: Any) {
|
||||||
|
hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.cancel)
|
||||||
|
}
|
||||||
|
|
||||||
|
@IBAction func exportOPML(_ sender: Any) {
|
||||||
|
|
||||||
|
guard let menuItem = accountPopUpButton.selectedItem else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
let account = menuItem.representedObject as! Account
|
||||||
|
|
||||||
|
hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.OK)
|
||||||
|
|
||||||
|
let panel = NSSavePanel()
|
||||||
|
panel.allowedFileTypes = ["opml"]
|
||||||
|
panel.allowsOtherFileTypes = false
|
||||||
|
panel.prompt = NSLocalizedString("Export OPML", comment: "Export OPML")
|
||||||
|
panel.title = NSLocalizedString("Export OPML", comment: "Export OPML")
|
||||||
|
panel.nameFieldLabel = NSLocalizedString("Export to:", comment: "Export OPML")
|
||||||
|
panel.message = NSLocalizedString("Choose a location for the exported OPML file.", comment: "Export OPML")
|
||||||
|
panel.isExtensionHidden = false
|
||||||
|
panel.nameFieldStringValue = "MySubscriptions.opml"
|
||||||
|
|
||||||
|
panel.beginSheetModal(for: hostWindow!) { result in
|
||||||
|
if result == NSApplication.ModalResponse.OK, let url = panel.url {
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
let filename = url.lastPathComponent
|
||||||
|
let opmlString = OPMLExporter.OPMLString(with: account, title: filename)
|
||||||
|
do {
|
||||||
|
try opmlString.write(to: url, atomically: true, encoding: String.Encoding.utf8)
|
||||||
|
}
|
||||||
|
catch let error as NSError {
|
||||||
|
NSApplication.shared.presentError(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
101
Mac/MainWindow/OPML/ImportOPMLSheet.xib
Normal file
101
Mac/MainWindow/OPML/ImportOPMLSheet.xib
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
|
||||||
|
<dependencies>
|
||||||
|
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
|
||||||
|
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||||
|
</dependencies>
|
||||||
|
<objects>
|
||||||
|
<customObject id="-2" userLabel="File's Owner" customClass="ImportOPMLWindowController" customModule="NetNewsWire" customModuleProvider="target">
|
||||||
|
<connections>
|
||||||
|
<outlet property="accountPopUpButton" destination="sEU-ot-DE2" id="keS-NN-GY0"/>
|
||||||
|
<outlet property="window" destination="QvC-M9-y7g" id="GVH-gh-96m"/>
|
||||||
|
</connections>
|
||||||
|
</customObject>
|
||||||
|
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||||
|
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||||
|
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
|
||||||
|
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
|
||||||
|
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
||||||
|
<rect key="contentRect" x="196" y="240" width="350" height="110"/>
|
||||||
|
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
|
||||||
|
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="350" height="110"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="brC-JT-Rvi">
|
||||||
|
<rect key="frame" x="20" y="57" width="310" height="33"/>
|
||||||
|
<subviews>
|
||||||
|
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kZ4-y9-lYy">
|
||||||
|
<rect key="frame" x="-2" y="16" width="63" height="17"/>
|
||||||
|
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Account:" id="e9g-7H-VWa">
|
||||||
|
<font key="font" metaFont="systemBold"/>
|
||||||
|
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</textFieldCell>
|
||||||
|
</textField>
|
||||||
|
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sEU-ot-DE2" userLabel="Account Popup">
|
||||||
|
<rect key="frame" x="65" y="9" width="248" height="25"/>
|
||||||
|
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="xsd-12-2yb" id="NuO-Hk-nk3">
|
||||||
|
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="menu"/>
|
||||||
|
<menu key="menu" id="8LY-np-ij1">
|
||||||
|
<items>
|
||||||
|
<menuItem title="Item 1" state="on" id="xsd-12-2yb"/>
|
||||||
|
<menuItem title="Item 2" id="JGa-5R-SV5"/>
|
||||||
|
<menuItem title="Item 3" id="92e-hX-kYj"/>
|
||||||
|
</items>
|
||||||
|
</menu>
|
||||||
|
</popUpButtonCell>
|
||||||
|
</popUpButton>
|
||||||
|
</subviews>
|
||||||
|
<visibilityPriorities>
|
||||||
|
<integer value="1000"/>
|
||||||
|
<integer value="1000"/>
|
||||||
|
</visibilityPriorities>
|
||||||
|
<customSpacing>
|
||||||
|
<real value="3.4028234663852886e+38"/>
|
||||||
|
<real value="3.4028234663852886e+38"/>
|
||||||
|
</customSpacing>
|
||||||
|
</stackView>
|
||||||
|
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="et6-I1-6wB">
|
||||||
|
<rect key="frame" x="215" y="13" width="121" height="32"/>
|
||||||
|
<buttonCell key="cell" type="push" title="Import OPML" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="dhV-on-ayM">
|
||||||
|
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
<string key="keyEquivalent" base64-UTF8="YES">
|
||||||
|
DQ
|
||||||
|
</string>
|
||||||
|
<connections>
|
||||||
|
<action selector="importOPML:" target="-2" id="hwR-7i-sks"/>
|
||||||
|
</connections>
|
||||||
|
</buttonCell>
|
||||||
|
</button>
|
||||||
|
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ceu-mM-EKm">
|
||||||
|
<rect key="frame" x="133" y="13" width="82" height="32"/>
|
||||||
|
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9ab-cB-hex">
|
||||||
|
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
<string key="keyEquivalent" base64-UTF8="YES">
|
||||||
|
Gw
|
||||||
|
</string>
|
||||||
|
</buttonCell>
|
||||||
|
<connections>
|
||||||
|
<action selector="cancel:" target="-2" id="3bA-Ja-mgX"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
</subviews>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="brC-JT-Rvi" secondAttribute="trailing" constant="20" symbolic="YES" id="4L3-oZ-QfO"/>
|
||||||
|
<constraint firstItem="et6-I1-6wB" firstAttribute="top" secondItem="brC-JT-Rvi" secondAttribute="bottom" constant="16" id="Lgq-uC-Cbg"/>
|
||||||
|
<constraint firstAttribute="bottom" secondItem="et6-I1-6wB" secondAttribute="bottom" constant="20" symbolic="YES" id="T9O-XC-wdY"/>
|
||||||
|
<constraint firstItem="brC-JT-Rvi" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="Xjj-ZG-QwO"/>
|
||||||
|
<constraint firstItem="et6-I1-6wB" firstAttribute="leading" secondItem="ceu-mM-EKm" secondAttribute="trailing" constant="12" symbolic="YES" id="Y8m-P8-JQh"/>
|
||||||
|
<constraint firstAttribute="trailing" secondItem="et6-I1-6wB" secondAttribute="trailing" constant="20" symbolic="YES" id="chg-8b-D51"/>
|
||||||
|
<constraint firstItem="ceu-mM-EKm" firstAttribute="centerY" secondItem="et6-I1-6wB" secondAttribute="centerY" id="eKt-vM-3wn"/>
|
||||||
|
<constraint firstItem="brC-JT-Rvi" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="kWe-BT-2bD"/>
|
||||||
|
</constraints>
|
||||||
|
</view>
|
||||||
|
<point key="canvasLocation" x="83.5" y="67"/>
|
||||||
|
</window>
|
||||||
|
</objects>
|
||||||
|
</document>
|
||||||
82
Mac/MainWindow/OPML/ImportOPMLWindowController.swift
Normal file
82
Mac/MainWindow/OPML/ImportOPMLWindowController.swift
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
//
|
||||||
|
// ImportOPMLWindowController.swift
|
||||||
|
// NetNewsWire
|
||||||
|
//
|
||||||
|
// Created by Maurice Parker on 5/1/19.
|
||||||
|
// Copyright © 2019 Ranchero Software. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import AppKit
|
||||||
|
import Account
|
||||||
|
|
||||||
|
class ImportOPMLWindowController: NSWindowController {
|
||||||
|
|
||||||
|
@IBOutlet weak var accountPopUpButton: NSPopUpButton!
|
||||||
|
private weak var hostWindow: NSWindow?
|
||||||
|
|
||||||
|
convenience init() {
|
||||||
|
self.init(windowNibName: NSNib.Name("ImportOPMLSheet"))
|
||||||
|
}
|
||||||
|
|
||||||
|
override func windowDidLoad() {
|
||||||
|
|
||||||
|
accountPopUpButton.removeAllItems()
|
||||||
|
let menu = NSMenu()
|
||||||
|
for oneAccount in AccountManager.shared.sortedAccounts {
|
||||||
|
let oneMenuItem = NSMenuItem()
|
||||||
|
oneMenuItem.title = oneAccount.nameForDisplay
|
||||||
|
oneMenuItem.representedObject = oneAccount
|
||||||
|
menu.addItem(oneMenuItem)
|
||||||
|
}
|
||||||
|
accountPopUpButton.menu = menu
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: API
|
||||||
|
|
||||||
|
func runSheetOnWindow(_ hostWindow: NSWindow) {
|
||||||
|
self.hostWindow = hostWindow
|
||||||
|
hostWindow.beginSheet(window!)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Actions
|
||||||
|
|
||||||
|
@IBAction func cancel(_ sender: Any) {
|
||||||
|
hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.cancel)
|
||||||
|
}
|
||||||
|
|
||||||
|
@IBAction func importOPML(_ sender: Any) {
|
||||||
|
|
||||||
|
guard let menuItem = accountPopUpButton.selectedItem else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
let account = menuItem.representedObject as! Account
|
||||||
|
|
||||||
|
hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.OK)
|
||||||
|
|
||||||
|
let panel = NSOpenPanel()
|
||||||
|
panel.canDownloadUbiquitousContents = true
|
||||||
|
panel.canResolveUbiquitousConflicts = true
|
||||||
|
panel.canChooseFiles = true
|
||||||
|
panel.allowsMultipleSelection = false
|
||||||
|
panel.canChooseDirectories = false
|
||||||
|
panel.resolvesAliases = true
|
||||||
|
panel.allowedFileTypes = ["opml", "xml"]
|
||||||
|
panel.allowsOtherFileTypes = false
|
||||||
|
|
||||||
|
panel.beginSheetModal(for: hostWindow!) { result in
|
||||||
|
if result == NSApplication.ModalResponse.OK, let url = panel.url {
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
do {
|
||||||
|
try OPMLImporter.parseAndImport(fileURL: url, account: account)
|
||||||
|
}
|
||||||
|
catch let error as NSError {
|
||||||
|
NSApplication.shared.presentError(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -20,6 +20,10 @@
|
|||||||
5144EA2F2279FAB600D19003 /* AccountsDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5144EA2E2279FAB600D19003 /* AccountsDetailViewController.swift */; };
|
5144EA2F2279FAB600D19003 /* AccountsDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5144EA2E2279FAB600D19003 /* AccountsDetailViewController.swift */; };
|
||||||
5144EA362279FC3D00D19003 /* AccountsAddLocal.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5144EA352279FC3D00D19003 /* AccountsAddLocal.xib */; };
|
5144EA362279FC3D00D19003 /* AccountsAddLocal.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5144EA352279FC3D00D19003 /* AccountsAddLocal.xib */; };
|
||||||
5144EA382279FC6200D19003 /* AccountsAddLocalWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5144EA372279FC6200D19003 /* AccountsAddLocalWindowController.swift */; };
|
5144EA382279FC6200D19003 /* AccountsAddLocalWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5144EA372279FC6200D19003 /* AccountsAddLocalWindowController.swift */; };
|
||||||
|
5144EA3B227A379E00D19003 /* ImportOPMLSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5144EA3A227A379E00D19003 /* ImportOPMLSheet.xib */; };
|
||||||
|
5144EA3D227A37AF00D19003 /* ExportOPMLSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5144EA3C227A37AF00D19003 /* ExportOPMLSheet.xib */; };
|
||||||
|
5144EA40227A37EC00D19003 /* ImportOPMLWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5144EA3E227A37EC00D19003 /* ImportOPMLWindowController.swift */; };
|
||||||
|
5144EA43227A380F00D19003 /* ExportOPMLWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5144EA42227A380F00D19003 /* ExportOPMLWindowController.swift */; };
|
||||||
5183CCD0226E1E880010922C /* NonIntrinsicLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCCF226E1E880010922C /* NonIntrinsicLabel.swift */; };
|
5183CCD0226E1E880010922C /* NonIntrinsicLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCCF226E1E880010922C /* NonIntrinsicLabel.swift */; };
|
||||||
5183CCDA226E31A50010922C /* NonIntrinsicImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCD9226E31A50010922C /* NonIntrinsicImageView.swift */; };
|
5183CCDA226E31A50010922C /* NonIntrinsicImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCD9226E31A50010922C /* NonIntrinsicImageView.swift */; };
|
||||||
5183CCDD226F1F5C0010922C /* NavigationProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCDC226F1F5C0010922C /* NavigationProgressView.swift */; };
|
5183CCDD226F1F5C0010922C /* NavigationProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCDC226F1F5C0010922C /* NavigationProgressView.swift */; };
|
||||||
@ -642,6 +646,10 @@
|
|||||||
5144EA2E2279FAB600D19003 /* AccountsDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsDetailViewController.swift; sourceTree = "<group>"; };
|
5144EA2E2279FAB600D19003 /* AccountsDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsDetailViewController.swift; sourceTree = "<group>"; };
|
||||||
5144EA352279FC3D00D19003 /* AccountsAddLocal.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountsAddLocal.xib; sourceTree = "<group>"; };
|
5144EA352279FC3D00D19003 /* AccountsAddLocal.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountsAddLocal.xib; sourceTree = "<group>"; };
|
||||||
5144EA372279FC6200D19003 /* AccountsAddLocalWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsAddLocalWindowController.swift; sourceTree = "<group>"; };
|
5144EA372279FC6200D19003 /* AccountsAddLocalWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsAddLocalWindowController.swift; sourceTree = "<group>"; };
|
||||||
|
5144EA3A227A379E00D19003 /* ImportOPMLSheet.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImportOPMLSheet.xib; sourceTree = "<group>"; };
|
||||||
|
5144EA3C227A37AF00D19003 /* ExportOPMLSheet.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ExportOPMLSheet.xib; sourceTree = "<group>"; };
|
||||||
|
5144EA3E227A37EC00D19003 /* ImportOPMLWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportOPMLWindowController.swift; sourceTree = "<group>"; };
|
||||||
|
5144EA42227A380F00D19003 /* ExportOPMLWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportOPMLWindowController.swift; sourceTree = "<group>"; };
|
||||||
5183CCCF226E1E880010922C /* NonIntrinsicLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicLabel.swift; sourceTree = "<group>"; };
|
5183CCCF226E1E880010922C /* NonIntrinsicLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicLabel.swift; sourceTree = "<group>"; };
|
||||||
5183CCD9226E31A50010922C /* NonIntrinsicImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicImageView.swift; sourceTree = "<group>"; };
|
5183CCD9226E31A50010922C /* NonIntrinsicImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicImageView.swift; sourceTree = "<group>"; };
|
||||||
5183CCDC226F1F5C0010922C /* NavigationProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationProgressView.swift; sourceTree = "<group>"; };
|
5183CCDC226F1F5C0010922C /* NavigationProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationProgressView.swift; sourceTree = "<group>"; };
|
||||||
@ -960,6 +968,17 @@
|
|||||||
path = Tree;
|
path = Tree;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
|
5144EA39227A377700D19003 /* OPML */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
5144EA3A227A379E00D19003 /* ImportOPMLSheet.xib */,
|
||||||
|
5144EA3E227A37EC00D19003 /* ImportOPMLWindowController.swift */,
|
||||||
|
5144EA3C227A37AF00D19003 /* ExportOPMLSheet.xib */,
|
||||||
|
5144EA42227A380F00D19003 /* ExportOPMLWindowController.swift */,
|
||||||
|
);
|
||||||
|
path = OPML;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
5183CCDB226F1EEB0010922C /* Progress */ = {
|
5183CCDB226F1EEB0010922C /* Progress */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
@ -1177,6 +1196,7 @@
|
|||||||
849A977C1ED9EC42007D329B /* Detail */,
|
849A977C1ED9EC42007D329B /* Detail */,
|
||||||
849A97551ED9EAC3007D329B /* Add Feed */,
|
849A97551ED9EAC3007D329B /* Add Feed */,
|
||||||
849A97411ED9EAA9007D329B /* Add Folder */,
|
849A97411ED9EAA9007D329B /* Add Folder */,
|
||||||
|
5144EA39227A377700D19003 /* OPML */,
|
||||||
);
|
);
|
||||||
path = MainWindow;
|
path = MainWindow;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
@ -2173,9 +2193,11 @@
|
|||||||
84C9FC7D22629E1200D921D6 /* AccountsDetail.xib in Resources */,
|
84C9FC7D22629E1200D921D6 /* AccountsDetail.xib in Resources */,
|
||||||
5144EA362279FC3D00D19003 /* AccountsAddLocal.xib in Resources */,
|
5144EA362279FC3D00D19003 /* AccountsAddLocal.xib in Resources */,
|
||||||
84C9FC8C22629E8F00D921D6 /* KeyboardShortcuts.html in Resources */,
|
84C9FC8C22629E8F00D921D6 /* KeyboardShortcuts.html in Resources */,
|
||||||
|
5144EA3B227A379E00D19003 /* ImportOPMLSheet.xib in Resources */,
|
||||||
844B5B691FEA20DF00C7C76A /* SidebarKeyboardShortcuts.plist in Resources */,
|
844B5B691FEA20DF00C7C76A /* SidebarKeyboardShortcuts.plist in Resources */,
|
||||||
84A3EE5F223B667F00557320 /* DefaultFeeds.opml in Resources */,
|
84A3EE5F223B667F00557320 /* DefaultFeeds.opml in Resources */,
|
||||||
84C9FC8222629E4800D921D6 /* Preferences.storyboard in Resources */,
|
84C9FC8222629E4800D921D6 /* Preferences.storyboard in Resources */,
|
||||||
|
5144EA3D227A37AF00D19003 /* ExportOPMLSheet.xib in Resources */,
|
||||||
849C64681ED37A5D003D8FC0 /* Assets.xcassets in Resources */,
|
849C64681ED37A5D003D8FC0 /* Assets.xcassets in Resources */,
|
||||||
848362FD2262A30800DA1D35 /* styleSheet.css in Resources */,
|
848362FD2262A30800DA1D35 /* styleSheet.css in Resources */,
|
||||||
8483630B2262A3F000DA1D35 /* RenameSheet.xib in Resources */,
|
8483630B2262A3F000DA1D35 /* RenameSheet.xib in Resources */,
|
||||||
@ -2388,6 +2410,7 @@
|
|||||||
849A97891ED9ECEF007D329B /* ArticleStyle.swift in Sources */,
|
849A97891ED9ECEF007D329B /* ArticleStyle.swift in Sources */,
|
||||||
84FF69B11FC3793300DC198E /* FaviconURLFinder.swift in Sources */,
|
84FF69B11FC3793300DC198E /* FaviconURLFinder.swift in Sources */,
|
||||||
84B7178C201E66580091657D /* SidebarViewController+ContextualMenus.swift in Sources */,
|
84B7178C201E66580091657D /* SidebarViewController+ContextualMenus.swift in Sources */,
|
||||||
|
5144EA43227A380F00D19003 /* ExportOPMLWindowController.swift in Sources */,
|
||||||
842611A21FCB769D0086A189 /* RSHTMLMetadata+Extension.swift in Sources */,
|
842611A21FCB769D0086A189 /* RSHTMLMetadata+Extension.swift in Sources */,
|
||||||
84A1500520048DDF0046AD9A /* SendToMarsEditCommand.swift in Sources */,
|
84A1500520048DDF0046AD9A /* SendToMarsEditCommand.swift in Sources */,
|
||||||
D5907DB22004BB37005947E5 /* ScriptingObjectContainer.swift in Sources */,
|
D5907DB22004BB37005947E5 /* ScriptingObjectContainer.swift in Sources */,
|
||||||
@ -2442,6 +2465,7 @@
|
|||||||
849A977B1ED9EC04007D329B /* UnreadIndicatorView.swift in Sources */,
|
849A977B1ED9EC04007D329B /* UnreadIndicatorView.swift in Sources */,
|
||||||
84B99C9D1FAE83C600ECDEDB /* DeleteCommand.swift in Sources */,
|
84B99C9D1FAE83C600ECDEDB /* DeleteCommand.swift in Sources */,
|
||||||
849A97541ED9EAC0007D329B /* AddFeedWindowController.swift in Sources */,
|
849A97541ED9EAC0007D329B /* AddFeedWindowController.swift in Sources */,
|
||||||
|
5144EA40227A37EC00D19003 /* ImportOPMLWindowController.swift in Sources */,
|
||||||
849A976D1ED9EBC8007D329B /* TimelineTableView.swift in Sources */,
|
849A976D1ED9EBC8007D329B /* TimelineTableView.swift in Sources */,
|
||||||
84D52E951FE588BB00D14F5B /* DetailStatusBarView.swift in Sources */,
|
84D52E951FE588BB00D14F5B /* DetailStatusBarView.swift in Sources */,
|
||||||
D5E4CC64202C1AC1009B4FFC /* MainWindowController+Scriptability.swift in Sources */,
|
D5E4CC64202C1AC1009B4FFC /* MainWindowController+Scriptability.swift in Sources */,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user