Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for #10737 (ftp download), overhauled to work better with Necko; r=valeski

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@53412 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
law%netscape.com
1999-11-13 05:37:00 +00:00
parent 6aeba41e73
commit c4a2b4eb53
12 changed files with 583 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp
View File

@@ -83,7 +83,7 @@ nsFileSpecWithUIImpl::~nsFileSpecWithUIImpl()
NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseOutputFile(
const char *windowTitle,
const char *suggestedLeafName,
nsIFileSpecWithUI::StandardFilterMask outMask)
PRUint32 outMask)
//----------------------------------------------------------------------------------------
{
if (!mBaseFileSpec)
@@ -101,10 +101,10 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseOutputFile(
SetFileWidgetFilterList(fileWidget, outMask, nsnull, nsnull);
nsFileSpec spec;
// If there is a filespec specified, then start there.
if (GetFileSpec(&spec) != NS_ERROR_NOT_INITIALIZED)
fileWidget->SetDisplayDirectory(spec);
SetFileWidgetStartDir(fileWidget);
nsFileSpec spec;
nsString winTitle(windowTitle);
@@ -129,7 +129,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseFile(const char *title, char **_retval
// ---------------------------------------------------------------------------
void nsFileSpecWithUIImpl::SetFileWidgetFilterList(
nsIFileWidget* fileWidget, nsIFileSpecWithUI::StandardFilterMask mask,
nsIFileWidget* fileWidget, PRUint32 mask,
const char *inExtraFilterTitle, const char *inExtraFilter)
{
if (!fileWidget) return;
@@ -199,10 +199,24 @@ Clean:
delete [] filters;
}
//----------------------------------------------------------------------------------------
void nsFileSpecWithUIImpl::SetFileWidgetStartDir( nsIFileWidget *fileWidget ) {
// We set the file widget's starting directory to the one specified by this nsIFileSpec.
if ( mBaseFileSpec && fileWidget ) {
nsFileSpec spec;
nsresult rv = mBaseFileSpec->GetFileSpec( &spec );
if ( NS_SUCCEEDED( rv ) && spec.Valid() ) {
// Set as starting directory in file widget.
fileWidget->SetDisplayDirectory( spec );
}
}
}
//----------------------------------------------------------------------------------------
NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseInputFile(
const char *inTitle,
nsIFileSpecWithUI::StandardFilterMask inMask,
PRUint32 inMask,
const char *inExtraFilterTitle, const char *inExtraFilter)
//----------------------------------------------------------------------------------------
{
@@ -220,6 +234,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseInputFile(
SetFileWidgetFilterList(fileWidget, inMask,
inExtraFilterTitle, inExtraFilter);
SetFileWidgetStartDir(fileWidget);
nsString winTitle(inTitle);
if (fileWidget->GetFile(nsnull, winTitle, spec) != nsFileDlgResults_OK)
rv = NS_FILE_FAILURE;
@@ -243,6 +258,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseDirectory(const char *title, char **_r
(void**)getter_AddRefs(fileWidget));
if (NS_FAILED(rv))
return rv;
SetFileWidgetStartDir(fileWidget);
nsFileSpec spec;
if (fileWidget->GetFolder(nsnull, title, spec) != nsFileDlgResults_OK)
rv = NS_FILE_FAILURE;