tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix "Go to/Open in another instance" bug. 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@378 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2008-12-29 13:19:48 +00:00
parent 6e0caa10c6
commit 17453dea5b
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/Notepad_plus.cpp
View File

@ -4919,10 +4919,12 @@ void Notepad_plus::docOpenInNewInstance(FileTransferMode mode)
TCHAR nppName[MAX_PATH];
::GetModuleFileName(NULL, nppName, MAX_PATH);
std::generic_string command;
std::generic_string command = TEXT("\"");
command += nppName;
command += TEXT("\"");
command += TEXT(" \"$(FULL_CURRENT_PATH)\" -multiInst -nosession");
//Command cmd(TEXT("$(NPP_DIRECTORY)\\notepad++.exe $(FULL_CURRENT_PATH) -multiInst -nosession"));
Command cmd(command);
cmd.run(_hSelf);
if (mode == TransferMove)

4
PowerEditor/src/Notepad_plus.rc
View File

@ -271,7 +271,7 @@ BEGIN
BEGIN
MENUITEM "Toggle Full Screen Mode", IDM_VIEW_FULLSCREENTOGGLE
MENUITEM "Always on top", IDM_VIEW_ALWAYSONTOP
MENUITEM "PostIt", IDM_VIEW_POSTIT
MENUITEM "Post-it", IDM_VIEW_POSTIT
MENUITEM SEPARATOR
MENUITEM "Show White Space and TAB", IDM_VIEW_TAB_SPACE
@ -320,7 +320,7 @@ BEGIN
MENUITEM "Clone to another view", IDM_VIEW_CLONE_TO_ANOTHER_VIEW
MENUITEM "Focus on other view", IDM_VIEW_SWITCHTO_OTHER_VIEW // working, but no need in menu
MENUITEM "Go to new instance", IDM_VIEW_GOTO_NEW_INSTANCE
MENUITEM "Open to new instance", IDM_VIEW_LOAD_IN_NEW_INSTANCE
MENUITEM "Open in new instance", IDM_VIEW_LOAD_IN_NEW_INSTANCE
MENUITEM SEPARATOR
MENUITEM "Synchronize Vertical Scrolling", IDM_VIEW_SYNSCROLLV
MENUITEM "Synchronize Horizontal Scrolling", IDM_VIEW_SYNSCROLLH

2
PowerEditor/src/Parameters.cpp
View File

@ -680,7 +680,7 @@ bool NppParameters::load()
TCHAR nativeLangPath[MAX_PATH];
lstrcpy(nativeLangPath, userPath);
PathAppend(nativeLangPath, TEXT("nativeLang.xml"));
if (!PathFileExists(nativeLangPath))
{
lstrcpy(nativeLangPath, _nppPath);

2
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -142,7 +142,7 @@ BEGIN
CONTROL "UCS-2 small endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,64,78,102,10
RTEXT "Default Language :",IDC_DEFAULTLANG_STATIC,203,81,77,8
COMBOBOX IDC_COMBO_DEFAULTLANG,285,79,60,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "New Document",IDC_STATIC,47,2,304,104,BS_CENTER
GROUPBOX "New Document",IDC_NEWDOCUMENT_GR_STATIC,47,2,304,104,BS_CENTER
GROUPBOX "File Open/Save Directory",IDC_OPENSAVEDIR_GR_STATIC,47,114,304,61,BS_CENTER
CONTROL "Follow the current document",IDC_OPENSAVEDIR_FOLLOWCURRENT_RADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,64,126,200,10
CONTROL "Remember the last operation directory",IDC_OPENSAVEDIR_REMEMBERLAST_RADIO,"Button",BS_AUTORADIOBUTTON,64,141,217,10

1
PowerEditor/src/WinControls/Preference/preference_rc.h
View File

@ -126,6 +126,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define IDC_OPENSAVEDIR_ALWAYSON_RADIO (IDD_PREFERENCE_NEWDOCSETTING_BOX + 16)
#define IDC_OPENSAVEDIR_ALWAYSON_EDIT (IDD_PREFERENCE_NEWDOCSETTING_BOX + 17)
#define IDD_OPENSAVEDIR_ALWAYSON_BROWSE_BUTTON (IDD_PREFERENCE_NEWDOCSETTING_BOX + 18)
#define IDC_NEWDOCUMENT_GR_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 19)
#define IDD_PREFERENCE_LANG_BOX 6500 //(IDD_PREFERENCE_BOX + 500)
#define IDC_LIST_ENABLEDLANG (IDD_PREFERENCE_LANG_BOX + 1)