mac-remote and mac-mediakey extension updates #366
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # | ||
| # BEGIN NIGHTINGALE GPL | ||
| # | ||
| # This file is part of the Nightingale Media Player. | ||
| # | ||
| # Copyright(c) 2014 | ||
| # http://getnightingale.com | ||
| # | ||
| # This file may be licensed under the terms of of the | ||
| # GNU General Public License Version 2 (the "GPL"). | ||
| # | ||
| # Software distributed under the License is distributed | ||
| # on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either | ||
| # express or implied. See the GPL for the specific language | ||
| # governing rights and limitations. | ||
| # | ||
| # You should have received a copy of the GPL along with this | ||
| # program. If not, go to http://www.gnu.org/licenses/gpl.html | ||
| # or write to the Free Software Foundation, Inc., | ||
| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| # | ||
| # END NIGHTINGALE GPL | ||
| # | ||
|
|
||
| DEPTH = ../../.. | ||
| topsrcdir = @top_srcdir@ | ||
| srcdir = @srcdir@ | ||
| VPATH = @srcdir@ | ||
|
|
||
| include $(DEPTH)/build/autodefs.mk | ||
|
|
||
| IS_EXTENSION = 1 | ||
|
|
||
| JAR_MANIFEST = jar.mn.in | ||
|
|
||
| include $(topsrcdir)/build/rules.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| // | ||
| // BEGIN NIGHTINGALE GPL | ||
| // | ||
| // This file is part of the Nightingale Media Player. | ||
| // | ||
| // Copyright(c) 2014 | ||
| // http://getnightingale.com | ||
| // | ||
| // This file may be licensed under the terms of of the | ||
| // GNU General Public License Version 2 (the "GPL"). | ||
| // | ||
| // Software distributed under the License is distributed | ||
| // on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either | ||
| // express or implied. See the GPL for the specific language | ||
| // governing rights and limitations. | ||
| // | ||
| // You should have received a copy of the GPL along with this | ||
| // program. If not, go to http://www.gnu.org/licenses/gpl.html | ||
| // or write to the Free Software Foundation, Inc., | ||
| // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| // | ||
| // END NIGHTINGALE GPL | ||
| // | ||
| */ | ||
|
|
||
| // Make a namespace. | ||
| if (typeof AppleMediaKeysFirstRun == 'undefined') { | ||
| var AppleMediaKeysFirstRun = {}; | ||
| } | ||
|
|
||
| /** | ||
| * UI controller that is loaded into the main player window | ||
| */ | ||
| AppleMediaKeysFirstRun.Controller = { | ||
|
|
||
| /** | ||
| * Called when the window finishes loading | ||
| */ | ||
| onLoad: function() { | ||
|
|
||
| // initialization code | ||
| this._initialized = true; | ||
| this._strings = document.getElementById("apple-mediakeys-strings"); | ||
|
|
||
| // Perform extra actions the first time the extension is run | ||
| if (Application.prefs.get("extensions.apple-mediakeys.firstrun").value) { | ||
| Application.prefs.setValue("extensions.apple-mediakeys.firstrun", false); | ||
| this._firstRunSetup(); | ||
| } | ||
|
|
||
| }, | ||
|
|
||
| /** | ||
| * Perform extra setup the first time the extension is run | ||
| */ | ||
| _firstRunSetup : function() { | ||
|
|
||
| // Call this.firstrun() after a 3 second timeout | ||
| setTimeout(function(controller) { controller.firstrun(); }, 3000, this); | ||
|
|
||
| }, | ||
|
|
||
| firstrun : function() { | ||
| var welcomeTitle = this._strings.getString("WelcomeTitle"); | ||
| var welcomeMsg = this._strings.getString("WelcomeMessage"); | ||
| var promptService = Cc['@mozilla.org/embedcomp/prompt-service;1'] | ||
| .getService(Ci.nsIPromptService); | ||
| promptService.alert(null, welcomeTitle, welcomeMsg); | ||
| }, | ||
|
|
||
| }; | ||
|
|
||
| window.addEventListener("load", function(e) { AppleMediaKeysFirstRun.Controller.onLoad(e); }, false); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0"?> | ||
|
|
||
| <!DOCTYPE overlay SYSTEM "chrome://apple-mediakeys/locale/options.dtd"> | ||
|
|
||
| <overlay id="radio-prefs-overlay" | ||
| xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> | ||
|
|
||
| <prefWindow id="BrowserPreferences"> | ||
| <prefpane id="mediakeysPrefPane" | ||
| label="&apple-mediakeys-prefs-overlay.label;" | ||
| src="chrome://apple-mediakeys/content/prefsPane.xul" /> | ||
| </prefWindow> | ||
|
There was a problem hiding this comment. Can't you do this by changing the pref type? Or is this because the extension is hidden by default? |
||
|
|
||
| </overlay> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0"?> | ||
|
|
||
| <!DOCTYPE prefwindow SYSTEM "chrome://apple-mediakeys/locale/options.dtd"> | ||
|
|
||
| <overlay id="radio_preferences_overlay" | ||
| xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> | ||
|
|
||
| <prefwindow id="BrowserPreferences"> | ||
| <prefpane id="mediakeysPrefPane" label="&apple-mediakeys-prefs-overlay.label;" | ||
| onpaneload="onPrefPaneLoad()"> | ||
|
|
||
| <vbox> | ||
| <groupbox> | ||
| <caption label="&apple-mediakeys.prefs.disable-itunes.groupcaption;"/> | ||
| <description>&apple-mediakeys.prefs.disable-itunes.description;</description> | ||
| <label class="text-link" href="http://www.thebitguru.com/projects/iTunesPatch" value="&apple-mediakeys.prefs.disable-itunes.link.label;"/> | ||
| </groupbox> | ||
| <groupbox> | ||
| <caption label="&apple-mediakeys.prefs.bluetooth.groupcaption;"/> | ||
| <description>&apple-mediakeys.prefs.bluetooth.description;</description> | ||
| <label class="text-link" href="https://github.com/jguice/mac-bt-headset-fix" value="&apple-mediakeys.prefs.bluetooth.link.label;"/> | ||
| </groupbox> | ||
| </vbox> | ||
|
|
||
| </prefpane> | ||
| </prefwindow> | ||
|
|
||
| </overlay> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <overlay id="apple-mediakeys-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> | ||
|
|
||
| <script src="firstrun.js"/> | ||
|
|
||
| <stringbundleset id="stringbundleset"> | ||
| <stringbundle id="apple-mediakeys-strings" src="chrome://apple-mediakeys/locale/overlay.properties"/> | ||
| </stringbundleset> | ||
|
|
||
| </overlay> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # a little about jar.mn.in... | ||
| # lines starting with "#" (like this one) are comments | ||
|
|
||
| # this says we're creating a new jar file | ||
| apple-mediakeys.jar: | ||
| # map the things under content/ to chrome://xpcom_helloworld/content/ | ||
| % content apple-mediakeys %content/ contentaccessible=yes | ||
| # map in the locale | ||
| % locale apple-mediakeys en-US %locale/en-US/ | ||
| # map in the skin | ||
| % skin apple-mediakeys classic/1.0 %skin/ | ||
| # apply an overlay to all Songbird main windows | ||
| % overlay chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://apple-mediakeys/content/scripts-overlay.xul | ||
| # include all the files in this jar | ||
| % overlay chrome://browser/content/preferences/preferences.xul chrome://apple-mediakeys/content/prefsOverlay.xul | ||
| @include_all_to |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <!ENTITY apple-mediakeys-prefs-overlay.label "Mac Media Keys"> | ||
|
|
||
| <!ENTITY apple-mediakeys.prefs.disable-itunes.groupcaption "Disable iTunes Launching"> | ||
| <!ENTITY apple-mediakeys.prefs.disable-itunes.description "In order to disable iTunes from launching when pressing the Play/Pause media key, download and run the patch from the external link below."> | ||
| <!ENTITY apple-mediakeys.prefs.disable-itunes.link.label "Play Button iTunes Patch"> | ||
|
|
||
| <!ENTITY apple-mediakeys.prefs.bluetooth.groupcaption "Enable Bluetooth Control"> | ||
| <!ENTITY apple-mediakeys.prefs.bluetooth.description "In order to enable media controls on a connected Bluetooth device, download and run the application from the external link below."> | ||
| <!ENTITY apple-mediakeys.prefs.bluetooth.link.label "Mac Bluetooth Headset Fix"> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| WelcomeTitle=Welcome Mac Users! | ||
| WelcomeMessage=You can use your keyboard's media keys to control playback within Nightingale. If you wish to disable launching of iTunes when pressing Play/Pause, or if you want to control playback with a Bluetooth device, navigate to Preferences --> Mac Media Keys for instructions. | ||
|
There was a problem hiding this comment. Note: We'll have to add these strings to babelzilla. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # | ||
| # BEGIN NIGHTINGALE GPL | ||
| # | ||
| # This file is part of the Nightingale Media Player. | ||
| # | ||
| # Copyright(c) 2014 | ||
| # http://getnightingale.com | ||
| # | ||
| # This file may be licensed under the terms of of the | ||
| # GNU General Public License Version 2 (the "GPL"). | ||
| # | ||
| # Software distributed under the License is distributed | ||
| # on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either | ||
| # express or implied. See the GPL for the specific language | ||
| # governing rights and limitations. | ||
| # | ||
| # You should have received a copy of the GPL along with this | ||
| # program. If not, go to http://www.gnu.org/licenses/gpl.html | ||
| # or write to the Free Software Foundation, Inc., | ||
| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| # | ||
| # END NIGHTINGALE GPL | ||
| # | ||
|
|
||
| DEPTH = ../../.. | ||
| topsrcdir = @top_srcdir@ | ||
| srcdir = @srcdir@ | ||
| VPATH = @srcdir@ | ||
|
|
||
| include $(DEPTH)/build/autodefs.mk | ||
|
|
||
| IS_EXTENSION = 1 | ||
|
|
||
| SUBDIRS = preferences \ | ||
| $(NULL) | ||
|
|
||
| include $(topsrcdir)/build/rules.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # | ||
| # BEGIN NIGHTINGALE GPL | ||
| # | ||
| # This file is part of the Nightingale Media Player. | ||
| # | ||
| # Copyright(c) 2014 | ||
| # http://getnightingale.com | ||
| # | ||
| # This file may be licensed under the terms of of the | ||
| # GNU General Public License Version 2 (the "GPL"). | ||
| # | ||
| # Software distributed under the License is distributed | ||
| # on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either | ||
| # express or implied. See the GPL for the specific language | ||
| # governing rights and limitations. | ||
| # | ||
| # You should have received a copy of the GPL along with this | ||
| # program. If not, go to http://www.gnu.org/licenses/gpl.html | ||
| # or write to the Free Software Foundation, Inc., | ||
| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| # | ||
| # END NIGHTINGALE GPL | ||
| # | ||
|
|
||
| DEPTH = ../../../.. | ||
| topsrcdir = @top_srcdir@ | ||
| srcdir = @srcdir@ | ||
| VPATH = @srcdir@ | ||
|
|
||
| include $(DEPTH)/build/autodefs.mk | ||
|
|
||
| IS_EXTENSION = 1 | ||
|
|
||
| SONGBIRD_PREFS = $(srcdir)/prefs.js \ | ||
| $(NULL) | ||
|
|
||
| include $(topsrcdir)/build/rules.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // Used to detect the first time the extension is run | ||
| pref("extensions.apple-mediakeys.firstrun", true); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indentiation seems to have gotten messed up here. Generally it's two spaces, irrc.