Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/notepad-plus-plus/notepad-plus-plus

Browse Source
This commit is contained in:
Don HO 2016-07-09 16:47:37 +02:00
commit 59238e5a2e
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/bin/change.log
View File

@ -1,6 +1,6 @@
Notepad++ v6.9.2 new features and bug-fixes:
1. Add most wanted feature: Log Mornitoring (tail -f).
1. Add most wanted feature: Log Monitoring (tail -f).
2. Add new feature: Find in Finder.
3. Fix status bar display bug in high dpi environment.
4. Fix open in explorer problem while path contain unusual characters.

5
PowerEditor/installer/nativeLang/polish.xml
View File

@ -290,7 +290,7 @@
<Item id="47010" name="Argumenty linii poleceń..."/>
<Item id="47011" name="Pomoc na żywo"/>
<Item id="48005" name="Importuj wtyczki..."/>
<Item id="48006" name="Import motywy..."/>
<Item id="48006" name="Importuj motywy..."/>
<Item id="48009" name="Skróty klawiaturowe..."/>
<Item id="48011" name="Preferencje..."/>
<Item id="48016" name="Zmień skrót/usuń makro..."/>
@ -803,7 +803,7 @@
</Cloud>
<MISC title="Inne">
<Item id="6114" name="Umożliwić przełączanie"/>
<Item id="6114" name="Umożliwiaj przełączanie"/>
<Item id="6115" name="Automatyczne wcięcia"/>
<Item id="6117" name="Kolejność ostatniego użycia (MRU)"/>
<Item id="6307" name="Włącz"/>
@ -849,6 +849,7 @@
<Item id="2033" name="Wstaw liczby"/>
<Item id="2030" name="Zacznij od:"/>
<Item id="2031" name="Zwiększaj o:"/>
<Item id="2036" name="Powtarzaj:"/>
<Item id="2035" name="Dopełniaj zerami"/>
<Item id="2032" name="Format"/>
<Item id="2024" name="Dec"/>

4
PowerEditor/installer/nativeLang/turkish.xml
View File

@ -86,7 +86,8 @@
<Item id="41015" name="Kopya Olarak Kaydet"/>
<Item id="41016" name="Diskten Sil"/>
<Item id="41017" name="Yeniden Adlandır"/>
<Item id="41021" name="Son Kapatılan Dosyaları Geri Yükle"/>
<Item id="41021" name="Son Kapatılan Dosyayı Geri Yükle"/>
<Item id="41022" name="Klasörü Çalışma Alanı Olarak Aç"/>
<Item id="42001" name="K&amp;es"/>
<Item id="42002" name="&amp;Kopyala"/>
@ -848,6 +849,7 @@
<Item id="2030" name="Başlangıç sayısı:"/>
<Item id="2031" name="Artış miktarı:"/>
<Item id="2035" name="Başına sıfır ekle"/>
<Item id="2036" name="Tekrar :"/>
<Item id="2032" name="Biçim"/>
<Item id="2024" name="Onlu"/>
<Item id="2025" name="Sekizli"/>

8
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
View File

@ -470,10 +470,10 @@ void PluginsManager::notify(const SCNotification *notification)
}
catch (...)
{
TCHAR funcInfo[128];
TCHAR funcInfo[256];
generic_sprintf(funcInfo, TEXT("notify(SCNotification *notification) : \r notification->nmhdr.code == %d\r notification->nmhdr.hwndFrom == %p\r notification->nmhdr.idFrom == %d"),\
scNotif.nmhdr.code, scNotif.nmhdr.hwndFrom, scNotif.nmhdr.idFrom);
pluginCrashAlert(_pluginsCommands[i]._pluginName.c_str(), funcInfo);
pluginCrashAlert(_pluginInfos[i]->_moduleName.c_str(), funcInfo);
}
}
}
@ -498,7 +498,7 @@ void PluginsManager::relayNppMessages(UINT Message, WPARAM wParam, LPARAM lParam
{
TCHAR funcInfo[128];
generic_sprintf(funcInfo, TEXT("relayNppMessages(UINT Message : %d, WPARAM wParam : %d, LPARAM lParam : %d)"), Message, wParam, lParam);
pluginCrashAlert(_pluginsCommands[i]._pluginName.c_str(), TEXT(""));
pluginCrashAlert(_pluginInfos[i]->_moduleName.c_str(), funcInfo);
}
}
}
@ -529,7 +529,7 @@ bool PluginsManager::relayPluginMessages(UINT Message, WPARAM wParam, LPARAM lPa
{
TCHAR funcInfo[128];
generic_sprintf(funcInfo, TEXT("relayPluginMessages(UINT Message : %d, WPARAM wParam : %d, LPARAM lParam : %d)"), Message, wParam, lParam);
pluginCrashAlert(_pluginsCommands[i]._pluginName.c_str(), funcInfo);
pluginCrashAlert(_pluginInfos[i]->_moduleName.c_str(), funcInfo);
}
return true;
}

4
PowerEditor/src/MISC/PluginsManager/PluginsManager.h
View File

@ -142,9 +142,9 @@ private:
void pluginCrashAlert(const TCHAR *pluginName, const TCHAR *funcSignature)
{
generic_string msg = pluginName;
msg += TEXT(" just crash in\r");
msg += TEXT(" just crashed in\r");
msg += funcSignature;
::MessageBox(NULL, msg.c_str(), TEXT(" just crash in\r"), MB_OK|MB_ICONSTOP);
::MessageBox(NULL, msg.c_str(), TEXT("Plugin Crash"), MB_OK|MB_ICONSTOP);
}
bool isInLoadedDlls(const TCHAR *fn) const