Commit 680a6e91 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

fix jwilkes/purr-data#11

* canvas dialog is a bit too complex to have "Cancel" button revert any changes we may have applied. (It's not out of the realm of possibility, but for now it's easier just to use a nonstandard "Close" button to show the discrepancy)
* font dialog updates on change of radio button, so we just need a "Close" button there
* prefs dialog also too complex to do a revert on "Cancel"
* iemguis and gatom properly revert on "Cancel"
parent 497b8895
...@@ -268,8 +268,8 @@ ...@@ -268,8 +268,8 @@
<button type="button" onClick="apply()" data-i18n="[title]iem.prop.apply_tt"> <button type="button" onClick="apply()" data-i18n="[title]iem.prop.apply_tt">
<span data-i18n="iem.prop.apply"></span> <span data-i18n="iem.prop.apply"></span>
</button> </button>
<button type="button" onClick="cancel()" data-i18n="[title]iem.prop.cancel_tt"> <button type="button" onClick="cancel()" data-i18n="[title]iem.prop.close_tt">
<span data-i18n="iem.prop.cancel"></span> <span data-i18n="iem.prop.close"></span>
</button> </button>
</div> </div>
......
...@@ -78,14 +78,8 @@ ...@@ -78,14 +78,8 @@
</fieldset> </fieldset>
<div class="submit_buttons"> <div class="submit_buttons">
<button type="button" onClick="ok()" data-i18n="[title]iem.prop.ok_tt"> <button type="button" onClick="cancel()" data-i18n="[title]font.prop.close_tt">
<span data-i18n="iem.prop.ok"></span> <span data-i18n="font.prop.close"></span>
</button>
<button type="button" onClick="apply()" data-i18n="[title]iem.prop.apply_tt">
<span data-i18n="iem.prop.apply"></span>
</button>
<button type="button" onClick="cancel()" data-i18n="[title]iem.prop.cancel_tt">
<span data-i18n="iem.prop.cancel"></span>
</button> </button>
</div> </div>
......
...@@ -244,8 +244,8 @@ ...@@ -244,8 +244,8 @@
<button type="button" onClick="apply()" data-i18n="[title]prefs.apply_tt"> <button type="button" onClick="apply()" data-i18n="[title]prefs.apply_tt">
<span data-i18n="prefs.apply"></span> <span data-i18n="prefs.apply"></span>
</button> </button>
<button type="button" onClick="cancel()" data-i18n="[title]prefs.cancel_tt"> <button type="button" onClick="cancel()" data-i18n="[title]prefs.close_tt">
<span data-i18n="prefs.cancel"></span> <span data-i18n="prefs.close"></span>
</button> </button>
</div> </div>
......
...@@ -67,7 +67,9 @@ ...@@ -67,7 +67,9 @@
"apply": "Apply", "apply": "Apply",
"apply_tt": "Apply the settings without closing the dialog", "apply_tt": "Apply the settings without closing the dialog",
"cancel": "Cancel", "cancel": "Cancel",
"cancel_tt": "Close the dialog window" "cancel_tt": "Close the dialog window",
"close": "Close",
"close_tt": "Close the dialog window"
} }
}, },
"gatom": { "gatom": {
...@@ -344,12 +346,14 @@ ...@@ -344,12 +346,14 @@
"channels": "channels", "channels": "channels",
"channels_tt": "number of channels for this device" "channels_tt": "number of channels for this device"
}, },
"ok": "ok", "ok": "Ok",
"ok_tt": "Update the audio properties and close the dialog", "ok_tt": "Update the audio properties and close the dialog",
"apply": "apply", "apply": "Apply",
"apply_tt": "Update audio properties without closing this dialog", "apply_tt": "Update audio properties without closing this dialog",
"cancel": "cancel", "cancel": "Cancel",
"cancel_tt": "Cancel updating the properties" "cancel_tt": "Cancel updating the properties",
"close": "Close",
"close_tt": "Close the properties dialog"
}, },
"font": { "font": {
"prop": { "prop": {
...@@ -359,7 +363,9 @@ ...@@ -359,7 +363,9 @@
"12": "12", "12": "12",
"16": "16", "16": "16",
"24": "24", "24": "24",
"36": "36" "36": "36",
"close": "Close",
"close_tt": "Close the font dialog"
} }
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment