prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve shortcut descriptions and add button to open shortcut settings

Browse source
This commit is contained in:
Stefan Sundin 2018-10-03 02:49:14 -07:00 committed by Janek Bevendorff
parent dc4ad0c27d
commit cbf2bedf17
3 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
keepassxc-browser/_locales/en/messages.json
View file

@ -12,7 +12,7 @@
"description": "Context menu item for filling password."
},
"contextMenuFillTOTP": {
"message": "Insert TOTP",
"message": "Fill TOTP",
"description": "Context menu item for filling Time-based One Time Password."
},
"contextMenuShowPasswordGeneratorIcons": {
@ -395,6 +395,10 @@
"message": "About",
"description": "About page header."
},
"optionsButtonConfigureShortcuts": {
"message": " Configure shortcuts",
"description": "Keyboard shortcut button text."
},
"optionsButtonSave": {
"message": " Save",
"description": "Save button text."
@ -487,17 +491,9 @@
"message": " never",
"description": "Radio button text."
},
"optionsGeneralHelpText": {
"message": "If you just want to insert username and password into the fields where your focus is, press $1",
"description": "Context menu help text."
},
"optionsGeneralHelpTextSecond": {
"message": "If you only want to insert the password, just press $1",
"description": "Context menu help text."
},
"optionsCustomizeCommandsHelpText": {
"message": "You can customize these shortcuts on page $1",
"descriptions": "Shortcut customize help text."
"optionsKeyboardShortcutsHeader": {
"message": "Keyboard shortcuts",
"description": "Keyboard shortcut header text."
},
"optionsBlinkTimeHelpText": {
"message": "Maximum time (ms) the icon should blink after detecting new credentials",

10
keepassxc-browser/options/options.html
View file

@ -29,13 +29,13 @@
<div class="tab" id="tab-general-settings">
<h2 data-i18n="optionsGeneralSettingsTab"></h2>
<hr />
<h3 data-i18n="optionsKeyboardShortcutsHeader"></h3>
<p>
<span data-i18n="optionsGeneralHelpText" i18n-placeholder="<code><span id='mac-user-shortcut'>Ctrl + Shift + U</span><span id='default-user-shortcut'>Alt + Shift + U</span></code>"></span>.
<br />
<span data-i18n="optionsGeneralHelpTextSecond" i18n-placeholder="<code><span id='mac-pass-shortcut'>Ctrl + Shift + I</span><span id='default-pass-shortcut'>Alt + Shift + I</span></code>"></span>.
<br />
<span id="chrome-only"><span data-i18n="optionsCustomizeCommandsHelpText" i18n-placeholder="<code>chrome://extensions/configureCommands</code>"></span></span>
<span data-i18n="contextMenuFillUsernameAndPassword"></span>: <span id="fill-username-password-shortcut">error</span><br />
<span data-i18n="contextMenuFillPassword"></span>: <span id="fill-password-shortcut">error</span><br />
<span data-i18n="contextMenuFillTOTP"></span>: <span id="fill-totp-shortcut">error</span>
</p>
<p id="chrome-only"><button class="btn btn-sm btn-primary" id="configureCommands" type="button"><span class="glyphicon glyphicon-cog"></span><span data-i18n="optionsButtonConfigureShortcuts"/></button></p>
<p>
<div class="form-group">
<label for="blinkTimeout" data-i18n="optionsLabelBlinkTime"></label>

26
keepassxc-browser/options/options.js
View file

@ -118,6 +118,18 @@ options.initGeneralSettings = function() {
$('#blinkMinTimeout').val(options.settings['blinkMinTimeout']);
$('#allowedRedirect').val(options.settings['allowedRedirect']);
browser.commands.getAll().then(function(commands) {
commands.forEach(function(command) {
var shortcut = document.getElementById(`${command.name}-shortcut`);
if (!shortcut) return;
shortcut.textContent = command.shortcut || 'not configured';
});
});
$('#configureCommands').click(function(){
browser.tabs.create({ url: 'chrome://extensions/configureCommands' });
});
$('#blinkTimeoutButton').click(function(){
const blinkTimeout = $.trim($('#blinkTimeout').val());
const blinkTimeoutval = blinkTimeout !== '' ? Number(blinkTimeout) : defaultSettings.blinkTimeout;
@ -370,7 +382,7 @@ options.initSitePreferences = function() {
$('#tab-site-preferences table tbody:first').append(tr);
}
}
if ($('#tab-site-preferences table tbody:first tr').length > 2) {
$('#tab-site-preferences table tbody:first tr.empty:first').hide();
} else {
@ -383,16 +395,4 @@ options.initAbout = function() {
if (isFirefox()) {
$('#chrome-only').remove();
}
if (navigator.platform === 'MacIntel') {
$('#default-user-shortcut').hide();
$('#default-pass-shortcut').hide();
$('#mac-user-shortcut').show();
$('#mac-pass-shortcut').show();
} else {
$('#mac-user-shortcut').hide();
$('#mac-pass-shortcut').hide();
$('#default-user-shortcut').show();
$('#default-pass-shortcut').show();
}
};