FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire

This commit is contained in:
Maurice Parker 2019-08-02 18:14:56 -05:00
parent e52b3531d9 49f17e5d14
commit 12f85f3ad3
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mac/Resources/NetNewsWire.sdef
View File

@ -66,7 +66,7 @@
</class> </class>
<enumeration name="account type" code="enum"> <enumeration name="account type" code="enum">
<enumerator name="local" code="Locl" description="The On my Mac account"/> <enumerator name="onmymac" code="Locl" description="An On my Mac (local) account"/>
<enumerator name="feedly" code="Fdly" description="A Feedly account"/> <enumerator name="feedly" code="Fdly" description="A Feedly account"/>
<enumerator name="feedbin" code="Fdbn" description="A Feedbin account"/> <enumerator name="feedbin" code="Fdbn" description="A Feedbin account"/>
<enumerator name="feed wrangler" code="FWrg" description="A Feed Wrangler account"/> <enumerator name="feed wrangler" code="FWrg" description="A Feed Wrangler account"/>
@ -77,12 +77,12 @@
<class name="account" code="Acct" plural="accounts" description="An account for subscribing to feeds"> <class name="account" code="Acct" plural="accounts" description="An account for subscribing to feeds">
<cocoa class="ScriptableAccount"/> <cocoa class="ScriptableAccount"/>
<property name="name" code="pnam" type="text" access="r" description="The name of the account"> <property name="name" code="pnam" type="text" access="r" description="The name of the account">
<cocoa key="name"/> <cocoa key="scriptingName"/>
</property> </property>
<property name="id" code="ID " type="text" access="r" description="The unique id of the account"> <property name="id" code="ID " type="text" access="r" description="The unique id of the account">
<cocoa key="uniqueId"/> <cocoa key="uniqueId"/>
</property> </property>
<property name="type" code="ATyp" type="account type" access="r" description="The type of the account"> <property name="accountType" code="ATyp" type="account type" access="r" description="The type of the account">
<cocoa key="accountType"/> <cocoa key="accountType"/>
</property> </property>
<property name="active" code="Actv" type="boolean" access="rw" description="Whether or not the account is active"> <property name="active" code="Actv" type="boolean" access="rw" description="Whether or not the account is active">

12
Mac/Scriptability/Account+Scriptability.swift
View File

@ -35,7 +35,17 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
account.isActive = newValue account.isActive = newValue
} }
} }
@objc(scriptingName)
var scriptingName: NSString {
get {
return account.nameForDisplay as NSString
}
set {
account.name = newValue as String
}
}
// MARK: --- ScriptingObject protocol --- // MARK: --- ScriptingObject protocol ---
var scriptingKey: String { var scriptingKey: String {