Bug 1045084 - Make WebIDE Preferences less confusing. r=paul

This commit is contained in:
Jan Keromnes 2014-07-29 12:22:07 +02:00
parent 57b3a22ea7
commit 57e9db354d
4 changed files with 42 additions and 46 deletions

View File

@ -18,7 +18,7 @@ window.addEventListener("load", function onLoad() {
// Buttons
document.querySelector("#close").onclick = CloseUI;
document.querySelector("#restoreButton").onclick = RestoreDefaults;
document.querySelector("#restore").onclick = RestoreDefaults;
document.querySelector("#manageSimulators").onclick = ShowAddons;
// Initialize the controls

View File

@ -19,6 +19,8 @@
<body>
<div id="controls">
<a id="restore">&prefs_restore;</a>
<a id="manageSimulators">&prefs_simulators;</a>
<a id="close">&deck_close;</a>
</div>
@ -27,6 +29,12 @@
<h2>&prefs_general_title;</h2>
<ul>
<li>
<label title="&prefs_options_templatesurl_tooltip;">
<span>&prefs_options_templatesurl;</span>
<input data-pref="devtools.webide.templatesURL"/>
</label>
</li>
<li>
<label title="&prefs_options_enablelocalruntime_tooltip;">
<input type="checkbox" data-pref="devtools.webide.enableLocalRuntime"/>
@ -40,9 +48,9 @@
</label>
</li>
<li>
<label title="&prefs_options_templatesurl_tooltip;">
<span>&prefs_options_templatesurl;</span>
<input data-pref="devtools.webide.templatesURL"/>
<label title="&prefs_options_showeditor_tooltip;">
<input type="checkbox" data-pref="devtools.webide.showProjectEditor"/>
<span>&prefs_options_showeditor;</span>
</label>
</li>
</ul>
@ -50,36 +58,6 @@
<h2>&prefs_editor_title;</h2>
<ul>
<li>
<label title="&prefs_options_showeditor_tooltip;">
<input type="checkbox" data-pref="devtools.webide.showProjectEditor"/>
<span>&prefs_options_showeditor;</span>
</label>
</li>
<li>
<label title="&prefs_options_autoclosebrackets_tooltip;">
<input type="checkbox" data-pref="devtools.editor.autoclosebrackets"/>
<span>&prefs_options_autoclosebrackets;</span>
</label>
</li>
<li>
<label title="&prefs_options_autocomplete_tooltip;">
<input type="checkbox" data-pref="devtools.editor.autocomplete"/>
<span>&prefs_options_autocomplete;</span>
</label>
</li>
<li>
<label title="&prefs_options_detectindentation_tooltip;">
<input type="checkbox" data-pref="devtools.editor.detectindentation"/>
<span>&prefs_options_detectindentation;</span>
</label>
</li>
<li>
<label title="&prefs_options_expandtab_tooltip;">
<input type="checkbox" data-pref="devtools.editor.expandtab"/>
<span>&prefs_options_expandtab;</span>
</label>
</li>
<li>
<label><span>&prefs_options_tabsize;</span>
<select data-pref="devtools.editor.tabsize">
@ -89,10 +67,31 @@
</select>
</label>
</li>
<li>
<label title="&prefs_options_expandtab_tooltip;">
<input type="checkbox" data-pref="devtools.editor.expandtab"/>
<span>&prefs_options_expandtab;</span>
</label>
</li>
<li>
<label title="&prefs_options_detectindentation_tooltip;">
<input type="checkbox" data-pref="devtools.editor.detectindentation"/>
<span>&prefs_options_detectindentation;</span>
</label>
</li>
<li>
<label title="&prefs_options_autocomplete_tooltip;">
<input type="checkbox" data-pref="devtools.editor.autocomplete"/>
<span>&prefs_options_autocomplete;</span>
</label>
</li>
<li>
<label title="&prefs_options_autoclosebrackets_tooltip;">
<input type="checkbox" data-pref="devtools.editor.autoclosebrackets"/>
<span>&prefs_options_autoclosebrackets;</span>
</label>
</li>
</ul>
<button id="manageSimulators">&prefs_simulators;</button>
<button id="restoreButton">&prefs_restore;</button>
</body>
</html>

View File

@ -108,15 +108,15 @@
<!ENTITY prefs_options_templatesurl_tooltip "Index of available templates">
<!ENTITY prefs_options_showeditor "Show editor">
<!ENTITY prefs_options_showeditor_tooltip "Show internal editor">
<!ENTITY prefs_options_detectindentation "Detect indentation">
<!ENTITY prefs_options_tabsize "Tab size">
<!ENTITY prefs_options_expandtab "Soft tabs">
<!ENTITY prefs_options_expandtab_tooltip "Use spaces instead of the tab character">
<!ENTITY prefs_options_detectindentation "Autoindent">
<!ENTITY prefs_options_detectindentation_tooltip "Guess indentation based on source content">
<!ENTITY prefs_options_autocomplete "Autocomplete">
<!ENTITY prefs_options_autocomplete_tooltip "Enable code autocompletion">
<!ENTITY prefs_options_autoclosebrackets "Autoclose brackets">
<!ENTITY prefs_options_autoclosebrackets_tooltip "Automatically insert closing brackets">
<!ENTITY prefs_options_expandtab "Indent using spaces">
<!ENTITY prefs_options_expandtab_tooltip "Use spaces instead of the tab character">
<!ENTITY prefs_options_autocomplete "Autocompletion">
<!ENTITY prefs_options_autocomplete_tooltip "Enable code autocompletion">
<!ENTITY prefs_options_tabsize "Tab size">
<!-- Permissions Table -->
<!ENTITY permissionstable_title "Permissions Table">

View File

@ -37,9 +37,6 @@ h1 {
font-size: small;
cursor: pointer;
border-bottom: 1px dotted;
}
#close {
margin-left: 10px;
}