fix resources for the profile migration dialog.

This commit is contained in:
sspitzer%netscape.com 1999-09-29 04:07:12 +00:00
Родитель 3329e475c2
Коммит 9bd69cb663
13 изменённых файлов: 302 добавлений и 3 удалений

Просмотреть файл

@ -323,6 +323,9 @@ profile/pref-migrator/Makefile
profile/pref-migrator/public/Makefile profile/pref-migrator/public/Makefile
profile/pref-migrator/src/Makefile profile/pref-migrator/src/Makefile
profile/pref-migrator/resources/Makefile profile/pref-migrator/resources/Makefile
profile/pref-migrator/resources/content/Makefile
profile/pref-migrator/resources/locale/Makefile
profile/pref-migrator/resources/locale/en-US/Makefile
profile/defaults/Makefile profile/defaults/Makefile
rdf/Makefile rdf/Makefile
rdf/base/Makefile rdf/base/Makefile

Просмотреть файл

@ -1200,9 +1200,8 @@ sub MakeResourceAliases()
_InstallResources(":mozilla:profile:resources:content:MANIFEST", "$profile_chrome_dir:content:default", 0); _InstallResources(":mozilla:profile:resources:content:MANIFEST", "$profile_chrome_dir:content:default", 0);
_InstallResources(":mozilla:profile:resources:skin:MANIFEST", "$profile_chrome_dir:skin:default", 0); _InstallResources(":mozilla:profile:resources:skin:MANIFEST", "$profile_chrome_dir:skin:default", 0);
_InstallResources(":mozilla:profile:resources:locale:en-US:MANIFEST", "$profile_chrome_dir:locale:en-US:", 0); _InstallResources(":mozilla:profile:resources:locale:en-US:MANIFEST", "$profile_chrome_dir:locale:en-US:", 0);
_InstallResources(":mozilla:profile:pref-migrator:resources:content:MANIFEST","$profile_chrome_dir:content:default", 0);
my($profile_dir) = "$resource_dir" . "profile:"; _InstallResources(":mozilla:profile:pref-migrator:resources:locale:en-US:MANIFEST","$profile_chrome_dir:locale:en-US:", 0);
_InstallResources(":mozilla:profile:pref-migrator:resources:MANIFEST", "$profile_dir");
# need to duplicate this line if more files in default profile folder # need to duplicate this line if more files in default profile folder
my($defaults_dir) = "$dist_dir" . "Defaults:"; my($defaults_dir) = "$dist_dir" . "Defaults:";

Просмотреть файл

@ -0,0 +1,2 @@
profileMigrationProgress.js
profileMigrationProgress.xul

Просмотреть файл

@ -0,0 +1,34 @@
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FILES = \
profileMigrationProgress.js \
profileMigrationProgress.xul \
$(NULL)
include $(topsrcdir)/config/rules.mk
install::
$(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/profile/content/default

Просмотреть файл

@ -0,0 +1,29 @@
#!gmake
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH=..\..\..\..
MODULE=profile
include <$(DEPTH)\config\rules.mak>
FILES=\
profileMigrationProgress.js \
profileMigrationProgress.xul \
$(NULL)
install::
-for %i in ($(FILES:/=\)) do $(MAKE_INSTALL) %i $(DIST)\bin\chrome\profile\content\default

Просмотреть файл

@ -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. */
window.close();
}
function cancel() {
window.close();
}

Просмотреть файл

@ -0,0 +1,52 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://profile/locale/profileMigrationProgress.dtd" >
<window xmlns:html="http://www.w3.org/TR/REC-html40"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&window.title;"
onload="onLoad()">
<html:script language="javascript" src="chrome://profile/content/profileMigrationProgress.js"/>
<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%"/>
<html:img src="chrome://navigator/skin/animthrob_single.gif"/>
</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> &currentlyProcessing.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"/>
</box>
</box>
</box>
</window>

Просмотреть файл

@ -0,0 +1,28 @@
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = en-US
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -0,0 +1 @@
profileMigrationProgress.dtd

Просмотреть файл

@ -0,0 +1,33 @@
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FILES = \
profileMigrationProgress.dtd \
$(NULL)
include $(topsrcdir)/config/rules.mk
install::
$(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/profile/locale/en-US

Просмотреть файл

@ -0,0 +1,27 @@
#!gmake
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH=..\..\..\..\..
include <$(DEPTH)\config\rules.mak>
FILES=\
profileMigrationProgress.dtd \
$(NULL)
install::
-for %i in ($(FILES:/=\)) do $(MAKE_INSTALL) %i $(DIST)\bin\chrome\profile\locale\en-US

Просмотреть файл

@ -0,0 +1,5 @@
<!ENTITY dialogCancel.label "Cancel">
<!ENTITY window.title "Migrating...">
<!ENTITY dialogTitle.label "Migrating user profile">
<!ENTITY currentlyProcessing.text "This may take a little while.">
<!ENTITY downloadBeforeUpdate.text "">

Просмотреть файл

@ -0,0 +1,22 @@
#!nmake
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH=..\..\..\..
DIRS= en-US
include <$(DEPTH)\config\rules.mak>