tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-14 09:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

[CHANGE_BEHAVIOUR] Set current working directory in browser, if Find in files combo is empty.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@436 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2009-03-10 00:46:00 +00:00
parent 22cae478e8
commit c81c6ab82a
6 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -58,7 +58,7 @@ void writeLog(const TCHAR *logFileName, const char *log2write)
fclose(f); fclose(f);
} }
void folderBrowser(HWND parent, int outputCtrlID) void folderBrowser(HWND parent, int outputCtrlID, const TCHAR *defaultStr)
{ {
// This code was copied and slightly modifed from: // This code was copied and slightly modifed from:
// http://www.bcbdev.com/faqs/faq62.htm // http://www.bcbdev.com/faqs/faq62.htm
@ -83,7 +83,10 @@ void folderBrowser(HWND parent, int outputCtrlID)
info.lpfn = BrowseCallbackProc; info.lpfn = BrowseCallbackProc;
TCHAR directory[MAX_PATH]; TCHAR directory[MAX_PATH];
::GetDlgItemText(parent, outputCtrlID, directory, sizeof(directory)); ::GetDlgItemText(parent, outputCtrlID, directory, sizeof(directory));
info.lParam = reinterpret_cast<LPARAM>(directory); if (!directory[0] && defaultStr)
info.lParam = reinterpret_cast<LPARAM>(defaultStr);
else
info.lParam = reinterpret_cast<LPARAM>(directory);
// Execute the browsing dialog. // Execute the browsing dialog.
LPITEMIDLIST pidl = ::SHBrowseForFolder(&info); LPITEMIDLIST pidl = ::SHBrowseForFolder(&info);

2
PowerEditor/src/MISC/Common/Common.h
View File

@ -73,7 +73,7 @@
#define COPYDATA_FILENAMES COPYDATA_FILENAMESA #define COPYDATA_FILENAMES COPYDATA_FILENAMESA
#endif #endif
void folderBrowser(HWND parent, int outputCtrlID); void folderBrowser(HWND parent, int outputCtrlID, const TCHAR *defaultStr = NULL);
// Set a call back with the handle after init to set the path. // Set a call back with the handle after init to set the path.
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/callbackfunctions/browsecallbackproc.asp // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/callbackfunctions/browsecallbackproc.asp

14
PowerEditor/src/Notepad_plus.cpp
View File

@ -740,7 +740,7 @@ BufferID Notepad_plus::doOpen(const TCHAR *fileName, bool isReadOnly)
{ {
//::MessageBox(_hSelf, fileName, TEXT("Dir"), MB_OK); //::MessageBox(_hSelf, fileName, TEXT("Dir"), MB_OK);
vector<generic_string> fileNames; vector<generic_string> fileNames;
vector<wstring> patterns; vector<generic_string> patterns;
patterns.push_back(TEXT("*.*")); patterns.push_back(TEXT("*.*"));
generic_string fileNameStr = fileName; generic_string fileNameStr = fileName;
@ -1632,7 +1632,10 @@ bool Notepad_plus::replaceInFiles()
vector<generic_string> patterns2Match; vector<generic_string> patterns2Match;
if (_findReplaceDlg.getFilters() == TEXT("")) if (_findReplaceDlg.getFilters() == TEXT(""))
_findReplaceDlg.setFindInFilesDirFilter(NULL, TEXT("*.*")); {
NppParameters *pNppParam = NppParameters::getInstance();
_findReplaceDlg.setFindInFilesDirFilter(pNppParam->getWorkingDir(), TEXT("*.*"));
}
_findReplaceDlg.getPatterns(patterns2Match); _findReplaceDlg.getPatterns(patterns2Match);
vector<generic_string> fileNames; vector<generic_string> fileNames;
@ -1710,7 +1713,10 @@ bool Notepad_plus::findInFiles()
vector<generic_string> patterns2Match; vector<generic_string> patterns2Match;
if (_findReplaceDlg.getFilters() == TEXT("")) if (_findReplaceDlg.getFilters() == TEXT(""))
_findReplaceDlg.setFindInFilesDirFilter(NULL, TEXT("*.*")); {
NppParameters *pNppParam = NppParameters::getInstance();
_findReplaceDlg.setFindInFilesDirFilter(pNppParam->getWorkingDir(), TEXT("*.*"));
}
_findReplaceDlg.getPatterns(patterns2Match); _findReplaceDlg.getPatterns(patterns2Match);
vector<generic_string> fileNames; vector<generic_string> fileNames;
@ -9654,7 +9660,7 @@ void Notepad_plus::setFindReplaceFolderFilter(const TCHAR *dir, const TCHAR *fil
generic_string fltr; generic_string fltr;
NppParameters *pNppParam = NppParameters::getInstance(); NppParameters *pNppParam = NppParameters::getInstance();
// get current direcroty and current language file extensions in case they are not provided. // get current language file extensions in case they are not provided.
if (!dir) if (!dir)
{ {

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -1023,7 +1023,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
case IDD_FINDINFILES_BROWSE_BUTTON : case IDD_FINDINFILES_BROWSE_BUTTON :
{ {
if (_currentStatus == FINDINFILES_DLG) if (_currentStatus == FINDINFILES_DLG)
folderBrowser(_hSelf, IDD_FINDINFILES_DIR_COMBO); folderBrowser(_hSelf, IDD_FINDINFILES_DIR_COMBO, _directory.c_str());
} }
return TRUE; return TRUE;

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
View File

@ -345,7 +345,7 @@ public :
if (dir) if (dir)
{ {
_directory = dir; _directory = dir;
::SetDlgItemText(_hSelf, IDD_FINDINFILES_DIR_COMBO, dir); //::SetDlgItemText(_hSelf, IDD_FINDINFILES_DIR_COMBO, dir);
} }
if (filters) if (filters)
{ {

6
PowerEditor/src/resource.h
View File

@ -18,9 +18,9 @@
#ifndef RESOURCE_H #ifndef RESOURCE_H
#define RESOURCE_H #define RESOURCE_H
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.2") #define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.3")
#define VERSION_VALUE TEXT("5.2\0") // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 #define VERSION_VALUE TEXT("5.3\0") // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
#define VERSION_DIGITALVALUE 5, 2, 0, 0 #define VERSION_DIGITALVALUE 5, 3, 0, 0
#ifdef UNICODE #ifdef UNICODE
#define UNICODE_ANSI_MODE TEXT("(UNICODE)") #define UNICODE_ANSI_MODE TEXT("(UNICODE)")