зеркало из https://github.com/mozilla/gecko-dev.git
get the pref-migrator progress dialog to work.
Yes, I know these are in the wrong place. (all the resources under mozilla/profile are [going into / live in the] wrong place. first I need to get -installer to work again, then put things in the right place.
This commit is contained in:
Родитель
557b3fa8a8
Коммит
c2ab9f1860
|
@ -28,6 +28,9 @@ EXPORT_RESOURCE_SAMPLES = \
|
|||
prefmProgress.xul \
|
||||
progress_undetermined.xul \
|
||||
prefmProgress.css \
|
||||
pmunprog.dtd \
|
||||
pmunprog.js \
|
||||
pmunprog.xul \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -24,6 +24,9 @@ FILES=\
|
|||
prefmProgress.xul \
|
||||
progress_undetermined.xul \
|
||||
prefmProgress.css \
|
||||
pmunprog.dtd \
|
||||
pmunprog.js \
|
||||
pmunprog.xul \
|
||||
$(NULL)
|
||||
|
||||
install::
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
<!ENTITY dialogCancel.label "Cancel">
|
||||
<!ENTITY dialogTitle.label "Migrating user profile">
|
||||
<!ENTITY currentlyProcessing.text "This may take a little while.">
|
||||
<!ENTITY downloadBeforeUpdate.text "">
|
|
@ -0,0 +1,64 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS"
|
||||
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing rights and limitations
|
||||
* under the License.
|
||||
*
|
||||
* The Original Code is Mozilla Communicator client code, released March
|
||||
* 31, 1998.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape Communications
|
||||
* Corporation. Portions created by Netscape are Copyright (C) 1998
|
||||
* Netscape Communications Corporation. All Rights Reserved.
|
||||
*/
|
||||
|
||||
var migrator;
|
||||
var browser;
|
||||
var dialog;
|
||||
|
||||
function onLoad(oldProfilePath, newProfilePath) {
|
||||
//dialog = new Object;
|
||||
//dialog.title = document.getElementByID( "xpi.process" );
|
||||
//dialog.current = document.getElementByID( "xpi.currentlyprocessing");
|
||||
//dialog.newWindow = document.getElementById( "dialog.newWindow" );
|
||||
|
||||
var retval;
|
||||
|
||||
var prefmigrator = Components.classes['component://netscape/profile/migration'].createInstance(Components.interfaces.nsIPrefMigration);
|
||||
if (prefmigrator)
|
||||
{
|
||||
dump("----- Migrating prefs\n");
|
||||
retval = prefmigrator.ProcessPrefsFromJS();
|
||||
dump("----- Migrating prefs done " + retval + "\n" );
|
||||
}
|
||||
else
|
||||
{
|
||||
dump("----- ERROR Migrating prefs failed create instances failed\n");
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
||||
function open() {
|
||||
if ( dialog.ok.disabled ) {
|
||||
return;
|
||||
}
|
||||
|
||||
var url = dialog.input.value;
|
||||
|
||||
browser.loadUrl( url );
|
||||
|
||||
/* Close dialog. */
|
||||
toolkit.CloseWindow( window );
|
||||
}
|
||||
|
||||
function cancel() {
|
||||
toolkit.CloseWindow( window );
|
||||
}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
|
||||
<!DOCTYPE window SYSTEM "resource:/res/profile/pmunprog.dtd" >
|
||||
|
||||
|
||||
<window xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="Migrating Profiles"
|
||||
onload="onLoad()">
|
||||
|
||||
|
||||
<html:script language="javascript" src="pmunprog.js">
|
||||
</html:script>
|
||||
|
||||
<box align="vertical" style="height: 30%; width: 50%">
|
||||
|
||||
<box align="horizontal">
|
||||
<box align="horizontal" flex="100%" >
|
||||
<html:div> <html:h3> &dialogTitle.label; </html:h3> </html:div>
|
||||
</box>
|
||||
<spring flex="100%"/>
|
||||
<box align="horizontal">
|
||||
<html:img src="resource:/res/throbber/anims00.gif"/>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
<box align="vertical">
|
||||
<html:div style="height:10px; width:100%"><html:hr/></html:div>
|
||||
</box>
|
||||
|
||||
<box align="horizontal">
|
||||
<spring style="width:10px"/>
|
||||
<html:div> <html:h5> ¤tlyProcessing.text; </html:h5> </html:div>
|
||||
</box>
|
||||
|
||||
<spring style="height:10px"/>
|
||||
|
||||
<box align="horizontal">
|
||||
<spring style="width:10px"/>
|
||||
<html:div> &downloadBeforeUpdate.text; </html:div>
|
||||
</box>
|
||||
|
||||
<spring style="height:20px"></spring>
|
||||
<box align="horizontal">
|
||||
<spring style="width:10px"/>
|
||||
<box align="vertical">
|
||||
<spring style="height:6px"/>
|
||||
<progressmeter id="dialog.progress" mode="undetermined" style="width:200px;height:10px">
|
||||
</progressmeter>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
|
||||
</box>
|
||||
|
||||
</window>
|
|
@ -274,7 +274,7 @@ nsPrefMigration::ProcessPrefs()
|
|||
PRInt32 pmWinWidth = 300;
|
||||
PRInt32 pmWinHeight = 200;
|
||||
nsAutoString args;
|
||||
const char *pmprogressStr = "chrome://global/content/pmunprog.xul";
|
||||
const char *pmprogressStr = "resource:/res/profile/pmunprog.xul";
|
||||
|
||||
|
||||
NS_WITH_SERVICE(nsIAppShellService, PMProgressAppShell,
|
||||
|
@ -1428,4 +1428,5 @@ nsPrefMigration::ShowPMDialogEngine(nsIDialogParamBlock *ioParamBlock, const cha
|
|||
return rv;
|
||||
}
|
||||
|
||||
#endif /* 0 */
|
||||
#endif /* 0 */
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче