Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 120931; remember last used directory (for older versions of windows that don't do it automatically); r=cmanske, sr=ben

Browse Source
This commit is contained in:
law%netscape.com 2002-02-01 23:58:55 +00:00
parent 17c1fbaea0
commit 89a16867ae
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
widget/src/windows/nsFilePicker.cpp
View File

@ -45,6 +45,8 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CI
NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker)
char nsFilePicker::mLastUsedDirectory[MAX_PATH+1] = { 0 };
//-------------------------------------------------------------------------
//
// nsFilePicker constructor
@ -56,6 +58,7 @@ nsFilePicker::nsFilePicker()
mWnd = NULL;
mUnicodeEncoder = nsnull;
mUnicodeDecoder = nsnull;
mSelectedType = 1;
mDisplayDirectory = do_CreateInstance("@mozilla.org/file/local;1");
}
@ -97,6 +100,15 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
title = ToNewCString(mTitle);
char *initialDir;
mDisplayDirectory->GetPath(&initialDir);
// If no display directory, re-use the last one.
if(!initialDir || !*initialDir) {
// Free empty string returned from GetPath.
if (initialDir) {
nsMemory::Free(initialDir);
}
// Allocate copy of last used dir.
initialDir = NS_STATIC_CAST( char*, nsMemory::Clone(mLastUsedDirectory, PL_strlen(mLastUsedDirectory)+1) );
}
mFile.SetLength(0);
@ -206,12 +218,6 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
// Remember what filter type the user selected
mSelectedType = (PRInt16)ofn.nFilterIndex;
// Store the current directory in mDisplayDirectory
char* newCurrentDirectory = NS_STATIC_CAST( char*, nsMemory::Alloc( MAX_PATH+1 ) );
VERIFY(::GetCurrentDirectory(MAX_PATH, newCurrentDirectory) > 0);
mDisplayDirectory->InitWithPath(newCurrentDirectory);
nsMemory::Free( newCurrentDirectory );
// Clean up filter buffers
if (filterBuffer)
nsMemory::Free( filterBuffer );
@ -234,15 +240,30 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
if (result) {
PRInt16 returnOKorReplace = returnOK;
// Remember last used directory.
nsCOMPtr<nsILocalFile> file(do_CreateInstance("@mozilla.org/file/local;1"));
NS_ENSURE_TRUE(file, NS_ERROR_FAILURE);
file->InitWithPath(mFile.get());
nsCOMPtr<nsIFile> dir;
if (NS_SUCCEEDED(file->GetParent(getter_AddRefs(dir)))) {
nsCOMPtr<nsILocalFile> localDir(do_QueryInterface(dir));
if (localDir) {
char *newDir;
localDir->GetPath(&newDir);
if(newDir) {
PL_strncpyz(mLastUsedDirectory, newDir, MAX_PATH+1);
nsMemory::Free(newDir);
}
// Update mDisplayDirectory with this directory, also.
// Some callers rely on this.
mDisplayDirectory->InitWithPath( mLastUsedDirectory );
}
}
if (mMode == modeSave) {
// Windows does not return resultReplace,
// we must check if file already exists
nsCOMPtr<nsILocalFile> file(do_CreateInstance("@mozilla.org/file/local;1"));
NS_ENSURE_TRUE(file, NS_ERROR_FAILURE);
file->InitWithPath(mFile.get());
PRBool exists = PR_FALSE;
file->Exists(&exists);
if (exists)

2
widget/src/windows/nsFilePicker.h
View File

@ -81,6 +81,8 @@ protected:
nsCOMPtr<nsILocalFile> mDisplayDirectory;
PRInt16 mSelectedType;
static char mLastUsedDirectory[];
};
#endif // nsFilePicker_h__