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

[RELEASE] Notepad++ 5.9.5 release. 

[NEW_FEATURE] Make Project panel translatable.
[UPDATE] Update the localization files.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@831 f5eea248-9336-0410-98b8-ebc06183d4e3
remotes/trunk v5.9.5
Don Ho 2011-10-23 12:53:16 +00:00
parent 9a2f0eeb73
commit 077bcf56d1
19 changed files with 315 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PowerEditor/bin/change.log
View File

@ -1,11 +1,9 @@
Notepad++ v5.9.4 new features and fixed bugs:
Notepad++ v5.9.5 new features and fixed bugs:
1. Add 3 Project Panels for the management of projects
2. Doc Switcher can be sorted now.
3. Fix a crash bug - crash on launch time if default User defined language was set on the previous session.
4. Fix crash issue while printing for some printers.
5. Fix ANSI version Clipboard history entries display bug.
6. Fix wrong display of tab number setting dialog in Lang Menu/Tab settings of Preferences dialog.
1. Fix Project Panel loading non-project file bug.
2. Fix saving project file bug while saving it on the root.
3. Fix adding/hidding Language Menue item problem in Preference dialog.
4. Make Project Panel translatable.

BIN
PowerEditor/bin/npp.pdb
View File

Binary file not shown.

60
PowerEditor/installer/nativeLang/chinese.xml
View File

@ -32,12 +32,13 @@
<Item posX="2" posY="17" name="清除顏色標記"/>
<Item posX="2" posY="18" name="到上一個顏色標記"/>
<Item posX="2" posY="19" name="到下一個顏色標記"/>
<Item posX="2" posY="21" name="ŽŃĹŇ"/>
<Item posX="3" posY="4" name="ŻSŽíŚr¤¸"/>
<Item posX="2" posY="21" name="書籤"/>
<Item posX="3" posY="4" name="特殊字元"/>
<Item posX="3" posY="5" name="焦距"/>
<Item posX="3" posY="6" name="現行文件移動│拷貝"/>
<Item posX="3" posY="16" name="§éĹ|źhŚ¸"/>
<Item posX="3" posY="16" name="折疊層次"/>
<Item posX="3" posY="17" name="伸展層次"/>
<Item posX="3" posY="21" name="計劃專案"/>
<Item posX="4" posY="5" name="編碼字符集"/>
<Item posX="4" posY="5" posZ="0" name="阿拉伯文"/>
<Item posX="4" posY="5" posZ="1" name="波羅的語族"/>
@ -184,7 +185,9 @@
<Item id="44036" name="雙窗水平同步捲動"/>
<Item id="44041" name="顯示斷行字元"/>
<Item id="44072" name="主副視窗切換"/>
<Item id="44081" name="專案管理員 1"/>
<Item id="44082" name="專案管理員 2"/>
<Item id="44083" name="專案管理員 3"/>
<Item id="45001" name="轉換成 Windows 格式"/>
<Item id="45002" name="轉換成 UNIX 格式"/>
<Item id="45003" name="轉換成 Mac 格式"/>
@ -588,5 +591,52 @@
<Item id="2" name="取消"/>
</ColumnEditor>
</Dialog>
<MessageBox>
<ContextMenuXmlEditWaring title="Editing contextMenu" message="Editing contextMenu.xml allows you to modify your Notepad++ popup context menu.\rYou have to restart your Notepad++ to take effect after modifying contextMenu.xml."/>
<NppHelpAbsentWaring title="File does not exist" message="\rdoesn't exist. Please download it on Notepad++ site."/>
<SaveCurrentModifWaring title="Save Current Modification" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
<LoseUndoAbilityWaring title="Lose Undo Ability Waning" message="You should save the current modification.\rAll the saved modifications can not be undone.\r\rContinue?"/>
<CannotMoveDoc title="Move to new Notepad++ Instance" message="Document is modified, save it then try again."/>
<DocReloadWarning title="Reload" message="Are you sure you want to reload the current file and lose the changes made in Notepad++?"/>
<FileLockedWarning title="Save failed" message="Please check whether if this file is opened in another program"/>
<FileAlreadyOpenedInNpp title="" message="The file is already opened in the Notepad++."/>
<DeleteFileFailed title="Delete File" message="Delete File failed"/>
</MessageBox>
<ProjectManager>
<PanelTitle name="計劃專案"/>
<WorkspaceRootName name="工作區"/>
<Menus>
<Entries>
<Item id="0" name="工作區"/>
<Item id="1" name="編輯"/>
</Entries>
<WorkspaceMenu>
<Item id="3122" name="新工作區"/>
<Item id="3123" name="開啟專案檔案"/>
<Item id="3124" name="重新載入專案檔案"/>
<Item id="3125" name="儲存"/>
<Item id="3126" name="另存專案檔案..."/>
<Item id="3127" name="儲存專案檔案拷貝至..."/>
<Item id="3121" name="新增專案"/>
</WorkspaceMenu>
<ProjectMenu>
<Item id="3111" name="重新命名"/>
<Item id="3112" name="新增文件夾"/>
<Item id="3113" name="新增檔案..."/>
<Item id="3114" name="移除"/>
</ProjectMenu>
<FolderMenu>
<Item id="3111" name="重新命名"/>
<Item id="3112" name="新增文件夾"/>
<Item id="3113" name="新增檔案..."/>
<Item id="3114" name="移除"/>
</FolderMenu>
<FileMenu>
<Item id="3111" name="重新命名"/>
<Item id="3115" name="移除"/>
<Item id="3116" name="修改檔案路徑"/>
</FileMenu>
</Menus>
</ProjectManager>
</Native-Langue>
</NotepadPlus>
</NotepadPlus>

17
PowerEditor/installer/nativeLang/czech.xml
View File

@ -1,4 +1,9 @@
<?xml version="1.0" encoding="Windows-1250" ?>
<!--
- intended for version: 5.9.4 RC
- last change: 11 Oct 2011 by Ondřej Müller (mullero@email.cz)
- all Czech translations at: http://sourceforge.net/projects/notepad-plus/forums/forum/558104/topic/3099029
-->
<NotepadPlus>
<Native-Langue name = "Čeština" filename="czech.xml" >
<Menu>
@ -20,9 +25,7 @@
<!-- Sub Menu Entries -->
<SubEntries>
<!--
<Item posX = "0" posY = "" name = "Historie posledních souborů"/>
-->
<Item posX = "0" posY = "19" name = "Historie posledních souborů"/>
<Item posX = "1" posY = "9" name = "Kopírovat do Schránky"/>
<Item posX = "1" posY = "10" name = "Odsazení"/>
<Item posX = "1" posY = "11" name = "Konverze písma (VELKÁ/malá)"/>
@ -42,6 +45,7 @@
<Item posX = "3" posY = "6" name = "Přesunout/duplikovat aktuální dokument"/>
<Item posX = "3" posY = "16" name = "Sbalit úroveň"/>
<Item posX = "3" posY = "17" name = "Rozbalit úroveň"/>
<Item posX = "3" posY = "21" name = "Projekt"/>
<Item posX = "4" posY = "5" name = "Výběr znakové sady"/>
<Item posX = "4" posY = "5" posZ = "0" name = "arabština"/>
<Item posX = "4" posY = "5" posZ = "1" name = "baltské jazyky"/>
@ -202,6 +206,9 @@
<Item id = "44041" name = "Zobrazit zalamovací znaky"/>
<Item id = "44049" name = "Souhrnné informace..."/>
<Item id = "44072" name = "Přejít na další náhled"/>
<Item id = "44081" name = "Panel 1"/>
<Item id = "44082" name = "Panel 2"/>
<Item id = "44083" name = "Panel 3"/>
<Item id = "45001" name = "Konvertovat do formátu Windows"/>
<Item id = "45002" name = "Konvertovat do formátu UNIX"/>
@ -533,9 +540,7 @@
<Item id = "6304" name = "Historie posledních souborů"/>
<Item id = "6305" name = "Nekontrolovat při startu"/>
<Item id = "6306" name = "Max. počet položek:"/>
<!--
<Item id = "" name = "Zobrazení"/>
-->
<Item id = "-1" name = "Zobrazení"/>
<Item id = "6424" name = "Podmenu"/>
<Item id = "6425" name = "Jenom název souboru"/>
<Item id = "6426" name = "Jméno souboru i s cestou"/>

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

@ -39,6 +39,7 @@
<Item posX="3" posY="6" name="Move/Clone Current Document"/>
<Item posX="3" posY="16" name="Collapse Level"/>
<Item posX="3" posY="17" name="Uncollapse Level"/>
<Item posX="3" posY="21" name="Project"/>
<Item posX="4" posY="5" name="Character Set"/>
<Item posX="4" posY="5" posZ="0" name="Arabic"/>
<Item posX="4" posY="5" posZ="1" name="Baltic"/>
@ -189,7 +190,9 @@
<Item id="44036" name="Synchronise Horizontal Scrolling"/>
<Item id="44041" name="Show Wrap Symbol"/>
<Item id="44072" name="Focus on Another View"/>
<Item id="44081" name="Project Panel 1"/>
<Item id="44082" name="Project Panel 2"/>
<Item id="44083" name="Project Panel 3"/>
<Item id="45001" name="Convert to Windows Format"/>
<Item id="45002" name="Convert to UNIX Format"/>
<Item id="45003" name="Convert to MAC Format"/>

15
PowerEditor/installer/nativeLang/french.xml
View File

@ -22,23 +22,24 @@
<SubEntries>
<Item posX="1" posY="9" name="Copier dans le presse-papiers"/>
<Item posX="1" posY="10" name="Indentation"/>
<Item posX="1" posY="11" name="MAJUSCULE/miniscule"/>
<Item posX="1" posY="11" name="MAJUSCULE/minuscule"/>
<Item posX="1" posY="12" name="Ligne"/>
<Item posX="1" posY="13" name="Commentaire"/>
<Item posX="1" posY="14" name="Autocomplétion"/>
<Item posX="1" posY="15" name="Convertir les sauts de ligne"/>
<Item posX="1" posY="16" name="Traitement des espacements"/>
<Item posX="1" posY="17" name="Collage special"/>
<Item posX="1" posY="16" name="Traitement des espacements"/>
<Item posX="1" posY="17" name="Collage special"/>
<Item posX="2" posY="14" name="Marquer tout"/>
<Item posX="2" posY="15" name="Enlever toutes les marques"/>
<Item posX="2" posY="16" name="Aller vers le haut"/>
<Item posX="2" posY="17" name="Aller vers le bas"/>
<Item posX="2" posY="21" name="Signet"/>
<Item posX="2" posY="21" name="Signet"/>
<Item posX="3" posY="4" name="Symbole spéciaux"/>
<Item posX="3" posY="5" name="Zoom"/>
<Item posX="3" posY="6" name="Déplacer/Cloner le document actuel"/>
<Item posX="3" posY="16" name="Replier le niveau"/>
<Item posX="3" posY="16" name="Replier le niveau"/>
<Item posX="3" posY="17" name="Déplier le niveau"/>
<Item posX="3" posY="21" name="Projet"/>
<Item posX="4" posY="5" name="Codage de caractères"/>
<Item posX="4" posY="5" posZ="0" name="Arabe"/>
<Item posX="4" posY="5" posZ="1" name="Langues baltes"/>
@ -189,7 +190,9 @@
<Item id="44036" name="Défilement horizontal synchrone"/>
<Item id="44041" name="Afficher les marques de coupures de ligne"/>
<Item id="44072" name="Basculer à l'autre vue"/>
<Item id="44081" name="Paneau de Projet #1"/>
<Item id="44082" name="Paneau de Projet #2"/>
<Item id="44083" name="Paneau de Projet #3"/>
<Item id="45001" name="Convertir en Format Windows (CR+LF)"/>
<Item id="45002" name="Convertir en Format UNIX (LF)"/>
<Item id="45003" name="Convertir en Format Mac (CR)"/>

68
PowerEditor/installer/nativeLang/romanian.xml
View File

@ -20,6 +20,7 @@
<!-- Sub Menu Entries -->
<SubEntries>
<Item posX = "0" posY = "19" name = "File Recente"/>
<Item posX="1" posY="9" name="Copiază în Cliplanşetă"/>
<Item posX="1" posY="10" name="Indentează"/>
<Item posX="1" posY="11" name="Converteşte Caseta Textului"/>
@ -28,6 +29,7 @@
<Item posX="1" posY="14" name="Completează Automat"/>
<Item posX="1" posY="15" name="Converteşte Finalurile de Linie"/>
<Item posX="1" posY="16" name="Operaţii cu Spaţiile Goale"/>
<Item posX="1" posY="17" name="Lipeşte Special"/>
<Item posX="2" posY="16" name="Marchează Tot"/>
<Item posX="2" posY="17" name="Demarchează Tot"/>
<Item posX="2" posY="18" name="Sari Sus la"/>
@ -39,6 +41,7 @@
<Item posX="3" posY="16" name="Pliază Nivelul"/>
<Item posX="3" posY="17" name="Depliază Nivelul"/>
<Item posX="3" posY="21" name="Proiect"/>
<Item posX="4" posY="5" name="Seturi de Caractere"/>
<Item posX="4" posY="5" posZ="0" name="Arabic"/>
<Item posX="4" posY="5" posZ="1" name="Baltic"/>
@ -68,15 +71,15 @@
<Item id="41005" name="Închide Celelalte Taburi"/>
<Item id="41006" name="&amp;Salvează"/>
<Item id="41007" name="Sal&amp;vează Tot"/>
<Item id="41008" name="Salvează &amp;Ca..."/>
<Item id="41008" name="Salvează &amp;ca..."/>
<Item id="41010" name="Tipăreşte... Ctrl+P"/>
<Item id="1001" name="Tipăreşte Acum"/>
<Item id="41011" name="I&amp;eşi"/>
<Item id="41012" name="Încarcă Sesiunea..."/>
<Item id="41013" name="Salvează Sesiunea..."/>
<Item id="41014" name="Reîncarcă de pe Disc"/>
<Item id="41015" name="Salvează Copie Ca..."/>
<Item id="41016" name="Şterge de pe Disc"/>
<Item id="41014" name="Reîncarcă de pe Hardisc"/>
<Item id="41015" name="Salvează Copie ca..."/>
<Item id="41016" name="Şterge de pe Hardisc"/>
<Item id="41017" name="Renumeşte..."/>
<Item id="42001" name="&amp;Decupează"/>
@ -112,12 +115,25 @@
<Item id="42033" name="Setează Documentul ca Modificabil"/>
<Item id="42035" name="Comentează Blocul Selectat"/>
<Item id="42036" name="Decomentează Blocul Selectat"/>
<Item id="42037" name="Foloseşte Modul Colonar..."/>
<Item id="42038" name="Lipeşte Conţinutul HTML"/>
<Item id="42039" name="Lipeşte Conţinutul RTF"/>
<Item id="42042" name="Tunde Spaţiile Goale Iniţiale"/>
<Item id="42043" name="Tunde Spaţiile Goale Iniţiale şi Finale"/>
<Item id="42044" name="Converteşte Finalurile de Linie în Spaţii Goale"/>
<Item id="42045" name="Înlătură Finalurile de Linie şi Spaţiile Goale Inutile"/>
<Item id="42046" name="Converteşte Tabulatoarele în Spaţii Goale"/>
<Item id="42047" name="Converteşte Spaţiile Goale în Tabulatoare"/>
<Item id="42048" name="Copiază Conţinutul Binar"/>
<Item id="42049" name="Decupează Conţinutul Binar"/>
<Item id="42050" name="Lipeşte Conţinutul Binar"/>
<Item id="42051" name="Arată Panoul Caracterelor"/>
<Item id="42052" name="Arată Istoria Cliplanşetei"/>
<Item id="43051" name="Înlătură Liniile Nemarcate"/>
<Item id="43052" name="Găseşte Caracterele din Intervalul..."/>
<Item id="43001" name="&amp;Găseşte ..."/>
<Item id="43002" name="Găseşte &amp;Următorul"/>
@ -189,6 +205,9 @@
<Item id="44036" name="Sincronizează Derularea Orizontală"/>
<Item id="44041" name="Arată Marcajele de Încadrare"/>
<Item id="44072" name="Focalizează Panoul Celălalt"/>
<Item id="44081" name="Panoul Proiectului 1"/>
<Item id="44082" name="Panoul Proiectului 2"/>
<Item id="44083" name="Panoul Proiectului 3"/>
<Item id="45001" name="Converteşte în Format Windows"/>
<Item id="45002" name="Converteşte în Format Unix"/>
@ -247,7 +266,7 @@
<Item order="0" name="Închide"/>
<Item order="1" name="Închide Celelalte Taburi"/>
<Item order="2" name="Salvează"/>
<Item order="3" name="Salvează Ca..."/>
<Item order="3" name="Salvează ca..."/>
<Item order="4" name="Tipăreşte"/>
<Item order="5" name="Mută în Celălalt Panou"/>
<Item order="6" name="Clonează în Celălalt Panou"/>
@ -315,6 +334,18 @@
<Item id="2008" name="Decalare"/>
</GoToLine>
<FindCharsInRange title = "Găseşte Caracterele din Intervalul...">
<Item id="2910" name="Găseşte"/>
<Item id="2" name="Închide"/>
<Item id="2901" name="Caractere Non-ASCII (128-255)"/>
<Item id="2902" name="Caractere ASCII (0 - 127)"/>
<Item id="2903" name="Intervalul Meu:"/>
<Item id="2906" name="Sus"/>
<Item id="2907" name="Jos"/>
<Item id="2908" name="Direcţie"/>
<Item id="2909" name="Buclează căutarea"/>
</FindCharsInRange>
<Run title="Rulează...">
<Item id="1903" name="Programul care trebuie rulat"/>
<Item id="1" name="Rulează!"/>
@ -363,7 +394,7 @@
<Item id="20002" name="Renumeşte"/>
<Item id="20003" name="Creează Nou..."/>
<Item id="20004" name="Înlătură"/>
<Item id="20005" name="Salvează Ca..."/>
<Item id="20005" name="Salvează ca..."/>
<Item id="20007" name="Limbaj: "/>
<Item id="20009" name="Ext:"/>
<Item id="20012" name="Ignoră MAJ/min"/>
@ -422,7 +453,7 @@
<Item id="6101" name="Bara de Unelte"/>
<Item id="6102" name="Ascunde"/>
<Item id="6103" name="Icoane mici"/>
<Item id="6104" name="Icoane Mari"/>
<Item id="6104" name="Icoane Mari"/>
<Item id="6105" name="Icoane mici standard"/>
<Item id="6106" name="Bara de Taburi"/>
@ -439,7 +470,9 @@
<Item id="6120" name="Verticală"/>
<Item id="6121" name="Bara de Meniuri"/>
<Item id="6122" name="Ascunde (Comută cu Alt / F10)"/>
<Item id="6123" name="Limba Interfeţei"/>
<Item id="6123" name="Limba Interfeţei"/>
<Item id="6125" name="Selector de Documente"/>
<Item id="6126" name="Arată selectorul"/>
</Global>
<Scintillas title="Afişare">
<Item id="6201" name="Marginea Stîngă"/>
@ -456,7 +489,7 @@
<Item id="6212" name="Linie"/>
<Item id="6213" name="Culoare de fundal"/>
<Item id="6214" name="Evidenţiază linia activă"/>
<Item id="6216" name="Setările Cursorului"/>
<Item id="6216" name="Setările Cursorului"/>
<Item id="6217" name="Lăţime:"/>
<Item id="6219" name="Rata de Clipire:"/>
<Item id="6221" name="R"/>
@ -475,6 +508,10 @@
</Scintillas>
<NewDoc title="Document Nou/Dosar Implicit">
<Item id="-1" name="Afişează Lista Filelor Recente"/>
<Item id="6304" name="Istoria Filelor Recente"/>
<Item id="6305" name="Nu verifica la pornirea softului"/>
<Item id="6306" name="Nr. maxim de file memorate:"/>
<Item id="6401" name="Format"/>
<Item id="6402" name="Windows"/>
<Item id="6403" name="Unix"/>
@ -492,6 +529,10 @@
<Item id="6418" name="..."/>
<Item id="6419" name="Document Nou"/>
<Item id="6420" name="Aplică la filele ANSI deschise"/>
<Item id="6424" name="Ca submeniu"/>
<Item id="6425" name="Doar numele filelor"/>
<Item id="6426" name="Calea completă a filelor"/>
<Item id="6427" name="Nr. maxim de caractere:"/>
</NewDoc>
<FileAssoc title="File Asociate">
<Item id="4009" name="Extensii Suportate:"/>
@ -537,9 +578,6 @@
<Item id="6728" name="Antet şi Subsol"/>
</Print>
<MISC title="Diverse">
<Item id="6304" name="Istoricul Filelor Recente"/>
<Item id="6305" name="Nu verifica la pornirea softului"/>
<Item id="6306" name="Nr. maxim de file memorate:"/>
<Item id="6307" name="Activează"/>
<Item id="6308" name="Minimizează în sertar [system tray]"/>
<Item id="6309" name="Memorează sesiunea curentă pentru pornirea viitoare"/>
@ -563,12 +601,12 @@
<Item id="6116" name="Memorează ultimul dosar folosit"/>
<Item id="6117" name="Comportament de tip *Utilizate Recent*"/>
</MISC>
<Backup title="Salvgardare/Autocompletare">
<Item id="6801" name="Salvgardare [Backup]"/>
<Backup title="Conservare/Autocompletare">
<Item id="6801" name="Conservare [Backup]"/>
<Item id="6315" name="Fără"/>
<Item id="6316" name="Simplă"/>
<Item id="6317" name="Prolixă"/>
<Item id="6804" name="Foloseşte dosar de salvgardare personalizat"/>
<Item id="6804" name="Foloseşte dosar de conservare personalizat"/>
<Item id="6803" name="Dosar:"/>
<Item id="6807" name="Autocompletare"/>
<Item id="6808" name="Autocompletează la introducerea datelor"/>

9
PowerEditor/installer/nativeLang/slovak.xml
View File

@ -40,6 +40,7 @@
<Item posX="3" posY="6" name="Premiestniť/Klonovať aktuálny dokument"/>
<Item posX="3" posY="16" name="Zbaliť úroveň"/>
<Item posX="3" posY="17" name="Rozbaliť úroveň"/>
<Item posX="3" posY="21" name="Projekt"/>
<Item posX="4" posY="5" name="Znaková sada"/>
<Item posX="4" posY="5" posZ="0" name="Arabská"/>
<Item posX="4" posY="5" posZ="1" name="Baltická"/>
@ -199,7 +200,11 @@
<Item id="44035" name="Synchronizovať vertikálne skrolovanie"/>
<Item id="44036" name="Synchronizovať horizontálne skrolovanie"/>
<Item id="44041" name="Zobraziť zalamovací symbol"/>
<Item id="44049" name="Zhrnutie..."/>
<Item id="44072" name="Sústrediť na iné zobrazenie"/>
<Item id="44081" name="Projektový panel 1"/>
<Item id="44082" name="Projektový panel 2"/>
<Item id="44083" name="Projektový panel 3"/>
<Item id="45001" name="Prekonvertovať na Windows Formát"/>
<Item id="45002" name="Prekonvertovať na UNIX Formát"/>
@ -443,10 +448,10 @@
<Item id="6121" name="Panel menu"/>
<Item id="6122" name="Skryť (Použite Alt alebo F10 na prepnutie)"/>
<Item id="6123" name="Lokalizácia"/>
</Global>
<Scintillas title="Upravovanie">
<Item id="6125" name="Prepínač dokumentov"/>
<Item id="6126" name="Zobraziť"/>
</Global>
<Scintillas title="Upravovanie">
<Item id="6216" name="Nastavenia vsuvky"/>
<Item id="6217" name="Šírka:"/>
<Item id="6219" name="Rýchlosť blikania:"/>

4
PowerEditor/installer/nppSetup.nsi
View File

@ -18,10 +18,10 @@
; Define the application name
!define APPNAME "Notepad++"
!define APPVERSION "5.9.4"
!define APPVERSION "5.9.5"
!define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
!define VERSION_MAJOR 5
!define VERSION_MINOR 94
!define VERSION_MINOR 95
!define APPWEBSITE "http://notepad-plus-plus.org/"

16
PowerEditor/src/Notepad_plus.cpp
View File

@ -3868,7 +3868,7 @@ bool Notepad_plus::getIntegralDockingData(tTbData & dockData, int & iCont, bool
{
int cont = (pddi._currContainer < DOCKCONT_MAX ? pddi._prevContainer : pddi._currContainer);
RECT rc;
if (dockingData.getFloatingRCFrom(cont, rc))
if (dockingData.getFloatingRCFrom(cont, rc))
dockData.rcFloat = rc;
}
return true;
@ -4700,7 +4700,9 @@ void Notepad_plus::launchProjectPanel(int cmdID, ProjectPanel ** pProjPanel, int
(*pProjPanel) = new ProjectPanel;
(*pProjPanel)->init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf());
(*pProjPanel)->setWorkSpaceFilePath(pNppParam->getworkSpaceFilePath(panelID));
tTbData data = {0};
tTbData data;
memset(&data, 0, sizeof(data));
(*pProjPanel)->create(&data);
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)(*pProjPanel)->getHSelf());
@ -4713,6 +4715,16 @@ void Notepad_plus::launchProjectPanel(int cmdID, ProjectPanel ** pProjPanel, int
// in this case is DOCKABLE_DEMO_INDEX
// In the case of Notepad++ internal function, it'll be the command ID which triggers this dialog
data.dlgID = cmdID;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string title_temp = pNativeSpeaker->getProjectPanelLangStr("PanelTitle", PM_PROJECTPANELTITLE);
static TCHAR title[32];
if (title_temp.length() < 32)
{
lstrcpy(title, title_temp.c_str());
data.pszName = title;
}
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, (LPARAM)&data);
}
(*pProjPanel)->display();

2
PowerEditor/src/WinControls/DockingWnd/Docking.h
View File

@ -49,7 +49,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
typedef struct {
HWND hClient; // client Window Handle
TCHAR *pszName; // name of plugin (shown in window)
const TCHAR *pszName; // name of plugin (shown in window)
int dlgID; // a funcItem provides the function pointer to start a dialog. Please parse here these ID
// user modifications

6
PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
View File

@ -817,7 +817,7 @@ void DockingCont::drawTabItem(DRAWITEMSTRUCT *pDrawItemStruct)
if (!tcItem.lParam)
return;
TCHAR* text = ((tTbData*)tcItem.lParam)->pszName;
const TCHAR *text = ((tTbData*)tcItem.lParam)->pszName;
int length = lstrlen(((tTbData*)tcItem.lParam)->pszName);
@ -1275,7 +1275,7 @@ void DockingCont::SelectTab(int iTab)
{
if (iTab != -1)
{
TCHAR *pszMaxTxt = NULL;
const TCHAR *pszMaxTxt = NULL;
TCITEM tcItem = {0};
SIZE size = {0};
int maxWidth = 0;
@ -1309,7 +1309,7 @@ void DockingCont::SelectTab(int iTab)
for (int iItem = 0; iItem < iItemCnt; iItem++)
{
TCHAR *pszTabTxt = NULL;
const TCHAR *pszTabTxt = NULL;
::SendMessage(_hContTab, TCM_GETITEM, iItem, (LPARAM)&tcItem);
if (!tcItem.lParam)

8
PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h
View File

@ -31,10 +31,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
class DockingDlgInterface : public StaticDialog
{
public:
DockingDlgInterface(): StaticDialog(), _HSource(NULL), _data(NULL),\
DockingDlgInterface(): StaticDialog(), _HSource(NULL),\
_dlgID(-1), _isFloating(TRUE), _iDockedPos(0), _pluginName(TEXT("")) {};
DockingDlgInterface(int dlgID): StaticDialog(), _HSource(NULL), _data(NULL),\
DockingDlgInterface(int dlgID): StaticDialog(), _HSource(NULL),\
_dlgID(dlgID), _isFloating(TRUE), _iDockedPos(0), _pluginName(TEXT("")) {};
virtual void init(HINSTANCE hInst, HWND parent) {
@ -58,9 +58,6 @@ public:
// additional info
data->pszAddInfo = NULL;
_data = data;
};
virtual void updateDockingDlg() {
@ -121,7 +118,6 @@ protected :
// Handles
HWND _HSource;
tTbData* _data;
int _dlgID;
bool _isFloating;
int _iDockedPos;

2
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -1523,7 +1523,7 @@ BOOL CALLBACK LangMenuDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara
return TRUE;
}
case IDC_BUTTON_RESTORE :
case IDC_BUTTON_RESTORE :
case IDC_BUTTON_REMOVE :
{
int list2Remove, list2Add, idButton2Enable, idButton2Disable;

84
PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
View File

@ -23,6 +23,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "resource.h"
#include "tinyxml.h"
#include "FileDialog.h"
#include "localization.h"
#include "Parameters.h"
#define CX_BITMAP 16
#define CY_BITMAP 16
@ -52,19 +54,21 @@ BOOL CALLBACK ProjectPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPar
0,0,0,0,_hSelf,(HMENU)0, _hInst, NULL);
TBBUTTON tbButtons[2];
static TCHAR *projectMenuStr = TEXT("Workspace");
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string workspace_entry = pNativeSpeaker->getProjectPanelLangMenuStr("Entries", 0, PM_WORKSPACEMENUENTRY);
generic_string edit_entry = pNativeSpeaker->getProjectPanelLangMenuStr("Entries", 1, PM_EDITMENUENTRY);
tbButtons[0].idCommand = IDB_PROJECT_BTN;
tbButtons[0].iBitmap = I_IMAGENONE;
tbButtons[0].fsState = TBSTATE_ENABLED;
tbButtons[0].fsStyle = BTNS_BUTTON | BTNS_AUTOSIZE;
tbButtons[0].iString = (INT_PTR)projectMenuStr;
tbButtons[0].iString = (INT_PTR)workspace_entry.c_str();
static TCHAR *editMenuStr = TEXT("Edit");
tbButtons[1].idCommand = IDB_EDIT_BTN;
tbButtons[1].iBitmap = I_IMAGENONE;
tbButtons[1].fsState = TBSTATE_ENABLED;
tbButtons[1].fsStyle = BTNS_BUTTON | BTNS_AUTOSIZE;
tbButtons[1].iString = (INT_PTR)editMenuStr;
tbButtons[1].iString = (INT_PTR)edit_entry.c_str();
SendMessage(_hToolbarMenu, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0);
SendMessage(_hToolbarMenu, TB_ADDBUTTONS, (WPARAM)sizeof(tbButtons) / sizeof(TBBUTTON), (LPARAM)&tbButtons);
@ -77,6 +81,7 @@ BOOL CALLBACK ProjectPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPar
_treeView.display();
if (!openWorkSpace(_workSpaceFilePath.c_str()))
newWorkSpace();
return TRUE;
}
@ -144,31 +149,56 @@ void ProjectPanel::checkIfNeedSave(const TCHAR *title)
void ProjectPanel::initMenus()
{
_hWorkSpaceMenu = ::CreatePopupMenu();
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWWS, TEXT("New Workspace"));
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_OPENWS, TEXT("Open Workspace"));
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RELOADWS, TEXT("Reload Workspace"));
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEWS, TEXT("Save"));
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEASWS, TEXT("Save As..."));
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEACOPYASWS, TEXT("Save a Copy As..."));
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string new_workspace = pNativeSpeaker->getProjectPanelLangMenuStr("WorkspaceMenu", IDM_PROJECT_NEWWS, PM_NEWWORKSPACE);
generic_string open_workspace = pNativeSpeaker->getProjectPanelLangMenuStr("WorkspaceMenu", IDM_PROJECT_OPENWS, PM_OPENWORKSPACE);
generic_string reload_workspace = pNativeSpeaker->getProjectPanelLangMenuStr("WorkspaceMenu", IDM_PROJECT_RELOADWS, PM_RELOADWORKSPACE);
generic_string save_workspace = pNativeSpeaker->getProjectPanelLangMenuStr("WorkspaceMenu", IDM_PROJECT_SAVEWS, PM_SAVEWORKSPACE);
generic_string saveas_workspace = pNativeSpeaker->getProjectPanelLangMenuStr("WorkspaceMenu", IDM_PROJECT_SAVEASWS, PM_SAVEASWORKSPACE);
generic_string saveacopyas_workspace = pNativeSpeaker->getProjectPanelLangMenuStr("WorkspaceMenu", IDM_PROJECT_SAVEACOPYASWS, PM_SAVEACOPYASWORKSPACE);
generic_string newproject_workspace = pNativeSpeaker->getProjectPanelLangMenuStr("WorkspaceMenu", IDM_PROJECT_NEWPROJECT, PM_NEWPROJECTWORKSPACE);
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWWS, new_workspace.c_str());
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_OPENWS, open_workspace.c_str());
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RELOADWS, reload_workspace.c_str());
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEWS, save_workspace.c_str());
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEASWS, saveas_workspace.c_str());
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_SAVEACOPYASWS, saveacopyas_workspace.c_str());
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, (UINT)-1, 0);
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWPROJECT, TEXT("Add New Project"));
::InsertMenu(_hWorkSpaceMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWPROJECT, newproject_workspace.c_str());
generic_string edit_rename = pNativeSpeaker->getProjectPanelLangMenuStr("ProjectMenu", IDM_PROJECT_RENAME, PM_EDITRENAME);
generic_string edit_addfolder = pNativeSpeaker->getProjectPanelLangMenuStr("ProjectMenu", IDM_PROJECT_NEWFOLDER, PM_EDITNEWFOLDER);
generic_string edit_addfiles = pNativeSpeaker->getProjectPanelLangMenuStr("ProjectMenu", IDM_PROJECT_ADDFILES, PM_EDITADDFILES);
generic_string edit_remove = pNativeSpeaker->getProjectPanelLangMenuStr("ProjectMenu", IDM_PROJECT_DELETEFOLDER, PM_EDITREMOVE);
_hProjectMenu = ::CreatePopupMenu();
::InsertMenu(_hProjectMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RENAME, TEXT("Rename"));
::InsertMenu(_hProjectMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWFOLDER, TEXT("Add Folder"));
::InsertMenu(_hProjectMenu, 0, MF_BYCOMMAND, IDM_PROJECT_ADDFILES, TEXT("Add Files..."));
::InsertMenu(_hProjectMenu, 0, MF_BYCOMMAND, IDM_PROJECT_DELETEFOLDER, TEXT("Remove"));
::InsertMenu(_hProjectMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RENAME, edit_rename.c_str());
::InsertMenu(_hProjectMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWFOLDER, edit_addfolder.c_str());
::InsertMenu(_hProjectMenu, 0, MF_BYCOMMAND, IDM_PROJECT_ADDFILES, edit_addfiles.c_str());
::InsertMenu(_hProjectMenu, 0, MF_BYCOMMAND, IDM_PROJECT_DELETEFOLDER, edit_remove.c_str());
edit_rename = pNativeSpeaker->getProjectPanelLangMenuStr("FolderMenu", IDM_PROJECT_RENAME, PM_EDITRENAME);
edit_addfolder = pNativeSpeaker->getProjectPanelLangMenuStr("FolderMenu", IDM_PROJECT_NEWFOLDER, PM_EDITNEWFOLDER);
edit_addfiles = pNativeSpeaker->getProjectPanelLangMenuStr("FolderMenu", IDM_PROJECT_ADDFILES, PM_EDITADDFILES);
edit_remove = pNativeSpeaker->getProjectPanelLangMenuStr("FolderMenu", IDM_PROJECT_DELETEFOLDER, PM_EDITREMOVE);
_hFolderMenu = ::CreatePopupMenu();
::InsertMenu(_hFolderMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RENAME, TEXT("Rename"));
::InsertMenu(_hFolderMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWFOLDER, TEXT("Add Folder"));
::InsertMenu(_hFolderMenu, 0, MF_BYCOMMAND, IDM_PROJECT_ADDFILES, TEXT("Add Files..."));
::InsertMenu(_hFolderMenu, 0, MF_BYCOMMAND, IDM_PROJECT_DELETEFOLDER, TEXT("Remove"));
::InsertMenu(_hFolderMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RENAME, edit_rename.c_str());
::InsertMenu(_hFolderMenu, 0, MF_BYCOMMAND, IDM_PROJECT_NEWFOLDER, edit_addfolder.c_str());
::InsertMenu(_hFolderMenu, 0, MF_BYCOMMAND, IDM_PROJECT_ADDFILES, edit_addfiles.c_str());
::InsertMenu(_hFolderMenu, 0, MF_BYCOMMAND, IDM_PROJECT_DELETEFOLDER, edit_remove.c_str());
edit_rename = pNativeSpeaker->getProjectPanelLangMenuStr("FileMenu", IDM_PROJECT_RENAME, PM_EDITRENAME);
edit_remove = pNativeSpeaker->getProjectPanelLangMenuStr("FileMenu", IDM_PROJECT_DELETEFILE, PM_EDITREMOVE);
generic_string edit_modifyfile = pNativeSpeaker->getProjectPanelLangMenuStr("FileMenu", IDM_PROJECT_MODIFYFILEPATH, PM_EDITMODIFYFILE);
_hFileMenu = ::CreatePopupMenu();
::InsertMenu(_hFileMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RENAME, TEXT("Rename"));
::InsertMenu(_hFileMenu, 0, MF_BYCOMMAND, IDM_PROJECT_DELETEFILE, TEXT("Remove"));
::InsertMenu(_hFileMenu, 0, MF_BYCOMMAND, IDM_PROJECT_MODIFYFILEPATH, TEXT("Modify File Path"));
::InsertMenu(_hFileMenu, 0, MF_BYCOMMAND, IDM_PROJECT_RENAME, edit_rename.c_str());
::InsertMenu(_hFileMenu, 0, MF_BYCOMMAND, IDM_PROJECT_DELETEFILE, edit_remove.c_str());
::InsertMenu(_hFileMenu, 0, MF_BYCOMMAND, IDM_PROJECT_MODIFYFILEPATH, edit_modifyfile.c_str());
}
@ -265,9 +295,9 @@ bool ProjectPanel::openWorkSpace(const TCHAR *projectFileName)
_workSpaceFilePath = projectFileName;
_treeView.removeAllItems();
HTREEITEM rootItem = _treeView.addItem(TEXT("Workspace"), TVI_ROOT, INDEX_CLEAN_ROOT);
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string workspace = pNativeSpeaker->getProjectPanelLangStr("WorkspaceRootName", PM_WORKSPACEROOTNAME);
HTREEITEM rootItem = _treeView.addItem(workspace.c_str(), TVI_ROOT, INDEX_CLEAN_ROOT);
for ( ; childNode ; childNode = childNode->NextSibling(TEXT("Project")))
{
@ -283,7 +313,9 @@ bool ProjectPanel::openWorkSpace(const TCHAR *projectFileName)
void ProjectPanel::newWorkSpace()
{
_treeView.addItem(TEXT("Workspace"), TVI_ROOT, INDEX_CLEAN_ROOT);
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string workspace = pNativeSpeaker->getProjectPanelLangStr("WorkspaceRootName", PM_WORKSPACEROOTNAME);
_treeView.addItem(workspace.c_str(), TVI_ROOT, INDEX_CLEAN_ROOT);
setWorkSpaceDirty(false);
_workSpaceFilePath = TEXT("");
}

19
PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.h
View File

@ -28,6 +28,25 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "TreeView.h"
#include "ProjectPanel_rc.h"
#define PM_PROJECTPANELTITLE TEXT("Project")
#define PM_WORKSPACEROOTNAME TEXT("Workspace")
#define PM_NEWWORKSPACE TEXT("New Workspace")
#define PM_OPENWORKSPACE TEXT("Open Workspace")
#define PM_RELOADWORKSPACE TEXT("Reload Workspace")
#define PM_SAVEWORKSPACE TEXT("Save")
#define PM_SAVEASWORKSPACE TEXT("Save As...")
#define PM_SAVEACOPYASWORKSPACE TEXT("Save a Copy As...")
#define PM_NEWPROJECTWORKSPACE TEXT("Add New Project")
#define PM_EDITRENAME TEXT("Rename")
#define PM_EDITNEWFOLDER TEXT("Add Folder")
#define PM_EDITADDFILES TEXT("Add Files...")
#define PM_EDITREMOVE TEXT("Remove")
#define PM_EDITMODIFYFILE TEXT("Modify File Path")
#define PM_WORKSPACEMENUENTRY TEXT("Workspace")
#define PM_EDITMENUENTRY TEXT("Edit")
enum NodeType {
nodeType_root = 0, nodeType_project = 1, nodeType_folder = 2, nodeType_file = 3
};

64
PowerEditor/src/localization.cpp
View File

@ -1246,6 +1246,70 @@ bool NativeLangSpeaker::getMsgBoxLang(const char *msgBoxTagName, generic_string
return false;
}
generic_string NativeLangSpeaker::getProjectPanelLangMenuStr(const char * nodeName, int cmdID, const TCHAR *defaultStr) const
{
if (!_nativeLangA) return defaultStr;
TiXmlNodeA *targetNode = _nativeLangA->FirstChild("ProjectManager");
if (!targetNode) return defaultStr;
targetNode = targetNode->FirstChild("Menus");
if (!targetNode) return defaultStr;
targetNode = targetNode->FirstChild(nodeName);
if (!targetNode) return defaultStr;
const char *name = NULL;
for (TiXmlNodeA *childNode = targetNode->FirstChildElement("Item");
childNode ;
childNode = childNode->NextSibling("Item") )
{
TiXmlElementA *element = childNode->ToElement();
int id;
const char *idStr = element->Attribute("id", &id);
if (idStr && id == cmdID)
{
name = element->Attribute("name");
break;
}
}
if (name && name[0])
{
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
return wmc->char2wchar(name, _nativeLangEncoding);
#else
return name;
#endif
}
return defaultStr;
}
generic_string NativeLangSpeaker::getProjectPanelLangStr(const char *nodeName, const TCHAR *defaultStr) const
{
if (!_nativeLangA) return defaultStr;
TiXmlNodeA *targetNode = _nativeLangA->FirstChild("ProjectManager");
if (!targetNode) return defaultStr;
targetNode = targetNode->FirstChild(nodeName);
if (!targetNode) return defaultStr;
// Set Title
const char *name = (targetNode->ToElement())->Attribute("name");
if (name && name[0])
{
#ifdef UNICODE
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
return wmc->char2wchar(name, _nativeLangEncoding);
#else
return name;
#endif
}
return defaultStr;
}
int NativeLangSpeaker::messageBox(const char *msgBoxTagName, HWND hWnd, TCHAR *defaultMessage, TCHAR *defaultTitle, int msgBoxType)
{
generic_string msg, title;

4
PowerEditor/src/localization.h
View File

@ -24,6 +24,8 @@
class FindReplaceDlg;
class PreferenceDlg;
class ShortcutMapper;
class UserDefineDialog;
class NativeLangSpeaker {
public:
@ -59,6 +61,8 @@ public:
return _nativeLangEncoding;
};
bool getMsgBoxLang(const char *msgBoxTagName, generic_string & title, generic_string & message);
generic_string getProjectPanelLangMenuStr(const char * nodeName, int cmdID, const TCHAR *defaultStr) const;
generic_string getProjectPanelLangStr(const char *nodeName, const TCHAR *defaultStr) const;
int messageBox(const char *msgBoxTagName, HWND hWnd, TCHAR *message, TCHAR *title, int msgBoxType);
private:
TiXmlNodeA *_nativeLangA;

6
PowerEditor/src/resource.h
View File

@ -18,12 +18,12 @@
#ifndef RESOURCE_H
#define RESOURCE_H
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.4")
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.5")
// should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
// ex : #define VERSION_VALUE TEXT("5.63\0")
#define VERSION_VALUE TEXT("5.94\0")
#define VERSION_DIGITALVALUE 5, 9, 4, 0
#define VERSION_VALUE TEXT("5.95\0")
#define VERSION_DIGITALVALUE 5, 9, 5, 0
#ifdef UNICODE
#define UNICODE_ANSI_MODE TEXT("(UNICODE)")