-
Notifications
You must be signed in to change notification settings - Fork 266
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
DevTools shortcut on Preferences and Waiver windows #254
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
6d6a3d3
Enhancement #245: DevTools shortcut on Preferences and Waiver windows
araujoarthur0 0975ddc
Extracting dialog functions too
araujoarthur0 4498c56
Update changelog.txt
araujoarthur0 f7ee3e7
Merge branch 'master' into other-windows-dev-tools
thamara File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,44 @@ | ||
const { remote } = require('electron'); | ||
const { BrowserWindow, dialog } = remote; | ||
|
||
/** | ||
* Binds to the JS "window" the shortcut CTRL+SHIFT+I to toggle Chrome Dev Tools. | ||
* @param {Window} window | ||
*/ | ||
function bindDevToolsShortcut(window) { | ||
window.addEventListener('keyup', (event) => { | ||
if (event.ctrlKey && event.shiftKey && (event.keyCode == 73 || event.keyCode == 105)) { // 'i' or 'I' | ||
BrowserWindow.getFocusedWindow().webContents.toggleDevTools(); | ||
event.preventDefault(); | ||
return false; | ||
} | ||
}, true); | ||
} | ||
|
||
/** | ||
* Opens an electron dialog, based on the options, and performs the successCallback after promise is resolved. | ||
* @param {Object.<string, any>} options | ||
* @param {function} successCallback | ||
*/ | ||
function showDialog(options, successCallback) { | ||
options['title'] = options['title'] || 'Time to Leave'; | ||
dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options).then(successCallback); | ||
araujoarthur0 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
/** | ||
* Opens an electron dialog just like a JS alert(). | ||
* @param {string} message | ||
*/ | ||
function showAlert(message) { | ||
let options = { | ||
'title': 'Time to Leave', | ||
'message': message | ||
}; | ||
dialog.showMessageBoxSync(BrowserWindow.getFocusedWindow(), options); | ||
} | ||
|
||
module.exports = { | ||
bindDevToolsShortcut, | ||
showAlert, | ||
showDialog | ||
}; |
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
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.
Can you squash this changelog commit with the first one? I think it also would be useful to say something like:
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.
You mean not having a separate commit for the changelog?
When accepting the merge request are you not able to squash them on demand? (real question, I've never accepted one hahaha)
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.
Yeah, I mean, you're basically changing the changelog (duh ahah) because of the first commit, so it should go together with it.
We can either squash them all together or have them all separate via the GitHub interface. We can squash portions using the CLI
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.
I've updated the changelog directly in master after merging the PR by mistake. (sorry again)