wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 618300 - Easy Setup UI: "Device Connected" modal dialog has no OK/Close button. r=mconnor a=blocking-betaN

Browse Source
This commit is contained in:
Philipp von Weitershausen 2011-01-05 09:20:59 -08:00
parent 6adb71682b
commit a58c38ad74
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
browser/base/content/syncAddDevice.js
View File

@ -45,8 +45,8 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
const PIN_PART_LENGTH = 4; const PIN_PART_LENGTH = 4;
const ADD_DEVICE_PAGE = 0; const ADD_DEVICE_PAGE = 0;
const DEVICE_CONNECTED_PAGE = 1; const SYNC_KEY_PAGE = 1;
const SYNC_KEY_PAGE = 2; const DEVICE_CONNECTED_PAGE = 2;
let gSyncAddDevice = { let gSyncAddDevice = {
@ -70,21 +70,21 @@ let gSyncAddDevice = {
case ADD_DEVICE_PAGE: case ADD_DEVICE_PAGE:
this.wizard.canAdvance = false; this.wizard.canAdvance = false;
this.wizard.canRewind = false; this.wizard.canRewind = false;
this.wizard.getButton("next").hidden = false;
this.pin1.focus(); this.pin1.focus();
break; break;
case SYNC_KEY_PAGE:
this.wizard.canAdvance = false;
this.wizard.canRewind = true;
this.wizard.getButton("back").hidden = false;
this.wizard.getButton("next").hidden = true;
document.getElementById("weavePassphrase").value =
Weave.Utils.hyphenatePassphrase(Weave.Service.passphrase);
break;
case DEVICE_CONNECTED_PAGE: case DEVICE_CONNECTED_PAGE:
this.wizard.canAdvance = true; this.wizard.canAdvance = true;
this.wizard.canRewind = false; this.wizard.canRewind = false;
this.wizard.getButton("next").hidden = true;
this.wizard.getButton("cancel").hidden = true; this.wizard.getButton("cancel").hidden = true;
this.wizard.getButton("finish").hidden = false;
break;
case SYNC_KEY_PAGE:
this.wizard.canAdvance = true;
this.wizard.canRewind = true;
this.wizard.getButton("back").hidden = false;
document.getElementById("weavePassphrase").value =
Weave.Utils.hyphenatePassphrase(Weave.Service.passphrase);
break; break;
} }
}, },

26
browser/base/content/syncAddDevice.xul
View File

@ -114,18 +114,6 @@
onclick="gSyncAddDevice.goToSyncKeyPage();"/> onclick="gSyncAddDevice.goToSyncKeyPage();"/>
</wizardpage> </wizardpage>
<wizardpage id="deviceConnectedPage"
label="&addDevice.dialog.connected.label;"
onpageshow="gSyncAddDevice.onPageShow();">
<vbox align="center">
<image id="successPageIcon"/>
</vbox>
<separator/>
<description class="normal">
&addDevice.dialog.successful.label;
</description>
</wizardpage>
<!-- Need a non-empty label here, otherwise we get a default label on Mac --> <!-- Need a non-empty label here, otherwise we get a default label on Mac -->
<wizardpage id="syncKeyPage" <wizardpage id="syncKeyPage"
label=" " label=" "
@ -140,7 +128,7 @@
accesskey="&syncKeyEntry.accesskey;" accesskey="&syncKeyEntry.accesskey;"
control="weavePassphrase"/> control="weavePassphrase"/>
<textbox id="weavePassphrase" <textbox id="weavePassphrase"
disabled="true"/> readonly="true"/>
</groupbox> </groupbox>
<groupbox align="center"> <groupbox align="center">
@ -158,4 +146,16 @@
</groupbox> </groupbox>
</wizardpage> </wizardpage>
<wizardpage id="deviceConnectedPage"
label="&addDevice.dialog.connected.label;"
onpageshow="gSyncAddDevice.onPageShow();">
<vbox align="center">
<image id="successPageIcon"/>
</vbox>
<separator/>
<description class="normal">
&addDevice.dialog.successful.label;
</description>
</wizardpage>
</wizard> </wizard>