Skip to content
This repository has been archived by the owner on Oct 17, 2020. It is now read-only.

Commit

Permalink
New options tab (Filling Entries) with clearer options layout; Refs #384
Browse files Browse the repository at this point in the history
  • Loading branch information
@luckyrat
luckyrat committed Aug 16, 2015
1 parent c44bd13 commit 1c89f37
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 35 deletions.
10 changes: 7 additions & 3 deletions Firefox addon/KeeFox/chrome/content/options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ function onLoad(){
wm.getMostRecentWindow("mail:3pane");

window.keefox_org.locale.internationaliseElements(document,
['KeeFox-prefs', 'tab-FindingEntries', 'tab-SavingEntries', 'tab-Logging', 'tab-Advanced', 'tab-KeePass', 'tab-ConnectionSecurity', 'tab-AuthorisedConnections', 'tab-Commands', 'desc-when-user-chooses', 'mi-FillForm', 'mi-FillAndSubmitForm',
'desc-when-keefox-chooses','desc-a-standard-form','desc-a-prompt','desc-keefox-should','mi-do-nothing','mi-FillForm2','mi-FillAndSubmitForm2',
'mi-do-nothing2','mi-FillForm3','mi-FillAndSubmitForm3','desc-fill-note','check-autoFillFormsWithMultipleMatches','check-searchAllOpenDBs','check-listAllOpenDBs','check-alwaysDisplayUsernameWhenTitleIsShown',
['KeeFox-prefs', 'tab-FindingEntries', 'tab-FillingEntries', 'tab-SavingEntries', 'tab-Logging',
'tab-Advanced', 'tab-KeePass', 'tab-ConnectionSecurity', 'tab-AuthorisedConnections',
'tab-Commands', 'when-user-chooses', 'when-keefox-chooses-prompt',
'when-keefox-chooses-standard-form', 'mi-FillForm', 'mi-FillAndSubmitForm',
'mi-do-nothing', 'mi-FillForm2', 'mi-FillAndSubmitForm2',
'mi-do-nothing2', 'mi-FillForm3', 'mi-FillAndSubmitForm3', 'desc-fill-note',
'check-autoFillFormsWithMultipleMatches', 'check-searchAllOpenDBs', 'check-listAllOpenDBs', 'check-alwaysDisplayUsernameWhenTitleIsShown',
'notifyBarRequestPasswordSave','desc-exclude-saved-sites','excludedSitesRemoveButton','notifyWhenLoggedOut',
'famsOptionsButton','desc-log-method','check-log-method-console','check-log-method-stdout','check-log-method-file',
'desc-log-level','KeeFox-pref-logLevel-debug','KeeFox-pref-logLevel-info','KeeFox-pref-logLevel-warn','KeeFox-pref-logLevel-error',
Expand Down
55 changes: 30 additions & 25 deletions Firefox addon/KeeFox/chrome/content/options.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<tabbox flex="1">
<tabs>
<tab id="tab-FindingEntries" label="%-KeeFox-pref-FindingEntries.heading-%"/>
<tab id="tab-FillingEntries" label="%-KeeFox-pref-FillingEntries.heading-%"/>
<tab id="tab-SavingEntries" label="%-KeeFox-pref-SavingEntries.heading-%"/>
<tab id="tab-Logging" label="%-KeeFox-pref-Logging.heading-%"/>
<tab id="tab-Advanced" label="%-KeeFox-pref-Advanced.heading-%"/>
Expand All @@ -97,40 +98,41 @@
"centerscreen,dialog=no,chrome,resizable,dependent,modal"
);'>%-KeeFox-pref-site-options-find.link-%</html:a>
</description>

<checkbox id="check-searchAllOpenDBs" preference="KeeFox-pref-searchAllOpenDBs" label="%-KeeFox-pref-searchAllOpenDBs.label-%" />
<checkbox id="check-listAllOpenDBs" preference="KeeFox-pref-listAllOpenDBs" label="%-KeeFox-pref-listAllOpenDBs.label-%" />
<checkbox id="check-alwaysDisplayUsernameWhenTitleIsShown" preference="KeeFox-pref-alwaysDisplayUsernameWhenTitleIsShown" label="%-KeeFox-pref-alwaysDisplayUsernameWhenTitleIsShown.label-%" class="itemEnd" />
<hbox align="center" class="itemEnd">
<label control="KeeFox-pref-matchSelected-list" id="desc-when-user-chooses">%-KeeFox-pref-when-user-chooses.desc-%: </label>
<menulist id="KeeFox-pref-matchSelected-list" preference="KeeFox-pref-autoSubmitMatchedForms" onsyncfrompreference="return onsyncfrompreferenceMatchSelected();" onsynctopreference="return onsynctopreferenceMatchSelected();">
<menupopup>
<menuitem id="mi-FillForm" label="%-KeeFox-pref-FillForm.desc-%" value="Fill"/>
<menuitem id="mi-FillAndSubmitForm" label="%-KeeFox-pref-FillAndSubmitForm.desc-%" value="FillAndSubmit"/>
</menupopup>
</menulist>
<label id="lab-maxMatchedLoginsInMainPanel" control="maxMatchedLoginsInMainPanel" value="%-KeeFox-pref-maxMatchedLoginsInMainPanel.label-%:"/>
<textbox preference="KeeFox-pref-maxMatchedLoginsInMainPanel" id="maxMatchedLoginsInMainPanel" maxlength="3" size="3" />
</hbox>

</vbox>
</tabpanel>

<tabpanel>
<vbox align="left">

<grid class="findEntryGrid">

<columns>
<column flex="1"/>
<column flex="1"/>
<column flex="1"/>
<column />
</columns>

<rows>
<row align="center">
<description id="desc-when-keefox-chooses">%-KeeFox-pref-when-keefox-chooses.desc-%:</description>
<label control="KeeFox-pref-matchStandard-list" id="desc-a-standard-form">%-KeeFox-pref-a-standard-form.desc-%</label>
<label control="KeeFox-pref-matchHTTP-list" id="desc-a-prompt">%-KeeFox-pref-a-prompt.desc-%</label>

</row>
<row align="center">
<description id="desc-keefox-should" class="tableLeftName">%-KeeFox-pref-KeeFoxShould.desc-%:</description>
<label control="KeeFox-pref-matchStandard-list" id="when-keefox-chooses-standard-form" style="text-align:right">%-KeeFox-pref-when-keefox-chooses-standard-form.desc-%:</label>
<menulist id="KeeFox-pref-matchStandard-list" preference="KeeFox-pref-autoSubmitForms" onsyncfrompreference="return onsyncfrompreferenceMatchStandard();" onsynctopreference="return onsynctopreferenceMatchStandard();" class="kfMenu">
<menupopup>
<menuitem id="mi-do-nothing" label="%-KeeFox-pref-DoNothing.desc-%" value="DoNothing"/>
<menuitem id="mi-FillForm2" label="%-KeeFox-pref-FillForm.desc-%" value="Fill"/>
<menuitem id="mi-FillAndSubmitForm2" label="%-KeeFox-pref-FillAndSubmitForm.desc-%" value="FillAndSubmit"/>
</menupopup>
</menulist>
</row>
<row align="center">
<label control="KeeFox-pref-matchHTTP-list" id="when-keefox-chooses-prompt" style="text-align:right">%-KeeFox-pref-when-keefox-chooses-prompt.desc-%:</label>
<menulist id="KeeFox-pref-matchHTTP-list" preference="KeeFox-pref-autoSubmitDialogs" onsyncfrompreference="return onsyncfrompreferenceMatchHTTP();" onsynctopreference="return onsynctopreferenceMatchHTTP();" class="kfMenu">
<menupopup>
<menuitem id="mi-do-nothing2" label="%-KeeFox-pref-DoNothing.desc-%" value="DoNothing"/>
Expand All @@ -139,20 +141,23 @@
</menupopup>
</menulist>
</row>
<row align="center">
<label control="KeeFox-pref-matchSelected-list" id="when-user-chooses" style="text-align:right">%-KeeFox-pref-when-user-chooses.desc-%:</label>
<menulist id="KeeFox-pref-matchSelected-list" preference="KeeFox-pref-autoSubmitMatchedForms" onsyncfrompreference="return onsyncfrompreferenceMatchSelected();" onsynctopreference="return onsynctopreferenceMatchSelected();">
<menupopup>
<menuitem id="mi-FillForm" label="%-KeeFox-pref-FillForm.desc-%" value="Fill"/>
<menuitem id="mi-FillAndSubmitForm" label="%-KeeFox-pref-FillAndSubmitForm.desc-%" value="FillAndSubmit"/>
</menupopup>
</menulist>
</row>
</rows>

</grid>

<description id="desc-fill-note" class="itemEnd note">%-KeeFox-pref-FillNote.desc-%</description>

<checkbox id="check-autoFillFormsWithMultipleMatches" preference="KeeFox-pref-autoFillFormsWithMultipleMatches" label="%-KeeFox-pref-autoFillFormsWithMultipleMatches.label-%" />
<checkbox id="check-searchAllOpenDBs" preference="KeeFox-pref-searchAllOpenDBs" label="%-KeeFox-pref-searchAllOpenDBs.label-%" />
<checkbox id="check-listAllOpenDBs" preference="KeeFox-pref-listAllOpenDBs" label="%-KeeFox-pref-listAllOpenDBs.label-%" />
<checkbox id="check-alwaysDisplayUsernameWhenTitleIsShown" preference="KeeFox-pref-alwaysDisplayUsernameWhenTitleIsShown" label="%-KeeFox-pref-alwaysDisplayUsernameWhenTitleIsShown.label-%" class="itemEnd" />
<hbox align="center" class="itemEnd">
<label id="lab-maxMatchedLoginsInMainPanel" control="maxMatchedLoginsInMainPanel" value="%-KeeFox-pref-maxMatchedLoginsInMainPanel.label-%:"/>
<textbox preference="KeeFox-pref-maxMatchedLoginsInMainPanel" id="maxMatchedLoginsInMainPanel" maxlength="3" size="3" />
</hbox>


</vbox>
</tabpanel>

Expand Down
11 changes: 5 additions & 6 deletions Firefox addon/KeeFox/chrome/locale/en-US/keefox.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,13 @@ KeeFox-pref-DoNothing.desc= Do nothing
KeeFox-pref-FillAndSubmitForm.desc= Fill in and submit the form
KeeFox-pref-FillAndSubmitPrompt.desc= Fill in and submit the login prompt
KeeFox-pref-FillForm.desc= Fill in the form
KeeFox-pref-FillNote.desc= NB: You can override this behaviour for individual entries in the KeePass "edit entry" dialog.
KeeFox-pref-FillingEntries.heading= Filling entries
KeeFox-pref-FillNote.desc= You can override the "KeeFox chooses" behaviours above for individual entries in the KeePass "edit entry" dialog.
KeeFox-pref-FillPrompt.desc= Fill in the login prompt
KeeFox-pref-FindingEntries.heading= Finding entries
KeeFox-pref-KeeFoxShould.desc= KeeFox should
KeeFox-pref-KeePass.heading= KeePass
KeeFox-pref-Logging.heading= Logging
KeeFox-pref-SavingEntries.heading= Saving entries
KeeFox-pref-a-prompt.desc= An HTTPAuth, NTLM or proxy prompt
KeeFox-pref-a-standard-form.desc= A standard form
KeeFox-pref-alwaysDisplayUsernameWhenTitleIsShown.label=Display username in Logins list and search results
KeeFox-pref-autoFillFormsWithMultipleMatches.label= Forms with multiple matches should be automatically filled and submitted
#KeeFox-pref-dynamicFormScanning.label= Monitor each web page for new forms
Expand Down Expand Up @@ -114,8 +112,9 @@ KeeFox-pref-searchAllOpenDBs.label= Search all open KeePass databases
KeeFox-pref-site-options-find.desc=KeeFox tries to find log-in details for all forms that contain a password field. Adjust this and more in
KeeFox-pref-site-options-find.link=site-specific settings
KeeFox-pref-site-options-savepass.desc=Disable "save password" notifications in
KeeFox-pref-when-keefox-chooses.desc= When KeeFox chooses a matching login for
KeeFox-pref-when-user-chooses.desc= When I choose a matched password, KeeFox should
KeeFox-pref-when-keefox-chooses-prompt.desc= When KeeFox chooses a matching login for an HTTPAuth, NTLM or proxy prompt, KeeFox should
KeeFox-pref-when-keefox-chooses-standard-form.desc= When KeeFox chooses a matching login for a standard form, KeeFox should
KeeFox-pref-when-user-chooses.desc= When you choose a matched login, KeeFox should
KeeFox-remove-site=Remove Site
KeeFox-save-site-settings=Save site settings
KeeFox-site-options-default-intro.desc=Settings for all sites. Add individual site addresses to override.
Expand Down
2 changes: 1 addition & 1 deletion Firefox addon/KeeFox/chrome/skin/options.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

.findEntryGrid
{
height: 50px !important;
max-width: 650px;
}

.tableLeftName
Expand Down

0 comments on commit 1c89f37

Please sign in to comment.