mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

102477 - turn on Download Manager (take 3). r=law sr=ben a=dbaron die=cvs

This commit is contained in:
blakeross%telocity.com 2002-03-17 21:41:01 +00:00
Родитель 75c5058a42
Коммит 2f0cbd6a9a
25 изменённых файлов: 205 добавлений и 202 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
allmakefiles.sh
Просмотреть файл

@ -631,6 +631,9 @@ xpfe/components/bookmarks/Makefile
xpfe/components/bookmarks/public/Makefile
xpfe/components/bookmarks/src/Makefile
xpfe/components/directory/Makefile
xpfe/components/download-manager/Makefile
xpfe/components/download-manager/src/Makefile
xpfe/components/download-manager/public/Makefile
xpfe/components/timebomb/Makefile
xpfe/components/timebomb/tools/Makefile
xpfe/components/regviewer/Makefile

8
build/mac/build_scripts/MozillaBuildList.pm
Просмотреть файл

@ -275,6 +275,9 @@ sub InstallComponentFiles()
# update notifications
InstallResources(":mozilla:xpfe:components:updates:src:MANIFEST", "$components_dir");
# download manager
InstallResources(":mozilla:xpfe:components:download-manager:src:MANIFEST_COMPONENTS", "$components_dir");
# embedding UI
InstallResources(":mozilla:embedding:components:ui:helperAppDlg:MANIFEST", "$components_dir");
InstallResources(":mozilla:embedding:components:ui:progressDlg:MANIFEST", "$components_dir");
@ -529,6 +532,8 @@ sub ProcessJarManifests()
CreateJarFromManifest(":mozilla:xpfe:communicator:resources:content:mac:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:bookmarks:resources:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:download-manager:resources:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:download-manager:resources:locale:en-US:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:content:mac:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:unix:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:win:jar.mn", $chrome_dir, \%jars);
@ -972,6 +977,8 @@ sub BuildClientDist()
InstallFromManifest(":mozilla:xpfe:components:regviewer:MANIFEST_IDL", "$distdirectory:idl:");
# autocomplete
InstallFromManifest(":mozilla:xpfe:components:autocomplete:public:MANIFEST_IDL", "$distdirectory:idl:");
# download manager
InstallFromManifest(":mozilla:xpfe:components:download-manager:public:MANIFEST_IDL", "$distdirectory:idl:");
# XPAPPS
InstallFromManifest(":mozilla:xpfe:appshell:public:MANIFEST", "$distdirectory:xpfe:");
@ -1315,6 +1322,7 @@ sub BuildIDLProjects()
BuildIDLProject(":mozilla:xpfe:components:timebomb:macbuild:timebombIDL.xml", "tmbm");
BuildIDLProject(":mozilla:xpfe:components:urlbarhistory:macbuild:urlbarhistoryIDL.xml", "urlbarhistory");
BuildIDLProject(":mozilla:xpfe:components:autocomplete:macbuild:AutoCompleteIDL.xml", "autocomplete");
BuildIDLProject(":mozilla:xpfe:components:download-manager:macbuild:DownloadManagerIDL.xml", "downloadmanager");
BuildIDLProject(":mozilla:xpfe:appshell:macbuild:appshellIDL.xml", "appshell");

74
embedding/components/ui/progressDlg/nsIProgressDialog.idl
Просмотреть файл

@ -21,12 +21,9 @@
* Bill Law law@netscape.com
*/
#include "nsIWebProgressListener.idl"
#include "nsIDownload.idl"
interface nsIWebBrowserPersist;
interface nsIDOMWindow;
interface nsILocalFile;
interface nsIObserver;
/* nsIProgressDialog
*
@ -50,75 +47,20 @@ interface nsIObserver;
*/
[scriptable, uuid(88A478B3-AF65-440a-94DC-ED9B154D2990)]
interface nsIProgressDialog : nsIWebProgressListener {
interface nsIProgressDialog : nsIDownload {
/**
* Open the dialog
*
* @param aParent Parent window; optional (if null, then
* a top-level window is created)
* @param aPersist The stream transfer operation that the dialog is
* to show progress for. This is optional. If
* specified, then the progress dialog will register
* itself as the listener for that object. Otherwise,
* it is the caller's responsibility to connect this
* object to something that sends out the web progress
* notifications.
*/
void open( in nsIDOMWindow aParent, in nsIWebBrowserPersist aPersist );
void open( in nsIDOMWindow aParent );
/**
* Set starting time to use in elapsed/remaining time calculations;
* this is useful in cases where the download might have started
* prior to the dialog opening; the time is specified as
* milliseconds, according to the convention for the JavaScript Date
* object getTime function; if not specified, this value will default
* to the time at which the progress dialog object is created.
*/
attribute long long startTime;
/**
* URL of the source of the stream transfer that the dialog is
* displaying the progress of.
*/
attribute nsIURI source;
/**
* Target of the stream transfer that the dialog is
* displaying the progress of.
*/
attribute nsILocalFile target;
/**
* Set this attribute to indicate that the dialog is being
* used to display progress prior to opening a downloaded
* file with a helper application. The application string
* specified will appear on the dialog, unless the string
* is empty. This will also cause the "keep this dialog
* open after download" checkbox hidden.
*/
attribute wstring openingWith;
/**
* Set this attribute to the observer object that will be
* notified when the user presses the Cancel button. The
* observer's "observe" method will be called with:
* aSubject = the nsIProgressDialog
* aTopic = "oncancel"
* aData = ""
*/
attribute nsIObserver observer;
/**
* The web browser persist object doing the associated I/O.
* May be null.
*/
readonly attribute nsIWebBrowserPersist operation;
/**
* The dialog object itself. This might be null if the dialog isn't
* open yet, or has been closed.
*/
readonly attribute nsIDOMWindow dialog;
/**
* The dialog object itself. This might be null if the dialog isn't
* open yet, or has been closed.
*/
attribute nsIDOMWindow dialog;
};

20
embedding/components/ui/progressDlg/nsProgressDialog.js
Просмотреть файл

@ -64,6 +64,7 @@ function nsProgressDialog() {
this.mTarget = null;
this.mApp = null;
this.mDialog = null;
this.mDisplayName = null;
this.mPaused = null;
this.mRequest = null;
this.mCompleted = false;
@ -84,7 +85,7 @@ nsProgressDialog.prototype = {
dialogFeatures: "chrome,titlebar,minimizable=yes",
// getters/setters
get saving() { return this.openingWith == null; },
get saving() { return this.openingWith == null || this.openingWith == ""; },
get parent() { return this.mParent; },
set parent(newval) { return this.mParent = newval; },
get operation() { return this.mOperation; },
@ -109,6 +110,8 @@ nsProgressDialog.prototype = {
set openingWith(newval) { return this.mApp = newval; },
get dialog() { return this.mDialog; },
set dialog(newval) { return this.mDialog = newval; },
get displayName() { return this.mDisplayName; },
set displayName(newval) { return this.mDisplayName = newval; },
get paused() { return this.mPaused; },
get request() { return this.mRequest; },
get completed() { return this.mCompleted; },
@ -128,10 +131,9 @@ nsProgressDialog.prototype = {
// ---------- nsIProgressDialog methods ----------
// open: Store aParentWindow and open the dialog.
open: function( aParentWindow, aPersist ) {
open: function( aParentWindow ) {
// Save parent and "persist" operation.
this.parent = aParentWindow;
this.operation = aPersist;
// Open dialog using the WindowWatcher service.
var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
@ -142,6 +144,17 @@ nsProgressDialog.prototype = {
this.dialogFeatures,
this );
},
init: function( aSource, aTarget, aDisplayName, aOpeningWith, aStartTime, aOperation ) {
this.source = aSource;
this.target = aTarget;
this.displayName = aDisplayName;
this.openingWith = aOpeningWith;
if ( aStartTime ) {
this.startTime = aStartTime;
}
this.operation = aOperation;
},
// ---------- nsIWebProgressListener methods ----------
@ -307,6 +320,7 @@ nsProgressDialog.prototype = {
// of interface inheritance), nsIObserver, and nsISupports.
QueryInterface: function (iid) {
if (!iid.equals(Components.interfaces.nsIProgressDialog) &&
!iid.equals(Components.interfaces.nsIDownload) &&
!iid.equals(Components.interfaces.nsIWebProgressListener) &&
!iid.equals(Components.interfaces.nsIObserver) &&
!iid.equals(Components.interfaces.nsISupports)) {

11
uriloader/base/MANIFEST_IDL
Просмотреть файл

@ -1,11 +0,0 @@
#
# This is a list of local files which get copied to the mozilla:dist:idl directory
#
nsCURILoader.idl
nsIContentHandler.idl
nsIURIContentListener.idl
nsIURILoader.idl
nsIDocumentLoader.idl
nsIWebProgress.idl
nsIWebProgressListener.idl

1
uriloader/base/Makefile.in
Просмотреть файл

@ -54,6 +54,7 @@ XPIDLSRCS = \
nsIURIContentListener.idl \
nsIURILoader.idl \
nsCURILoader.idl \
nsIDownload.idl \
nsIDocumentLoader.idl \
nsIWebProgress.idl \
nsIWebProgressListener.idl \

73
uriloader/base/makefile.win
Просмотреть файл

@ -1,73 +0,0 @@
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (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.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1999 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
MODULE = uriloader
DEPTH = ..\..
REQUIRES = xpcom \
string \
necko \
dom \
exthandler \
js \
docshell \
layout \
widget \
caps \
intl \
webshell \
xpconnect \
content \
gfx \
$(NULL)
include <$(DEPTH)\config\config.mak>
################################################################################
## exports
XPIDLSRCS= \
.\nsCURILoader.idl \
.\nsIContentHandler.idl \
.\nsIURIContentListener.idl \
.\nsIURILoader.idl \
.\nsIDocumentLoader.idl \
.\nsIWebProgress.idl \
.\nsIWebProgressListener.idl \
$(NULL)
LIBRARY_NAME=uriloaderbase_s
CPP_OBJS = \
.\$(OBJDIR)\nsURILoader.obj \
.\$(OBJDIR)\nsDocLoader.obj \
$(NULL)
INCS = $(INCS) \
-I$(DEPTH)\dist\include \
$(NULL)
include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

63
uriloader/exthandler/nsExternalHelperAppService.cpp
Просмотреть файл

@ -39,6 +39,7 @@
#include "nsCURILoader.h"
#include "nsIWebProgress.h"
#include "nsIWebProgressListener.h"
#include "nsIDownload.h"
#include "nsReadableUtils.h"
// used to manage our in memory data source of helper applications
@ -1384,52 +1385,42 @@ nsresult nsExternalAppHandler::ShowProgressDialog()
{
// we are back from the helper app dialog (where the user chooses to save or open), but we aren't
// done processing the load. in this case, throw up a progress dialog so the user can see what's going on...
nsresult rv = NS_OK;
nsresult rv;
nsCOMPtr<nsILocalFile> local = do_QueryInterface(mFinalFileDestination);
nsCOMPtr<nsIProgressDialog> progressDlg = do_CreateInstance( "@mozilla.org/progressdialog;1", &rv );
if (progressDlg)
nsCOMPtr<nsIDownload> dl = do_CreateInstance("@mozilla.org/download;1", &rv);
if (NS_FAILED(rv)) return rv;
nsXPIDLString openWith(NS_LITERAL_STRING(""));
nsMIMEInfoHandleAction action = nsIMIMEInfo::saveToDisk;
mMimeInfo->GetPreferredAction(&action);
if (action != nsIMIMEInfo::saveToDisk)
{
// Wire up this progress dialog.
progressDlg->SetSource( mSourceUrl );
progressDlg->SetStartTime( mTimeDownloadStarted );
progressDlg->SetObserver(this);
nsCOMPtr<nsILocalFile> local = do_QueryInterface(mFinalFileDestination);
progressDlg->SetTarget(local);
nsMIMEInfoHandleAction action = nsIMIMEInfo::saveToDisk;
mMimeInfo->GetPreferredAction(&action);
if (action != nsIMIMEInfo::saveToDisk)
// Opening with an application; use either description or application file name.
mMimeInfo->GetApplicationDescription(getter_Copies(openWith));
if (openWith.IsEmpty())
{
// Opening with an application; use either description or application file name.
nsXPIDLString openWith;
mMimeInfo->GetApplicationDescription(getter_Copies(openWith));
if (openWith.IsEmpty())
nsCOMPtr<nsIFile> appl;
mMimeInfo->GetPreferredApplicationHandler(getter_AddRefs(appl));
if (appl)
{
nsCOMPtr<nsIFile> appl;
mMimeInfo->GetPreferredApplicationHandler(getter_AddRefs(appl));
if (appl)
nsCOMPtr<nsILocalFile> file = do_QueryInterface(appl);
if (file)
{
nsCOMPtr<nsILocalFile> file = do_QueryInterface(appl);
if (file)
{
file->GetUnicodeLeafName(getter_Copies(openWith));
}
file->GetUnicodeLeafName(getter_Copies(openWith));
}
}
// Tell progress dialog what we're opening with.
progressDlg->SetOpeningWith(openWith);
}
// Open the dialog.
rv = progressDlg->Open(nsnull, nsnull);
if(NS_SUCCEEDED(rv))
{
// Send notifications to the dialog.
this->SetWebProgressListener(progressDlg);
}
}
rv = dl->Init(mSourceUrl, local, nsnull, openWith, mTimeDownloadStarted, nsnull);
if (NS_FAILED(rv)) return rv;
dl->SetObserver(this);
nsCOMPtr<nsIWebProgressListener> listener = do_QueryInterface(dl);
if (listener)
SetWebProgressListener(listener);
return rv;
}

60
uriloader/macbuild/uriLoaderIDL.xml
Просмотреть файл

@ -790,6 +790,20 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
@ -842,6 +856,16 @@
<PATH>nsIExternalProtocolService.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
<TARGET>
@ -1581,6 +1605,20 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
@ -1633,6 +1671,16 @@
<PATH>nsIExternalProtocolService.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
</TARGETLIST>
@ -1703,6 +1751,18 @@
<PATH>nsIExternalProtocolService.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>headers</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>headers</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsIDownload.idl</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUPLIST>
</PROJECT>

17
xpfe/communicator/resources/content/contentAreaUtils.js
Просмотреть файл

@ -286,17 +286,8 @@ function foundHeaderInfo(aSniffer, aData)
bypassCache : aData.bypassCache
};
// Create persist object and progress dialog, connect them up, and
// initiate download.
var dialog = makeProgressDialog();
var persist = makeWebBrowserPersist();
dialog.source = makeURL(aData.url);
dialog.target = persistArgs.target;
// Set up the persist object to do the download/save.
persist.progressListener = dialog;
// Calculate persist flags.
const nsIWBP = Components.interfaces.nsIWebBrowserPersist;
const flags = nsIWBP.PERSIST_FLAGS_NO_CONVERSION | nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
@ -308,6 +299,9 @@ function foundHeaderInfo(aSniffer, aData)
if (shouldDecode)
persist.persistFlags &= ~nsIWBP.PERSIST_FLAGS_NO_CONVERSION;
// Create download and initiate it (below)
var dl = Components.classes["@mozilla.org/download;1"].createInstance(Components.interfaces.nsIDownload);
if (isDocument && fp.filterIndex != 1) {
// Saving a Document, not a URI:
var filesFolder = null;
@ -335,12 +329,11 @@ function foundHeaderInfo(aSniffer, aData)
}
const kWrapColumn = 80;
dialog.open(null, persist);
dl.init(aSniffer.uri, persistArgs.target, null, null, null, persist);
persist.saveDocument(persistArgs.source, persistArgs.target, filesFolder,
persistArgs.contentType, encodingFlags, kWrapColumn);
} else {
dialog.open(null, persist);
dl.init(source, persistArgs.target, null, null, null, persist);
persist.saveURI(source, persistArgs.postData, persistArgs.target);
}
}

7
xpfe/communicator/resources/content/tasksOverlay.js
Просмотреть файл

@ -77,6 +77,13 @@ function toHistory()
}
function toDownloadManager()
{
var dlmgr = Components.classes['@mozilla.org/download-manager;1'].getService();
dlmgr = dlmgr.QueryInterface(Components.interfaces.nsIDownloadManager);
dlmgr.open(window);
}
function toJavaScriptConsole()
{
toOpenWindowByType("global:console", "chrome://global/content/console.xul");

1
xpfe/communicator/resources/content/tasksOverlay.xul
Просмотреть файл

@ -61,6 +61,7 @@
<menuitem label="&importUtilCmd.label;" accesskey="&importUtilCmd.accesskey;" oncommand="toImport()"/>
<menuitem id="java" label="&javaConsoleCmd.label;" accesskey="&javaConsoleCmd.accesskey;" oncommand="toJavaConsole()"/>
<menuitem label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
<menuitem label="&downloadManagerCmd.label;" accesskey="&downloadManagerCmd.accesskey;" oncommand="toDownloadManager();"/>
</menupopup>
</menu>
<menuseparator id="sep-window-list"/>

3
xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
Просмотреть файл

@ -25,6 +25,9 @@
<!ENTITY javaScriptConsoleCmd.label "JavaScript Console">
<!ENTITY javaScriptConsoleCmd.accesskey "S">
<!ENTITY downloadManagerCmd.label "Download Manager">
<!ENTITY downloadManagerCmd.accesskey "D">
<!-- LOCALIZATION NOTE (privacyMenu.label): DONT_TRANSLATE -->
<!ENTITY privacyMenu.label "Privacy &amp; Security">
<!ENTITY privacyMenu.accesskey "p">

2
xpfe/components/Makefile.in
Просмотреть файл

@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = bookmarks directory filepicker find history search sidebar related regviewer xfer prefwindow shistory timebomb console autocomplete updates urlbarhistory intl resetPref
DIRS = bookmarks directory download-manager filepicker find history search sidebar related regviewer xfer prefwindow shistory timebomb console autocomplete updates urlbarhistory intl resetPref
ifdef MOZ_ENABLE_XREMOTE
DIRS += xremote

6
xpfe/components/build/Makefile.in
Просмотреть файл

@ -43,6 +43,10 @@ REQUIRES = xpcom \
mork \
widget \
dom \
downloadmanager \
uriloader \
webbrowserpersist \
progressDlg \
pref \
docshell \
webshell \
@ -63,6 +67,7 @@ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)history_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)appcompintl_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)related_s.$(LIB_SUFFIX) \
@ -75,6 +80,7 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../autocomplete/src \
-I$(srcdir)/../bookmarks/src \
-I$(srcdir)/../directory \
-I$(srcdir)/../download-manager/src \
-I$(srcdir)/../history/src \
-I$(srcdir)/../related/src \
-I$(srcdir)/../search/src \

5
xpfe/components/build/makefile.win
Просмотреть файл

@ -43,9 +43,12 @@ REQUIRES = xpcom \
content \
history \
search \
progressDlg \
related \
urlbarhistory \
uriloader \
mozldap \
webbrowserpersist \
$(NULL)
LCFLAGS = -DWIN32_LEAN_AND_MEAN
@ -62,6 +65,7 @@ SUB_LIBRARIES= \
$(DIST)\lib\autocomplete_s.lib \
$(DIST)\lib\bookmarks_s.lib \
$(DIST)\lib\directory_s.lib \
$(DIST)\lib\downloadmanager_s.lib \
$(DIST)\lib\history_s.lib \
$(DIST)\lib\appcompintl_s.lib \
$(DIST)\lib\related_s.lib \
@ -88,6 +92,7 @@ INCS = $(INCS) \
-I$(DEPTH)\xpfe\components\autocomplete\src \
-I$(DEPTH)\xpfe\components\bookmarks\src \
-I$(DEPTH)\xpfe\components\directory \
-I$(DEPTH)\xpfe\components\download-manager\src \
-I$(DEPTH)\xpfe\components\history\src \
-I$(DEPTH)\xpfe\components\related\src \
-I$(DEPTH)\xpfe\components\search\src \

8
xpfe/components/build/nsModule.cpp
Просмотреть файл

@ -39,6 +39,8 @@
#include "nsAutoComplete.h"
#include "nsBookmarksService.h"
#include "nsDirectoryViewer.h"
#include "nsDownloadManager.h"
#include "nsDownloadProxy.h"
#include "nsGlobalHistory.h"
#include "rdf.h"
#include "nsTimeBomb.h"
@ -63,6 +65,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteResults)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPIndex, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(LocalSearchDataSource, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(InternetSearchDataSource, Init)
@ -147,6 +151,10 @@ static const nsModuleComponentInfo components[] = {
nsHTTPIndexConstructor },
{ "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_DATASOURCE_CONTRACTID,
nsHTTPIndexConstructor },
{ "Download Manager", NS_DOWNLOADMANAGER_CID, NS_DOWNLOADMANAGER_CONTRACTID,
nsDownloadManagerConstructor },
{ "Download", NS_DOWNLOAD_CID, NS_DOWNLOAD_CONTRACTID,
nsDownloadProxyConstructor },
{ "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_CONTRACTID,
nsGlobalHistoryConstructor },
{ "Global History", NS_GLOBALHISTORY_CID, NS_GLOBALHISTORY_DATASOURCE_CONTRACTID,

4
xpfe/components/download-manager/src/Makefile.in
Просмотреть файл

@ -45,6 +45,10 @@ CPPSRCS = \
nsDownloadManager.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a
# static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

30
xpfe/components/macbuild/appcomps.xml
Просмотреть файл

@ -1054,6 +1054,13 @@
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsDownloadManager.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
@ -1161,6 +1168,11 @@
<PATH>UnicharUtilsStaticDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsDownloadManager.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
<TARGET>
@ -2164,6 +2176,13 @@
<FILEKIND>Library</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsDownloadManager.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
@ -2271,6 +2290,11 @@
<PATH>UnicharUtilsStatic.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsDownloadManager.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
</TARGETLIST>
@ -2342,6 +2366,12 @@
<PATH>nsUrlbarHistory.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>AppCompsDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsDownloadManager.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>
<GROUP><NAME>Search</NAME>
<FILEREF>

1
xpfe/components/makefile.win
Просмотреть файл

@ -33,6 +33,7 @@ DIRS= \
regviewer \
related \
xfer \
download-manager \
shistory \
timebomb \
console \

2
xpinstall/packager/packages-mac
Просмотреть файл

@ -92,6 +92,7 @@ viewer:Components:cookie.xpt
viewer:Components:Cookie.shlb
viewer:Components:appcomps.shlb
viewer:Components:Directory.xpt
viewer:Components:downloadmanager.xpt
viewer:Components:docshell.xpt
viewer:Components:dom.shlb
viewer:Components:dom.xpt
@ -203,6 +204,7 @@ viewer:Components:xmlextras.shlb
viewer:Components:xmlsoap.xpt
viewer:Components:nsHelperAppDlg.js
viewer:Components:nsProgressDialog.js
viewer:Components:nsDownloadProgressListener.js
viewer:Components:transformiix.xpt
viewer:Components:transformiix.shlb
viewer:Components:nsCloseAllWindows.js

2
xpinstall/packager/packages-static-unix
Просмотреть файл

@ -56,6 +56,7 @@ bin/res/cmessage.txt
bin/components/bookmarks.xpt
bin/components/directory.xpt
bin/components/downloadmanager.xpt
bin/components/history.xpt
bin/components/timebomb.xpt
bin/components/related.xpt
@ -159,6 +160,7 @@ bin/components/nsHelperAppDlg.js
bin/components/helperAppDlg.xpt
bin/components/nsProgressDialog.js
bin/components/progressDlg.xpt
bin/components/nsDownloadProgressListener.js
bin/components/transformiix.xpt
bin/chrome/help.jar

2
xpinstall/packager/packages-static-win
Просмотреть файл

@ -66,6 +66,7 @@ bin\components\autocomplete.xpt
bin\components\bookmarks.xpt
bin\components\crypto.dll
bin\components\directory.xpt
bin\components\downloadmanager.xpt
bin\components\commandhandler.xpt
bin\components\history.xpt
bin\components\winhooks.xpt
@ -178,6 +179,7 @@ bin\components\nsHelperAppDlg.js
bin\components\helperAppDlg.xpt
bin\components\nsProgressDialog.js
bin\components\progressDlg.xpt
bin\components\nsDownloadProgressListener.js
bin\components\transformiix.xpt

2
xpinstall/packager/packages-unix
Просмотреть файл

@ -67,6 +67,7 @@ bin/libxlibrgb.so
bin/components/libappcomps.so
bin/components/bookmarks.xpt
bin/components/directory.xpt
bin/components/downloadmanager.xpt
bin/components/history.xpt
bin/components/timebomb.xpt
bin/components/related.xpt
@ -243,6 +244,7 @@ bin/components/nsHelperAppDlg.js
bin/components/helperAppDlg.xpt
bin/components/nsProgressDialog.js
bin/components/progressDlg.xpt
bin/components/nsDownloadProgressListener.js
bin/components/transformiix.xpt
bin/components/libtransformiix.so
bin/components/libfileview.so

2
xpinstall/packager/packages-win
Просмотреть файл

@ -78,6 +78,7 @@ bin\components\appcomps.dll
bin\components\autocomplete.xpt
bin\components\bookmarks.xpt
bin\components\directory.xpt
bin\components\downloadmanager.xpt
bin\components\embedcomponents.dll
bin\components\commandhandler.xpt
bin\components\history.xpt
@ -255,6 +256,7 @@ bin\components\nsHelperAppDlg.js
bin\components\helperAppDlg.xpt
bin\components\nsProgressDialog.js
bin\components\progressDlg.xpt
bin\components\nsDownloadProgressListener.js
bin\components\transformiix.xpt
bin\components\transformiix.dll
bin\ISimpleDOMNodeMarshal.dll