diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 438d70320..540ed4dd4 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,12 +1,16 @@ -Notepad++ v6.3.2 fixed bug and added feature: +Notepad++ v6.3.3 new features: + +1. Add remembering folding between sessions feature. +2. Optimize startup (loading last session) performance. +3. Add multi-select feature in Document List Panel and Close/Keep the selected files commands (right click). +4. Add new spell checker plugin(DSpellCheck). + -1. Fix a regression (performance issue). -2. Recognize wscript and Rakefile respectively as python and ruby file. Included plugins: -1. Spell Checker v1.3.3 +1. DSpellCheck v1.1.4 2. NppFTP 0.24.1 3. NppExport v0.2.8 4. Plugin Manager 1.0.8 diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index d14d0fe0e..fd4782536 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/japanese.xml b/PowerEditor/installer/nativeLang/japanese.xml index 612962e4b..12e0fa15a 100644 --- a/PowerEditor/installer/nativeLang/japanese.xml +++ b/PowerEditor/installer/nativeLang/japanese.xml @@ -1,544 +1,753 @@ + + - +
- + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index d3ac6c9cf..10c8f3e9f 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -28,10 +28,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "6.3.2" +!define APPVERSION "6.3.3" !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 6 -!define VERSION_MINOR 32 +!define VERSION_MINOR 33 !define APPWEBSITE "http://notepad-plus-plus.org/" @@ -757,12 +757,25 @@ SectionGroup "Plugins" Plugins SetOutPath "$INSTDIR\plugins\doc" File "..\bin\plugins\doc\NPPTextFXdemo.TXT" SectionEnd -*/ Section "Spell-Checker" SpellChecker Delete "$INSTDIR\plugins\SpellChecker.dll" SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\SpellChecker.dll" SectionEnd +*/ + + Section "Spell-Checker" DSpellCheck + Delete "$INSTDIR\plugins\DSpellCheck.dll" + SetOutPath "$INSTDIR\plugins" + File "..\bin\plugins\DSpellCheck.dll" + SetOutPath "$UPDATE_PATH\plugins\Config" + File "..\bin\plugins\Config\DSpellCheck.ini" + SetOutPath "$INSTDIR\plugins\Config\Hunspell" + File "..\bin\plugins\Config\Hunspell\en_GB.aff" + File "..\bin\plugins\Config\Hunspell\en_GB.dic" + File "..\bin\plugins\Config\Hunspell\dictionary.lst" + File "..\bin\plugins\Config\Hunspell\README_en_GB.txt" + SectionEnd Section "Npp FTP" NppFTP Delete "$INSTDIR\plugins\NppFTP.dll" @@ -1378,6 +1391,14 @@ SectionGroup un.Plugins Section un.SpellChecker Delete "$INSTDIR\plugins\SpellChecker.dll" SectionEnd + Section un.DSpellCheck + Delete "$INSTDIR\plugins\DSpellCheck.dll" + Delete "$UPDATE_PATH\plugins\Config\DSpellCheck.ini" + Delete "$INSTDIR\plugins\Config\Hunspell\en_GB.aff" + Delete "$INSTDIR\plugins\Config\Hunspell\en_GB.dic" + Delete "$INSTDIR\plugins\Config\Hunspell\dictionary.lst" + Delete "$INSTDIR\plugins\Config\Hunspell\README_en_GB.txt" + SectionEnd Section un.NppExec Delete "$INSTDIR\plugins\NppExec.dll" Delete "$INSTDIR\plugins\doc\NppExec.txt" diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 7f58ec6c6..7dec55e84 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -53,71 +53,82 @@ rem Notepad++ Unicode package rmdir /S /Q .\zipped.package.release mkdir .\zipped.package.release -mkdir .\zipped.package.release\unicode -mkdir .\zipped.package.release\unicode\updater -mkdir .\zipped.package.release\unicode\localization -mkdir .\zipped.package.release\unicode\themes -mkdir .\zipped.package.release\unicode\user.manual -mkdir .\zipped.package.release\unicode\plugins -mkdir .\zipped.package.release\unicode\plugins\APIs -mkdir .\zipped.package.release\unicode\plugins\Config -mkdir .\zipped.package.release\unicode\plugins\doc +mkdir .\zipped.package.release\updater +mkdir .\zipped.package.release\localization +mkdir .\zipped.package.release\themes +mkdir .\zipped.package.release\user.manual +mkdir .\zipped.package.release\plugins +mkdir .\zipped.package.release\plugins\APIs +mkdir .\zipped.package.release\plugins\Config +mkdir .\zipped.package.release\plugins\Config\Hunspell +mkdir .\zipped.package.release\plugins\doc -copy /Y ..\bin\license.txt .\zipped.package.release\unicode\ +copy /Y ..\bin\license.txt .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\bin\readme.txt .\zipped.package.release\unicode\ +copy /Y ..\bin\readme.txt .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\bin\change.log .\zipped.package.release\unicode\ +copy /Y ..\bin\change.log .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\src\config.model.xml .\zipped.package.release\unicode\ +copy /Y ..\src\config.model.xml .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\src\langs.model.xml .\zipped.package.release\unicode\ +copy /Y ..\src\langs.model.xml .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\src\stylers.model.xml .\zipped.package.release\unicode\ +copy /Y ..\src\stylers.model.xml .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\src\contextMenu.xml .\zipped.package.release\unicode\ +copy /Y ..\src\contextMenu.xml .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\src\shortcuts.xml .\zipped.package.release\unicode\ +copy /Y ..\src\shortcuts.xml .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\bin\doLocalConf.xml .\zipped.package.release\unicode\ +copy /Y ..\bin\doLocalConf.xml .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\unicode\ +copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\ If ErrorLevel 1 PAUSE -copy /Y ..\bin\SciLexer.dll .\zipped.package.release\unicode\ +copy /Y ..\bin\SciLexer.dll .\zipped.package.release\ If ErrorLevel 1 PAUSE rem Plugins -copy /Y "..\bin\plugins\SpellChecker.dll" .\zipped.package.release\unicode\plugins\ +copy /Y "..\bin\plugins\DSpellCheck.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 PAUSE -copy /Y "..\bin\plugins\NppFTP.dll" .\zipped.package.release\unicode\plugins\ +copy /Y "..\bin\plugins\Config\DSpellCheck.ini" .\zipped.package.release\plugins\Config\ If ErrorLevel 1 PAUSE -copy /Y "..\bin\plugins\NppExport.dll" .\zipped.package.release\unicode\plugins\ +copy /Y "..\bin\plugins\Config\Hunspell\en_GB.dic" .\zipped.package.release\plugins\Config\Hunspell\ If ErrorLevel 1 PAUSE -copy /Y "..\bin\plugins\NppConverter.dll" .\zipped.package.release\unicode\plugins\ +copy /Y "..\bin\plugins\Config\Hunspell\en_GB.aff" .\zipped.package.release\plugins\Config\Hunspell\ +If ErrorLevel 1 PAUSE +copy /Y "..\bin\plugins\Config\Hunspell\dictionary.lst" .\zipped.package.release\plugins\Config\Hunspell\ +If ErrorLevel 1 PAUSE +copy /Y "..\bin\plugins\Config\Hunspell\README_en_GB.txt" .\zipped.package.release\plugins\Config\Hunspell\ +If ErrorLevel 1 PAUSE + +copy /Y "..\bin\plugins\NppFTP.dll" .\zipped.package.release\plugins\ +If ErrorLevel 1 PAUSE +copy /Y "..\bin\plugins\NppExport.dll" .\zipped.package.release\plugins\ +If ErrorLevel 1 PAUSE +copy /Y "..\bin\plugins\NppConverter.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 PAUSE rem plugins manager and its updater -copy /Y "..\bin\plugins\PluginManager.dll" .\zipped.package.release\unicode\plugins\ +copy /Y "..\bin\plugins\PluginManager.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 PAUSE -copy /Y "..\bin\updater\gpup.exe" .\zipped.package.release\unicode\updater\ +copy /Y "..\bin\updater\gpup.exe" .\zipped.package.release\updater\ If ErrorLevel 1 PAUSE rem document -xcopy /Y /S ..\bin\user.manual\*.* .\zipped.package.release\unicode\user.manual\ +xcopy /Y /S ..\bin\user.manual\*.* .\zipped.package.release\user.manual\ If ErrorLevel 1 PAUSE rem localizations -copy /Y ".\nativeLang\*.xml" .\zipped.package.release\unicode\localization\ +copy /Y ".\nativeLang\*.xml" .\zipped.package.release\localization\ If ErrorLevel 1 PAUSE rem files API -copy /Y ".\APIs\*.xml" .\zipped.package.release\unicode\plugins\APIs\ +copy /Y ".\APIs\*.xml" .\zipped.package.release\plugins\APIs\ If ErrorLevel 1 PAUSE rem theme -copy /Y ".\themes\*.xml" .\zipped.package.release\unicode\themes\ +copy /Y ".\themes\*.xml" .\zipped.package.release\themes\ If ErrorLevel 1 PAUSE diff --git a/PowerEditor/installer/themes/Obsidian.xml b/PowerEditor/installer/themes/Obsidian.xml index 63e0b95b0..e2ac4fd65 100644 --- a/PowerEditor/installer/themes/Obsidian.xml +++ b/PowerEditor/installer/themes/Obsidian.xml @@ -2,9 +2,9 @@ - + - + @@ -739,7 +751,7 @@ Notepad++ Custom Style - + diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 91bc61081..3004a61d9 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -105,6 +105,7 @@ ToolBarButtonUnit toolBarIcons[] = { {IDM_VIEW_ALL_CHARACTERS, IDI_VIEW_ALL_CHAR_OFF_ICON, IDI_VIEW_ALL_CHAR_ON_ICON, IDI_VIEW_ALL_CHAR_OFF_ICON, IDR_INVISIBLECHAR}, {IDM_VIEW_INDENT_GUIDE, IDI_VIEW_INDENT_OFF_ICON, IDI_VIEW_INDENT_ON_ICON, IDI_VIEW_INDENT_OFF_ICON, IDR_INDENTGUIDE}, {IDM_LANG_USER_DLG, IDI_VIEW_UD_DLG_OFF_ICON, IDI_VIEW_UD_DLG_ON_ICON, IDI_VIEW_UD_DLG_OFF_ICON, IDR_SHOWPANNEL}, + {IDM_VIEW_DOC_MAP, IDI_VIEW_UD_DLG_OFF_ICON, IDI_VIEW_UD_DLG_ON_ICON, IDI_VIEW_UD_DLG_OFF_ICON, IDR_DOCMAP}, //-------------------------------------------------------------------------------------// {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, @@ -5143,7 +5144,7 @@ struct Quote{ const char *_quote; }; -const int nbQuote = 114; +const int nbQuote = 128; Quote quotes[nbQuote] = { {"Notepad++", "Good programmers use Notepad++ to code.\nExtreme programmers use MS Word to code, in Comic Sans, center aligned."}, {"Martin Golding", "Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live."}, @@ -5165,7 +5166,7 @@ Quote quotes[nbQuote] = { {"Alanna", "Saying that Java is nice because it works on all OSes is like saying that anal sex is nice because it works on all genders."}, {"Linus Torvalds", "Software is like sex: It's better when it's free."}, {"Cult of vi", "Emacs is a great operating system, lacking only a decent editor."}, -{"Church of Emacs", "vi has two modes \"beep repeatedly\" and \"break everything\"."}, +{"Church of Emacs", "vi has two modes - \"beep repeatedly\" and \"break everything\"."}, {"Steve Jobs", "Picasso had a saying: \"Good artists copy, great artists steal.\".\nWe have always been shameless about stealing great ideas."}, {"brotips #1001", "Do everything for greatness, not money. Money follows greatness."}, {"brotips #1212", "Cheating is like eating fast food: you do it, you enjoy it, and then you feel like shit."}, @@ -5204,7 +5205,7 @@ Quote quotes[nbQuote] = { {"Anonymous #27", "I'm no gynecologist, but I know a cunt when I see one."}, {"Anonymous #28", "Why 6 afraid of 7?\nBecause 7 8 9 (seven ate nine) while 6 and 9 were flirting."}, {"Anonymous #29", "The reason women will never be the ones to propose is\nbecause as soon as she gets on her knees,\nhe will start unzipping."}, -{"Anonymous #30", "Why do Java deveolpers wear glasses?\nBecause they don't C#."}, +{"Anonymous #30", "Why do Java developers wear glasses?\nBecause they don't C#."}, {"Anonymous #31", "Non alcoholic beer is like licking your sister.\nIt tastes right but it is wrong."}, {"Anonymous #32", "Two bytes meet. The first byte asks, \"You look terrible. Are you OK?\"\nThe second byte replies, \"No, just feeling a bit off.\""}, {"Anonymous #33", "Programmer - an organism that turns coffee into software."}, @@ -5222,7 +5223,7 @@ Quote quotes[nbQuote] = { {"Anonymous #45", "Rhinos are just fat unicorns."}, {"Anonymous #46", "Pornography harms\nmy wrist."}, {"Anonymous #47", "Kids are like fart.\nYou can only stand yours."}, -{"Anonymous #48", "If you were born in Israel, you壇 probably be Jewish.\nIf you were born in Saudi Arabia, you壇 probably be Muslim.\nIf you were born in India, you壇 probably be Hindu.\nBut because you were born in North America, you池e Christian.\nYour faith is not inspired by some divine, constant truth.\nIt痴 simply geography."}, +{"Anonymous #48", "If you were born in Israel, you'd probably be Jewish.\nIf you were born in Saudi Arabia, you'd probably be Muslim.\nIf you were born in India, you'd probably be Hindu.\nBut because you were born in North America, you're Christian.\nYour faith is not inspired by some divine, constant truth.\nIt's simply geography."}, {"Anonymous #49", "There are 2 types of people in this world:\nPeople who say they pee in the shower, and the dirty fucking liars."}, {"Anonymous #50", "London 2012 Olympic Games - A bunch of countries coming across the ocean to put their flags in britain and try to get a bunch of gold... it's like history but opposite."}, {"Anonymous #51", "I don't need a stable relationship,\nI just need a stable Internet connection."}, @@ -5252,6 +5253,20 @@ Quote quotes[nbQuote] = { {"Anonymous #75", "I think therefore I am\nnot religious."}, {"Anonymous #76", "Even if being gay were a choice, so what?\nPeople choose to be assholes and they can get married."}, {"Anonymous #77", "Governments are like diapers.\nThey should be changed often, and for the same reason."}, +{"Anonymous #78", "If you expect the world to be fair with you because you are fair, you're fooling yourself.\nThat's like expecting the lion not to eat you because you didn't eat him."}, +{"Anonymous #79", "I'm a creationist.\nI believe man create God."}, +{"Anonymous #80", "If women ruled the world, there would be no wars.\nJust a bunch of jealous countries not talking to each other."}, +{"Anonymous #81", "A male engineering student was crossing a road one day when a frog called out to him and said, \"If you kiss me, I'll turn into a beautiful princess.\" He bent over, picked up the frog, and put it in his pocket.\n\nThe frog spoke up again and said, \"If you kiss me and turn me back into a beautiful princess, I will stay with you for one week.\" The engineering student took the frog out of his pocket, smiled at it; and returned it to his pocket.\n\nThe frog then cried out, \"If you kiss me and turn me back into a princess, I'll stay with you and do ANYTHING you want.\" Again the boy took the frog out, smiled at it, and put it back into his pocket.\n\nFinally, the frog asked, \"What is the matter? I've told you I'm a beautiful princess, that I'll stay with you for a week and do anything you want. Why won't you kiss me?\" The boy said, \"Look I'm an engineer. I don't have time for a girlfriend, but a talking frog is cool.\"\n"}, +{"Anonymous #82", "Every guy thinks that every girl's dream is to find the perfect guy.\nBullshit!\nEvery girl's dream is to eat without getting fat!"}, +{"Anonymous #83", "Copy from one, it's plagiarism.\nCopy from two, it's research."}, +{"Anonymous #84", "If you love something, let it go. If it comes back to you, its yours forever.\nIf it doesn't, you hunt that bitch down and kill her."}, +{"Anonymous #85", "Race, religion, ethnic pride and nationalism etc... does nothing but teach you how to hate people that you've never met."}, +{"Anonymous #86", "Farts are just the ghosts of the things we eat."}, +{"Anonymous #87", "I promised I would never kill someone who had my blood.\nBut that mosquito made me break my word."}, +{"Anonymous #88", "Frigide, ton cul doit etre jaloux de la merde qui sort de ta bouche."}, +{"Anonymous #89", "I'm drunk and you're still ugly."}, +{"Gandhi", "Earth provides enough to satisfy every man's need, but not every man's greed."}, +{"R. D. Laing", "Life is a sexually transmitted disease and the mortality rate is one hundred percent."}, {"Apple fan boy", "I'll buy a second iPhone 5 and buy a lot of iOS applications so that Apple will be able to buy Samsung (this shitty company) to shut it down and all the Apple haters will be forced to have an iPhone. Muhahaha..."}, {"Motherf*cker", "Thousands of my potential children died on your mother's face last night."}, {"Hustle Man", "Politicians are like sperm.\nOne in a million turn out to be an actual human being."}, diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 591fe2769..801be60d8 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -155,6 +155,7 @@ IDR_CLOSETAB BITMAP "icons\\closeTabButton.bmp" IDR_CLOSETAB_INACT BITMAP "icons\\closeTabButton_inact.bmp" IDR_CLOSETAB_HOVER BITMAP "icons\\closeTabButton_hover.bmp" IDR_CLOSETAB_PUSH BITMAP "icons\\closeTabButton_push.bmp" +IDR_DOCMAP BITMAP "icons\\docMap.bmp" IDI_STARTRECORD_OFF_ICON ICON "icons\\startrecord_off.ico" IDI_STARTRECORD_ON_ICON ICON "icons\\startrecord_on.ico" diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 79811350f..fc2990910 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -349,10 +349,12 @@ void Notepad_plus::command(int id) _pDocMap->display(false); _pDocMap->vzDlgDisplay(false); checkMenuItem(IDM_VIEW_DOC_MAP, false); + _toolBar.setCheck(IDM_VIEW_DOC_MAP, false); } else { checkMenuItem(IDM_VIEW_DOC_MAP, true); + _toolBar.setCheck(IDM_VIEW_DOC_MAP, true); launchDocMap(); } } diff --git a/PowerEditor/src/icons/docMap.bmp b/PowerEditor/src/icons/docMap.bmp new file mode 100644 index 000000000..6f07e590b Binary files /dev/null and b/PowerEditor/src/icons/docMap.bmp differ diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml index 882ff39be..95accc316 100644 --- a/PowerEditor/src/langs.model.xml +++ b/PowerEditor/src/langs.model.xml @@ -90,7 +90,7 @@ as case class data default deriving do else hiding if import in infix infixl infixr instance let module newtype of proc qualified rec then type where _ - !doctype a abbr accept accept-charset accesskey acronym action address align alink alt applet archive area article aside audio axis b background base basefont bdo bgcolor big blockquote body border br button canvas caption cellpadding cellspacing center char charoff charset checkbox checked cite class classid clear code codebase codetype col colgroup color cols colspan command compact content contenteditable contextmenu coords data datafld dataformatas datalist datapagesize datasrc datetime dd declare defer del details dfn dir disabled div dl draggable dropzone dt em embed enctype event face fieldset figcaption figure file font footer for form frame frameborder frameset h1 h2 h3 h4 h5 h6 head header height hgroup hidden hr href hreflang hspace html http-equiv i id iframe image img input ins isindex ismap kbd keygen label lang language leftmargin legend li link longdesc map marginheight marginwidth mark marquee maxlength media menu meta meter method multiple name nav noframes nohref noresize noscript noshade nowrap object ol onabort onafterprint onbeforeonload onbeforeprint onblur oncanplay oncanplaythrough onchange onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange ondurationchange onemptied onended onerror onfocus onformchange onforminput onhaschange oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart onmessage onmousedown onmousemove onmouseout onmouseover onmouseup onmousewheel onoffline ononline onpagehide onpageshow onpause onplay onplaying onpopstate onprogress onratechange onreadystatechange onredo onreset onresize onscroll onseeked onseeking onselect onselect onstalled onstorage onsubmit onsubmit onsuspend ontimeupdate onundo onunload onunload onvolumechange onwaiting optgroup option output p param password pre profile progress prompt public q radio readonly rel reset rev rows rowspan rp rt ruby rules s samp scheme scope script section select selected shape size small source span spellcheck src standby start strike strong style sub submit summary sup tabindex table target tbody td text textarea tfoot th thead time title topmargin tr tt type u ul usemap valign value valuetype var version video vlink vspace wbr width xml xmlns + !doctype a abbr accept accept-charset accesskey acronym action address align alink alt applet archive area article aside audio axis b background base basefont bdo bgcolor big blockquote body border br button canvas caption cellpadding cellspacing center char charoff charset checkbox checked cite class classid clear code codebase codetype col colgroup color cols colspan command compact content contenteditable contextmenu coords data datafld dataformatas datalist datapagesize datasrc datetime dd declare defer del details dfn dir disabled div dl draggable dropzone dt em embed enctype event face fieldset figcaption figure file font footer for form frame frameborder frameset h1 h2 h3 h4 h5 h6 head header height hgroup hidden hr href hreflang hspace html http-equiv i id iframe image img input ins isindex ismap kbd keygen label lang language leftmargin legend li link longdesc map marginheight marginwidth mark marquee maxlength media menu meta meter method multiple name nav noframes nohref noresize noscript noshade nowrap object ol onabort onafterprint onbeforeonload onbeforeprint onblur oncanplay oncanplaythrough onchange onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange ondurationchange onemptied onended onerror onfocus onformchange onforminput onhaschange oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart onmessage onmousedown onmousemove onmouseout onmouseover onmouseup onmousewheel onoffline ononline onpagehide onpageshow onpause onplay onplaying onpopstate onprogress onratechange onreadystatechange onredo onreset onresize onscroll onseeked onseeking onselect onselect onstalled onstorage onsubmit onsubmit onsuspend ontimeupdate onundo onunload onunload onvolumechange onwaiting optgroup option output p param password placeholder pre profile progress prompt public q radio readonly rel reset rev rows rowspan rp rt ruby rules s samp scheme scope script section select selected shape size small source span spellcheck src standby start strike strong style sub submit summary sup tabindex table target tbody td text textarea tfoot th thead time title topmargin tr tt type u ul usemap valign value valuetype var version video vlink vspace wbr width xml xmlns diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 3bc0d4ab0..a0384050f 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -29,12 +29,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.3.2") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.3.3") // 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("6.32\0") -#define VERSION_DIGITALVALUE 6, 3, 2, 0 +#define VERSION_VALUE TEXT("6.33\0") +#define VERSION_DIGITALVALUE 6, 3, 3, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)") @@ -71,6 +71,7 @@ #define IDI_VIEW_INDENT_ON_ICON 219 #define IDI_VIEW_WRAP_ON_ICON 220 + #define IDI_STARTRECORD_OFF_ICON 221 #define IDI_STARTRECORD_ON_ICON 222 #define IDI_STARTRECORD_DISABLE_ICON 223 @@ -184,6 +185,7 @@ #define IDR_UNDO 1524 #define IDR_REDO 1525 #define IDR_M_PLAYRECORD 1526 +#define IDR_DOCMAP 1527 #define IDR_CLOSETAB 1530 #define IDR_CLOSETAB_INACT 1531