Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bookmarkedition: Notepad2 Bookmark Edition R1

  • Loading branch information...
commit d189640e7a982a370a737513b7fde5415fcb0d1d 1 parent eba3580
@djs authored
View
92 BookmarkEdition.txt
@@ -0,0 +1,92 @@
+
+ ---- Notepad2 Bookmark Edition (Release 1) -------------------------
+
+ Coded by RL Vision - www.rlvision.com
+
+ --------------------------------------------------------------------
+
+ Bookmark Edition is a modification to Notepad2 that adds bookmark
+ functionality plus some other tweaks and enhancements:
+
+ - Bookmark feature:
+
+ Ctrl+F2: toggle bookmark on/off for for current line
+ F2: jump to next bookmark
+ Shift+F2: jump to previous bookmark
+ Alt+F2: clear all bookmarks
+
+ Bookmarked lines are coloured light green. If the "Selection
+ margin" is enabled, a green icon is displayed there instead.
+
+ - Re-Mapped "Save as" to F12 (F6 still works though)
+
+ - Number of selected lines is reported in the statusbar together
+ with the other statistics ("Sel Ln")
+
+ - Added wildcard search mode to the Find/Replace dialogs.
+ Use * and ? as wildcards.
+
+ - Added help buttons [?] to the Find/Replace dialogs with quick
+ syntaxt help for Regular Expressions, Backslash transformations
+ and Wildcard search.
+
+ - "Convert to Title Case" has been tweaked to work better with
+ some apostrophes situations
+
+ - The Find/Replace dialogs will automatically paste the clipboard
+ content first time it is opened (but only if nothing is selected
+ in the editor)
+
+ - Some hotkeys have been reassigned or removed in order to accomodate
+ changes above:
+
+ Select to next: Alt+Ctrl+F3 (Previously F2)
+ Select to prev: Alt+Shift+F3 (Previously Ctrl+F2)
+
+ Select syntax scheme: Shift+F12 (Previously F12)
+ Customize schemes: Removed (Previously Ctrl+F12)
+
+
+
+ ---- Source Code ---------------------------------------------------
+
+ Source code for Bookmark Edition is available at www.rlvision.com
+
+ This archive contains the complete source code project, including
+ Scintilla and my modifications. (It was tricky to get it to compile,
+ so I'm distributing everything in case someone else needs it.)
+
+ All source code changes have been coded within BOOKMARK_EDITION
+ #ifdef sections and most of them comments on what it does. Changes
+ in the resource files are not documented since it is a generated file.
+
+
+
+---- Notes on Compiling ---------------------------------------------
+
+ It can be tricky to get compile Notepad2 the first time. Here are
+ some things I stumbled upon:
+
+ * In the src\Notepad2.rs file, I had to remove this line:
+
+ IDR_RT_MANIFEST RT_MANIFEST "..\\res\\Notepad2.exe.manifest"
+
+ * One time Visual Studio replaced "winres.h" with "afxres.h" in
+ "Notepad2.rc" and I had to change it back manually to ge the
+ "wdkbuild" script to compile.
+
+ * It is possible to compile with Visual C++ Express Edition, but
+ since it does not have a resource editor you can not easily change
+ dialogs, hotkeys etc. There are 3rd part editors that might work
+ though. (The built in resource editor is a påain toi work with
+ anyway...)
+
+ * The final step in compiling is to run the "wdkbuild" script. In
+ order to get it working I had to modify the X86 paths slightly
+ to work with my (default) installation: "\x86" to "\x86\x86"
+
+ * "wdkbuild" refused the embed the Manifest file when linking. I
+ finally solved it by adding the manifest manually using
+ "XNResourceEditor.exe"
+
+ --------------------------------------------------------------------
View
BIN  Notepad2.ini
Binary file not shown
View
26 Notepad2.sln
@@ -1,21 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad2", "Notepad2.vcproj", "{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}"
EndProject
Global
- GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Debug|Win32.Build.0 = Debug|Win32
+ {B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release|Win32.ActiveCfg = Release|Win32
+ {B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Debug.ActiveCfg = Debug|Win32
- {B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Debug.Build.0 = Debug|Win32
- {B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release.ActiveCfg = Release|Win32
- {B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
View
483 Notepad2.vcproj
@@ -1,454 +1,641 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="9,00"
Name="Notepad2"
ProjectGUID="{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
- CharacterSet="1">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="scintilla\include;scintilla\src;scintilla\win32"
PreprocessorDefinitions="STATIC_BUILD;SCI_LEXER;UNICODE;_UNICODE"
- MinimalRebuild="TRUE"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="4"/>
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib shlwapi.lib imm32.lib"
OutputFile="$(OutDir)/Notepad2.exe"
LinkIncremental="2"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/Notepad2.pdb"
SubSystem="2"
- TargetMachine="1"/>
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
- CharacterSet="1">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- OmitFramePointers="TRUE"
+ OmitFramePointers="true"
AdditionalIncludeDirectories="scintilla\include;scintilla\src;scintilla\win32"
PreprocessorDefinitions="STATIC_BUILD;SCI_LEXER;NDEBUG;UNICODE;_UNICODE"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="0"/>
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib shlwapi.lib imm32.lib"
OutputFile="$(OutDir)/Notepad2.exe"
LinkIncremental="1"
- GenerateDebugInformation="FALSE"
+ GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+ >
<File
- RelativePath="src\Dialogs.c">
+ RelativePath="src\Dialogs.c"
+ >
</File>
<File
- RelativePath="src\Dlapi.c">
+ RelativePath="src\Dlapi.c"
+ >
</File>
<File
- RelativePath="src\Edit.c">
+ RelativePath="src\Edit.c"
+ >
</File>
<File
- RelativePath="src\Helpers.c">
+ RelativePath="src\Helpers.c"
+ >
</File>
<File
- RelativePath="src\Notepad2.c">
+ RelativePath="src\Notepad2.c"
+ >
</File>
<File
- RelativePath="src\Print.cpp">
+ RelativePath="src\Print.cpp"
+ >
</File>
<File
- RelativePath="src\Styles.c">
+ RelativePath="src\Styles.c"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
+ Filter="h;hpp;hxx;hm;inl;inc"
+ >
<File
- RelativePath="src\Dialogs.h">
+ RelativePath="src\Dialogs.h"
+ >
</File>
<File
- RelativePath="src\Dlapi.h">
+ RelativePath="src\Dlapi.h"
+ >
</File>
<File
- RelativePath="src\Edit.h">
+ RelativePath="src\Edit.h"
+ >
</File>
<File
- RelativePath="src\Helpers.h">
+ RelativePath="src\Helpers.h"
+ >
</File>
<File
- RelativePath="src\Notepad2.h">
+ RelativePath="src\Notepad2.h"
+ >
</File>
<File
- RelativePath="src\Styles.h">
+ RelativePath="src\resource.h"
+ >
</File>
<File
- RelativePath="src\resource.h">
+ RelativePath="src\Styles.h"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;manifest;xpm">
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;manifest;xpm"
+ >
<File
- RelativePath="res\Copy.cur">
+ RelativePath="res\Copy.cur"
+ >
</File>
<File
- RelativePath="res\Encoding.bmp">
+ RelativePath="res\Encoding.bmp"
+ >
</File>
<File
- RelativePath="res\Hover.cur">
+ RelativePath="res\Hover.cur"
+ >
</File>
<File
- RelativePath="scintilla\win32\Margin.cur">
+ RelativePath="scintilla\win32\Margin.cur"
+ >
</File>
<File
- RelativePath="res\Next.bmp">
+ RelativePath="res\Next.bmp"
+ >
</File>
<File
- RelativePath="res\Notepad2.exe.manifest">
+ RelativePath="res\Notepad2.exe.manifest"
+ >
</File>
<File
- RelativePath="res\Notepad2.ico">
+ RelativePath="res\Notepad2.ico"
+ >
</File>
<File
- RelativePath="src\Notepad2.rc">
+ RelativePath="src\Notepad2.rc"
+ >
</File>
<File
- RelativePath="res\Open.bmp">
+ RelativePath="res\Open.bmp"
+ >
</File>
<File
- RelativePath="res\Pick.bmp">
+ RelativePath="res\Pick.bmp"
+ >
</File>
<File
- RelativePath="res\Prev.bmp">
+ RelativePath="res\Prev.bmp"
+ >
</File>
<File
- RelativePath="res\Run.ico">
+ RelativePath="res\Run.ico"
+ >
</File>
<File
- RelativePath="res\Styles.ico">
+ RelativePath="res\Styles.ico"
+ >
</File>
<File
- RelativePath="res\Toolbar.bmp">
+ RelativePath="res\Toolbar.bmp"
+ >
</File>
</Filter>
<Filter
Name="Scintilla"
- Filter="">
+ >
<Filter
Name="include"
- Filter="">
+ >
<File
- RelativePath="scintilla\include\Accessor.h">
+ RelativePath="scintilla\include\Accessor.h"
+ >
</File>
<File
- RelativePath="scintilla\include\KeyWords.h">
+ RelativePath="scintilla\include\KeyWords.h"
+ >
</File>
<File
- RelativePath="scintilla\include\Platform.h">
+ RelativePath="scintilla\include\Platform.h"
+ >
</File>
<File
- RelativePath="scintilla\include\PropSet.h">
+ RelativePath="scintilla\include\PropSet.h"
+ >
</File>
<File
- RelativePath="scintilla\include\SString.h">
+ RelativePath="scintilla\include\SciLexer.h"
+ >
</File>
<File
- RelativePath="scintilla\include\SciLexer.h">
+ RelativePath="scintilla\include\Scintilla.h"
+ >
</File>
<File
- RelativePath="scintilla\include\Scintilla.h">
+ RelativePath="scintilla\include\ScintillaWidget.h"
+ >
</File>
<File
- RelativePath="scintilla\include\ScintillaWidget.h">
+ RelativePath="scintilla\include\SString.h"
+ >
</File>
<File
- RelativePath="scintilla\include\WindowAccessor.h">
+ RelativePath="scintilla\include\WindowAccessor.h"
+ >
</File>
</Filter>
<Filter
Name="src"
- Filter="">
+ >
<File
- RelativePath="scintilla\src\AutoComplete.cxx">
+ RelativePath="scintilla\src\AutoComplete.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\AutoComplete.h">
+ RelativePath="scintilla\src\AutoComplete.h"
+ >
</File>
<File
- RelativePath="scintilla\src\CallTip.cxx">
+ RelativePath="scintilla\src\CallTip.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\CallTip.h">
+ RelativePath="scintilla\src\CallTip.h"
+ >
</File>
<File
- RelativePath="scintilla\src\CellBuffer.cxx">
+ RelativePath="scintilla\src\CellBuffer.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\CellBuffer.h">
+ RelativePath="scintilla\src\CellBuffer.h"
+ >
</File>
<File
- RelativePath="scintilla\src\CharClassify.cxx">
+ RelativePath="scintilla\src\CharacterSet.h"
+ >
</File>
<File
- RelativePath="scintilla\src\CharClassify.h">
+ RelativePath="scintilla\src\CharClassify.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\CharacterSet.h">
+ RelativePath="scintilla\src\CharClassify.h"
+ >
</File>
<File
- RelativePath="scintilla\src\ContractionState.cxx">
+ RelativePath="scintilla\src\ContractionState.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\ContractionState.h">
+ RelativePath="scintilla\src\ContractionState.h"
+ >
</File>
<File
- RelativePath="scintilla\src\Decoration.cxx">
+ RelativePath="scintilla\src\Decoration.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\Decoration.h">
+ RelativePath="scintilla\src\Decoration.h"
+ >
</File>
<File
- RelativePath="scintilla\src\Document.cxx">
+ RelativePath="scintilla\src\Document.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\Document.h">
+ RelativePath="scintilla\src\Document.h"
+ >
</File>
<File
- RelativePath="scintilla\src\DocumentAccessor.cxx">
+ RelativePath="scintilla\src\DocumentAccessor.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\DocumentAccessor.h">
+ RelativePath="scintilla\src\DocumentAccessor.h"
+ >
</File>
<File
- RelativePath="scintilla\src\Editor.cxx">
+ RelativePath="scintilla\src\Editor.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\Editor.h">
+ RelativePath="scintilla\src\Editor.h"
+ >
</File>
<File
- RelativePath="scintilla\src\ExternalLexer.cxx">
+ RelativePath="scintilla\src\ExternalLexer.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\ExternalLexer.h">
+ RelativePath="scintilla\src\ExternalLexer.h"
+ >
</File>
<File
- RelativePath="scintilla\src\Indicator.cxx">
+ RelativePath="scintilla\src\Indicator.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\Indicator.h">
+ RelativePath="scintilla\src\Indicator.h"
+ >
</File>
<File
- RelativePath="scintilla\src\KeyMap.cxx">
+ RelativePath="scintilla\src\KeyMap.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\KeyMap.h">
+ RelativePath="scintilla\src\KeyMap.h"
+ >
</File>
<File
- RelativePath="scintilla\src\KeyWords.cxx">
+ RelativePath="scintilla\src\KeyWords.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexAsm.cxx">
+ RelativePath="scintilla\src\LexAsm.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexCPP.cxx">
+ RelativePath="scintilla\src\LexConf.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexCSS.cxx">
+ RelativePath="scintilla\src\LexCPP.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexConf.cxx">
+ RelativePath="scintilla\src\LexCSS.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexHTML.cxx">
+ RelativePath="scintilla\src\LexHTML.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexOthers.cxx">
+ RelativePath="scintilla\src\LexOthers.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexPascal.cxx">
+ RelativePath="scintilla\src\LexPascal.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexPerl.cxx">
+ RelativePath="scintilla\src\LexPerl.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexPowerShell.cxx">
+ RelativePath="scintilla\src\LexPowerShell.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexPython.cxx">
+ RelativePath="scintilla\src\LexPython.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexSQL.cxx">
+ RelativePath="scintilla\src\LexSQL.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LexVB.cxx">
+ RelativePath="scintilla\src\LexVB.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LineMarker.cxx">
+ RelativePath="scintilla\src\LineMarker.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\LineMarker.h">
+ RelativePath="scintilla\src\LineMarker.h"
+ >
</File>
<File
- RelativePath="scintilla\src\Partitioning.h">
+ RelativePath="scintilla\src\Partitioning.h"
+ >
</File>
<File
- RelativePath="scintilla\src\PerLine.cxx">
+ RelativePath="scintilla\src\PerLine.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\PerLine.h">
+ RelativePath="scintilla\src\PerLine.h"
+ >
</File>
<File
- RelativePath="scintilla\src\PositionCache.cxx">
+ RelativePath="scintilla\src\PositionCache.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\PositionCache.h">
+ RelativePath="scintilla\src\PositionCache.h"
+ >
</File>
<File
- RelativePath="scintilla\src\PropSet.cxx">
+ RelativePath="scintilla\src\PropSet.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\RESearch.cxx">
+ RelativePath="scintilla\src\RESearch.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\RESearch.h">
+ RelativePath="scintilla\src\RESearch.h"
+ >
</File>
<File
- RelativePath="scintilla\src\RunStyles.cxx">
+ RelativePath="scintilla\src\RunStyles.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\RunStyles.h">
+ RelativePath="scintilla\src\RunStyles.h"
+ >
</File>
<File
- RelativePath="scintilla\src\SVector.h">
+ RelativePath="scintilla\src\ScintillaBase.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\ScintillaBase.cxx">
+ RelativePath="scintilla\src\ScintillaBase.h"
+ >
</File>
<File
- RelativePath="scintilla\src\ScintillaBase.h">
+ RelativePath="scintilla\src\Selection.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\Selection.cxx">
+ RelativePath="scintilla\src\Selection.h"
+ >
</File>
<File
- RelativePath="scintilla\src\Selection.h">
+ RelativePath="scintilla\src\SplitVector.h"
+ >
</File>
<File
- RelativePath="scintilla\src\SplitVector.h">
+ RelativePath="scintilla\src\Style.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\Style.cxx">
+ RelativePath="scintilla\src\Style.h"
+ >
</File>
<File
- RelativePath="scintilla\src\Style.h">
+ RelativePath="scintilla\src\StyleContext.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\StyleContext.cxx">
+ RelativePath="scintilla\src\StyleContext.h"
+ >
</File>
<File
- RelativePath="scintilla\src\StyleContext.h">
+ RelativePath="scintilla\src\SVector.h"
+ >
</File>
<File
- RelativePath="scintilla\src\UniConversion.cxx">
+ RelativePath="scintilla\src\UniConversion.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\UniConversion.h">
+ RelativePath="scintilla\src\UniConversion.h"
+ >
</File>
<File
- RelativePath="scintilla\src\ViewStyle.cxx">
+ RelativePath="scintilla\src\ViewStyle.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\ViewStyle.h">
+ RelativePath="scintilla\src\ViewStyle.h"
+ >
</File>
<File
- RelativePath="scintilla\src\WindowAccessor.cxx">
+ RelativePath="scintilla\src\WindowAccessor.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\XPM.cxx">
+ RelativePath="scintilla\src\XPM.cxx"
+ >
</File>
<File
- RelativePath="scintilla\src\XPM.h">
+ RelativePath="scintilla\src\XPM.h"
+ >
</File>
</Filter>
<Filter
Name="win32"
- Filter="">
+ >
<File
- RelativePath="scintilla\win32\PlatWin.cxx">
+ RelativePath="scintilla\win32\PlatformRes.h"
+ >
</File>
<File
- RelativePath="scintilla\win32\PlatformRes.h">
+ RelativePath="scintilla\win32\PlatWin.cxx"
+ >
</File>
<File
- RelativePath="scintilla\win32\ScintillaWin.cxx">
+ RelativePath="scintilla\win32\ScintillaWin.cxx"
+ >
</File>
</Filter>
</Filter>
View
30 src/Dialogs.c
@@ -90,7 +90,12 @@ int MsgBox(int iType,UINT uIdMsg,...)
GetString(IDS_APPTITLE,szTitle,COUNTOF(szTitle));
switch (iType) {
+#ifdef BOOKMARK_EDITION
+ // seems more suitable with an info-bubble icon in info boxes, instead of the exclamation icon... bug/miss?
+ case MBINFO: iIcon = MB_ICONINFORMATION; break;
+#else
case MBINFO: iIcon = MB_ICONEXCLAMATION; break;
+#endif
case MBWARN: iIcon = MB_ICONEXCLAMATION; break;
case MBYESNO: iIcon = MB_ICONEXCLAMATION | MB_YESNO; break;
case MBYESNOCANCEL: iIcon = MB_ICONEXCLAMATION | MB_YESNOCANCEL; break;
@@ -232,8 +237,17 @@ BOOL CALLBACK AboutDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
LOGFONT lf;
if (bReleaseBuild) {
+
+#ifdef BOOKMARK_EDITION
+ // About dialog
+ wsprintf(szVersion,L"Notepad2 %u.%u.%0.2u%s (Bookmark Edition R1)",
+ dwVerMajor,dwVerMinor,dwBuildNumber,szRevision);
+#else
wsprintf(szVersion,L"Notepad2 %u.%u.%0.2u%s",
dwVerMajor,dwVerMinor,dwBuildNumber,szRevision);
+#endif
+
+
SetDlgItemText(hwnd,IDC_VERSION,szVersion);
}
else {
@@ -269,6 +283,16 @@ BOOL CALLBACK AboutDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
SetDlgItemText(hwnd,IDC_EMAIL,szLinkCode);
}
+#ifdef BOOKMARK_EDITION
+ if (GetDlgItem(hwnd,BME_RLV_LINK) == NULL)
+ ShowWindow(GetDlgItem(hwnd,BME_RLV_LINK2),SW_SHOWNORMAL);
+ else {
+ GetDlgItemText(hwnd,BME_RLV_LINK2,szLink,COUNTOF(szLink));
+ wsprintf(szLinkCode,L"<A>%s</A>",szLink);
+ SetDlgItemText(hwnd,BME_RLV_LINK,szLinkCode);
+ }
+#endif
+
CenterDlgInParent(hwnd);
}
return TRUE;
@@ -287,6 +311,12 @@ BOOL CALLBACK AboutDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
else if (pnmhdr->idFrom == IDC_EMAIL) {
ShellExecute(hwnd,L"open",L"mailto:florian.balmer@gmail.com",NULL,NULL,SW_SHOWNORMAL);
}
+#ifdef BOOKMARK_EDITION
+ // Shameless homepage promotion link :-)
+ else if (pnmhdr->idFrom == BME_RLV_LINK) {
+ ShellExecute(hwnd,L"open",L"http://www.rlvision.com",NULL,NULL,SW_SHOWNORMAL);
+ }
+#endif
}
break;
}
View
161 src/Edit.c
@@ -1838,6 +1838,11 @@ void EditTitleCase(HWND hwnd)
BOOL bNewWord = TRUE;
BOOL bChanged = FALSE;
+#ifdef BOOKMARK_EDITION
+ BOOL bPrevWasSpace = FALSE;
+#endif
+
+
iCurPos = SendMessage(hwnd,SCI_GETCURRENTPOS,0,0);
iAnchorPos = SendMessage(hwnd,SCI_GETANCHOR,0,0);
@@ -1863,6 +1868,31 @@ void EditTitleCase(HWND hwnd)
cchTextW = MultiByteToWideChar(cpEdit,0,pszText,iSelCount,pszTextW,GlobalSize(pszTextW)/sizeof(WCHAR));
+#ifdef BOOKMARK_EDITION
+ //Slightly enhanced function to make Title Case: Added some '-characters and bPrevWasSpace makes it better (for example "'Don't'" will now work)
+ bPrevWasSpace = TRUE;
+ for (i = 0; i < cchTextW; i++) {
+ if (!IsCharAlphaNumericW(pszTextW[i]) && (!StrChr(L"'`´''’",pszTextW[i]) || bPrevWasSpace ) ) {
+ bNewWord = TRUE;
+ }
+ else {
+ if (bNewWord) {
+ if (IsCharLowerW(pszTextW[i])) {
+ pszTextW[i] = LOWORD(CharUpperW((LPWSTR)MAKELONG(pszTextW[i],0)));
+ bChanged = TRUE;
+ }
+ }
+ else {
+ if (IsCharUpperW(pszTextW[i])) {
+ pszTextW[i] = LOWORD(CharLowerW((LPWSTR)MAKELONG(pszTextW[i],0)));
+ bChanged = TRUE;
+ }
+ }
+ bNewWord = FALSE;
+ }
+ if( StrChr(L" \r\n\t",pszTextW[i]) ) bPrevWasSpace = TRUE; else bPrevWasSpace = FALSE;
+ }
+#else
for (i = 0; i < cchTextW; i++) {
if (!IsCharAlphaNumericW(pszTextW[i]) && !StrChr(L"",pszTextW[i])) {
bNewWord = TRUE;
@@ -1883,6 +1913,7 @@ void EditTitleCase(HWND hwnd)
bNewWord = FALSE;
}
}
+#endif
if (bChanged) {
@@ -4208,6 +4239,11 @@ BOOL CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
char *lpszSelection;
char *lpsz;
+#ifdef BOOKMARK_EDITION
+ static BOOL bFirstTime = TRUE;
+#endif
+
+
WCHAR tch[128];
HMENU hmenu;
@@ -4237,6 +4273,22 @@ BOOL CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
lpszSelection = GlobalAlloc(GPTR,cchSelection+2);
SendMessage(lpefr->hwnd,SCI_GETSELTEXT,0,(LPARAM)lpszSelection);
+#ifdef BOOKMARK_EDITION
+ // First time you bring up find/replace dialog, copy content from clipboard to find box (but only if nothing is selected in the editor)
+ if (lstrcmpA( lpszSelection , "" ) == 0 && bFirstTime )
+ {
+ char *pClip = EditGetClipboardText(hwndEdit);
+ if( lstrlenA( pClip ) > 0 && lstrlenA( pClip ) <= 500 )
+ {
+ GlobalFree(lpszSelection);
+ lpszSelection = GlobalAlloc(GPTR,lstrlenA( pClip )+2);
+ lstrcpynA( lpszSelection , pClip , 500 );
+ }
+ }
+ bFirstTime = FALSE;
+#endif
+
+
// Check lpszSelection and truncate bad chars
lpsz = StrChrA(lpszSelection,13);
if (lpsz) *lpsz = '\0';
@@ -4280,6 +4332,11 @@ BOOL CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
if (lpefr->bTransformBS)
CheckDlgButton(hwnd,IDC_FINDTRANSFORMBS,BST_CHECKED);
+#ifdef BOOKMARK_EDITION
+ if (lpefr->bWildcardSearch) CheckDlgButton(hwnd,IDC_WILDCARDSEARCH,BST_CHECKED);
+#endif
+
+
if (lpefr->bNoFindWrap)
CheckDlgButton(hwnd,IDC_NOWRAP,BST_CHECKED);
@@ -4356,7 +4413,12 @@ BOOL CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
case IDC_FINDREGEXP:
if (IsDlgButtonChecked(hwnd,IDC_FINDREGEXP) == BST_CHECKED)
+ {
CheckDlgButton(hwnd,IDC_FINDTRANSFORMBS,BST_UNCHECKED);
+#ifdef BOOKMARK_EDITION
+ CheckDlgButton(hwnd,IDC_WILDCARDSEARCH,BST_UNCHECKED); // Can not use wildcard search together with regexp
+#endif
+ }
break;
case IDC_FINDTRANSFORMBS:
@@ -4364,6 +4426,16 @@ BOOL CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
CheckDlgButton(hwnd,IDC_FINDREGEXP,BST_UNCHECKED);
break;
+#ifdef BOOKMARK_EDITION
+ // handle wildcard search checkbox
+ case IDC_WILDCARDSEARCH:
+ CheckDlgButton(hwnd,IDC_FINDREGEXP,BST_UNCHECKED);
+ //if (IsDlgButtonChecked(hwnd,IDC_FINDWILDCARDS) == BST_CHECKED)
+ // CheckDlgButton(hwnd,IDC_FINDREGEXP,BST_UNCHECKED);
+ break;
+#endif
+
+
case IDOK:
case IDC_FINDPREV:
case IDC_SELECTTO:
@@ -4405,6 +4477,11 @@ BOOL CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
if (GetDlgItem(hwnd,IDC_REPLACETEXT))
GetDlgItemTextA2W(uCPEdit,hwnd,IDC_REPLACETEXT,lpefr->szReplace,COUNTOF(lpefr->szReplace));
+#ifdef BOOKMARK_EDITION
+ lpefr->bWildcardSearch = (IsDlgButtonChecked(hwnd,IDC_WILDCARDSEARCH) == BST_CHECKED) ? TRUE : FALSE;
+#endif
+
+
lpefr->fuFlags = 0;
if (IsDlgButtonChecked(hwnd,IDC_FINDCASE) == BST_CHECKED)
@@ -4522,6 +4599,12 @@ BOOL CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
EditReplaceAllInSelection(lpefr->hwnd,lpefr,TRUE);
break;
}
+
+#ifdef BOOKMARK_EDITION
+ // Wildcard search will enable regexp, so I turn it off again otherwise it will be on in the gui
+ if( lpefr->bWildcardSearch && (lpefr->fuFlags & SCFIND_REGEXP) ) lpefr->fuFlags ^= SCFIND_REGEXP;
+#endif
+
break;
@@ -4578,6 +4661,22 @@ BOOL CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
else
PostMessage(GetParent(hwnd),WM_COMMAND,MAKELONG(IDM_EDIT_REPLACE,1),0);
}
+#ifdef BOOKMARK_EDITION
+ // Display help messages in the find/replace windows
+ else if (pnmhdr->idFrom == IDC_BACKSLASHHELP)
+ {
+ MsgBox(MBINFO,IDS_BACKSLASHHELP);
+ }
+ else if (pnmhdr->idFrom == IDC_REGEXPHELP)
+ {
+ MsgBox(MBINFO,IDS_REGEXPHELP);
+ }
+ else if (pnmhdr->idFrom == IDC_WILDCARDHELP)
+ {
+ MsgBox(MBINFO,IDS_WILDCARDHELP);
+ }
+#endif
+
break;
}
}
@@ -4614,6 +4713,43 @@ HWND EditFindReplaceDlg(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bReplace)
}
+
+#ifdef BOOKMARK_EDITION
+ // Wildcard search uses the regexp engine to perform a simple search with * ? as wildcards instead of more advanced and user-unfriendly regexp syntax
+ void EscapeWildcards( char* szFind2 , LPCEDITFINDREPLACE lpefr )
+ {
+ char szWildcardEscaped[512];
+ int iSource = 0;
+ int iDest = 0;
+
+ lpefr->fuFlags |= SCFIND_REGEXP;
+
+ while( szFind2[iSource] )
+ {
+ char c = szFind2[iSource];
+ if( c == '*' )
+ {
+ szWildcardEscaped[iDest++] = '.'; szWildcardEscaped[iDest] = '*';
+ }
+ else if( c == '?' )
+ {
+ szWildcardEscaped[iDest] = '.';
+ }
+ else
+ {
+ if( c == '.' || c == '^' || c == '$' || c == '\\' || c == '[' || c == ']' || c == '+' ) szWildcardEscaped[iDest++] = '\\';
+ szWildcardEscaped[iDest] = c;
+ }
+ iSource++;
+ iDest++;
+ }
+ szWildcardEscaped[iDest] = (char)NULL;
+ lstrcpynA(szFind2,szWildcardEscaped,COUNTOF(szWildcardEscaped));
+ }
+#endif
+
+
+
//=============================================================================
//
// EditFindNext()
@@ -4640,6 +4776,11 @@ BOOL EditFindNext(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL fExtendSelection)
return FALSE;
}
+#ifdef BOOKMARK_EDITION
+ if( lpefr->bWildcardSearch ) EscapeWildcards( szFind2 , lpefr );
+#endif
+
+
iSelPos = SendMessage(hwnd,SCI_GETCURRENTPOS,0,0);
iSelAnchor = SendMessage(hwnd,SCI_GETANCHOR,0,0);
@@ -4705,6 +4846,11 @@ BOOL EditFindPrev(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL fExtendSelection)
return FALSE;
}
+#ifdef BOOKMARK_EDITION
+ if( lpefr->bWildcardSearch ) EscapeWildcards( szFind2 , lpefr );
+#endif
+
+
iSelPos = SendMessage(hwnd,SCI_GETCURRENTPOS,0,0);
iSelAnchor = SendMessage(hwnd,SCI_GETANCHOR,0,0);
@@ -4773,6 +4919,11 @@ BOOL EditReplace(HWND hwnd,LPCEDITFINDREPLACE lpefr)
return FALSE;
}
+#ifdef BOOKMARK_EDITION
+ if( lpefr->bWildcardSearch ) EscapeWildcards( szFind2 , lpefr );
+#endif
+
+
if (lstrcmpA(lpefr->szReplace,"^c") == 0) {
iReplaceMsg = SCI_REPLACETARGET;
pszReplace2 = EditGetClipboardText(hwnd);
@@ -4890,6 +5041,11 @@ BOOL EditReplaceAll(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bShowInfo)
return FALSE;
}
+#ifdef BOOKMARK_EDITION
+ if( lpefr->bWildcardSearch ) EscapeWildcards( szFind2 , lpefr );
+#endif
+
+
bRegexStartOfLine =
(szFind2[0] == '^');
bRegexStartOrEndOfLine =
@@ -5016,6 +5172,11 @@ BOOL EditReplaceAllInSelection(HWND hwnd,LPCEDITFINDREPLACE lpefr,BOOL bShowInfo
return FALSE;
}
+#ifdef BOOKMARK_EDITION
+ if( lpefr->bWildcardSearch ) EscapeWildcards( szFind2 , lpefr );
+#endif
+
+
bRegexStartOfLine =
(szFind2[0] == '^');
bRegexStartOrEndOfLine =
View
3  src/Edit.h
@@ -38,6 +38,9 @@ typedef struct _editfindreplace
BOOL bReplaceClose;
BOOL bNoFindWrap;
HWND hwnd;
+#ifdef BOOKMARK_EDITION
+ BOOL bWildcardSearch;
+#endif
//HANDLE hMRUFind;
//HANDLE hMRUReplace;
View
232 src/Notepad2.c
@@ -256,6 +256,67 @@ HINSTANCE g_hInstance;
UINT16 g_uWinVer;
WCHAR g_wchAppUserModelID[64];
+#ifdef BOOKMARK_EDITION
+ //Graphics for bookmark indicator
+ /* XPM */
+ static char * bookmark_pixmap[] = {
+ "11 11 44 1",
+ " c #EBE9ED",
+ ". c #E5E3E7",
+ "+ c #767C6D",
+ "@ c #2A3120",
+ "# c #1B2312",
+ "$ c #333B28",
+ "% c #E3E1E5",
+ "& c #D8D6DA",
+ "* c #444D38",
+ "= c #3F5C19",
+ "- c #63AD00",
+ "; c #73C900",
+ "> c #64AF00",
+ ", c #3D5718",
+ "' c #3E4634",
+ ") c #7B8172",
+ "! c #42601A",
+ "~ c #74CB00",
+ "{ c #71C600",
+ "] c #3A5317",
+ "^ c #707668",
+ "/ c #3F4931",
+ "( c #262C1D",
+ "_ c #2F3A1E",
+ ": c #72C700",
+ "< c #74CA00",
+ "[ c #0E1109",
+ "} c #3C462F",
+ "| c #62AC00",
+ "1 c #21271A",
+ "2 c #7A8071",
+ "3 c #405D19",
+ "4 c #3D5A18",
+ "5 c #D9D7DB",
+ "6 c #4E5841",
+ "7 c #72C800",
+ "8 c #63AC00",
+ "9 c #3F5B19",
+ "0 c #3D4533",
+ "a c #DFDDE0",
+ "b c #353E29",
+ "c c #29331B",
+ "d c #7B8272",
+ "e c #DDDBDF",
+ " ",
+ " .+@#$+% ",
+ " &*=-;>,' ",
+ " )!~~~~{]^ ",
+ " /-~~~~~>( ",
+ " _:~~~~~<[ ",
+ " }|~~~~~|1 ",
+ " 23~~~~;4+ ",
+ " 56=|7890 ",
+ " a2bc}de ",
+ " "};
+#endif
//=============================================================================
@@ -1969,6 +2030,9 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
case IDM_FILE_SAVEAS:
+#ifdef BOOKMARK_EDITION
+ case BME_SAVEAS2: // Hotkey F12 for SaveAs
+#endif
FileSave(TRUE,FALSE,TRUE,FALSE);
break;
@@ -3120,6 +3184,104 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
}
break;
+#ifdef BOOKMARK_EDITION
+ // Main Bookmark Functions
+ //case IDM_EDIT_BOOKMARKNEXT:
+ case BME_EDIT_BOOKMARKNEXT:
+ {
+ int iPos = SendMessage( hwndEdit , SCI_GETCURRENTPOS , 0 , 0);
+ int iLine = SendMessage( hwndEdit , SCI_LINEFROMPOSITION , iPos , 0 );
+
+ int bitmask = 1;
+ int iNextLine = SendMessage( hwndEdit , SCI_MARKERNEXT , iLine+1 , bitmask );
+ if( iNextLine == -1 )
+ {
+ iNextLine = SendMessage( hwndEdit , SCI_MARKERNEXT , 0 , bitmask );
+ }
+
+ if( iNextLine != -1 )
+ {
+ SendMessage( hwndEdit , SCI_GOTOLINE , iNextLine , 0 );
+ SendMessage( hwndEdit , SCI_SETYCARETPOLICY , CARET_SLOP|CARET_STRICT|CARET_EVEN , 10 );
+ SendMessage( hwndEdit , SCI_SCROLLCARET , 0 , 0 );
+ }
+ break;
+ }
+
+ //case IMD_EDIT_BOOKMARKPREV:
+ case BME_EDIT_BOOKMARKPREV:
+ {
+ int iPos = SendMessage( hwndEdit , SCI_GETCURRENTPOS , 0 , 0);
+ int iLine = SendMessage( hwndEdit , SCI_LINEFROMPOSITION , iPos , 0 );
+
+ int bitmask = 1;
+ int iNextLine = SendMessage( hwndEdit , SCI_MARKERPREVIOUS , iLine-1 , bitmask );
+ if( iNextLine == -1 )
+ {
+ int nLines = SendMessage( hwndEdit , SCI_GETLINECOUNT , 0 , 0 );
+ iNextLine = SendMessage( hwndEdit , SCI_MARKERPREVIOUS , nLines , bitmask );
+ }
+
+ if( iNextLine != -1 )
+ {
+ SendMessage( hwndEdit , SCI_GOTOLINE , iNextLine , 0 );
+ SendMessage( hwndEdit , SCI_SETYCARETPOLICY , CARET_SLOP|CARET_STRICT|CARET_EVEN , 10 );
+ SendMessage( hwndEdit , SCI_SCROLLCARET , 0 , 0 );
+ }
+
+ break;
+ }
+
+ //case IDM_EDIT_BOOKMARKTOGGLE:
+ case BME_EDIT_BOOKMARKTOGGLE:
+ {
+ int iPos = SendMessage( hwndEdit , SCI_GETCURRENTPOS , 0 , 0);
+ int iLine = SendMessage( hwndEdit , SCI_LINEFROMPOSITION , iPos , 0 );
+
+ int bitmask = SendMessage( hwndEdit , SCI_MARKERGET , iLine , 0 );
+ if( bitmask & 1 )
+ {
+ // unset
+ SendMessage( hwndEdit , SCI_MARKERDELETE , iLine , 0 );
+ }
+ else
+ {
+ // define (behöver bara göra detta en gång egentligen)
+ //SendMessage( hwndEdit , SCI_MARKERSETBACK , 0 , 74 | (203 << 8) | (0 << 16) ); //behöver bara göra detta en gång egentligen
+ //SendMessage( hwndEdit , SCI_MARKERDEFINE , 0 , SC_MARK_ARROWS ); //behöver bara göra detta en gång egentligen
+
+ if( bShowSelectionMargin )
+ {
+ SendMessage( hwndEdit , SCI_MARKERDEFINEPIXMAP , 0 , (LPARAM)bookmark_pixmap );
+ }
+ else
+ {
+ SendMessage( hwndEdit , SCI_MARKERSETBACK , 0 , 216 | (255 << 8) | (216 << 16) );
+ SendMessage( hwndEdit , SCI_MARKERDEFINE , 0 , SC_MARK_BACKGROUND );
+ }
+
+
+ //SendMessage( hwndEdit , SCI_MARKERSETBACK , 0 , 180 | (255 << 8) | (180 << 16) ); //behöver bara göra detta en gång egentligen
+ //SendMessage( hwndEdit , SCI_MARKERDEFINE , 0 , SC_MARK_BACKGROUND ); //behöver bara göra detta en gång egentligen
+
+ // set
+ SendMessage( hwndEdit , SCI_MARKERADD , iLine , 0 );
+ //SendMessage( hwndEdit , SCI_MARKERADD , iLine , 1 );
+ }
+
+ break;
+ }
+
+ //case IDM_EDIT_BOOKMARKCLEAR:
+ case BME_EDIT_BOOKMARKCLEAR:
+ {
+ SendMessage( hwndEdit , SCI_MARKERDELETEALL , -1 , 0 );
+
+ break;
+ }
+#endif
+
+
case IDM_EDIT_FINDNEXT:
case IDM_EDIT_FINDPREV:
@@ -3370,6 +3532,20 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
case IDM_VIEW_MARGIN:
bShowSelectionMargin = (bShowSelectionMargin) ? FALSE : TRUE;
SendMessage(hwndEdit,SCI_SETMARGINWIDTHN,1,(bShowSelectionMargin)?16:0);
+
+#ifdef BOOKMARK_EDITION
+ //Depending on if the margin is visible or not, choose different bookmark indication
+ if( bShowSelectionMargin )
+ {
+ SendMessage( hwndEdit , SCI_MARKERDEFINEPIXMAP , 0 , (LPARAM)bookmark_pixmap );
+ }
+ else
+ {
+ SendMessage( hwndEdit , SCI_MARKERSETBACK , 0 , 216 | (255 << 8) | (216 << 16) );
+ SendMessage( hwndEdit , SCI_MARKERDEFINE , 0 , SC_MARK_BACKGROUND );
+ }
+#endif
+
break;
@@ -4448,6 +4624,24 @@ LRESULT MsgNotify(HWND hwnd,WPARAM wParam,LPARAM lParam)
int iLineLength = SendMessage(hwndEdit,SCI_LINELENGTH,iCurLine,0);
//int iIndentBefore = SendMessage(hwndEdit,SCI_GETLINEINDENTATION,(WPARAM)iCurLine-1,0);
+#ifdef BOOKMARK_EDITION
+ // Move bookmark along with line if inserting lines (pressing return at beginning of line) because Scintilla does not do this for us
+ if( iCurLine > 0 )
+ {
+ int iPrevLineLength = SendMessage(hwndEdit,SCI_GETLINEENDPOSITION,iCurLine-1,0) - SendMessage(hwndEdit,SCI_POSITIONFROMLINE,iCurLine-1,0) ;
+ if( iPrevLineLength == 0 )
+ {
+ int bitmask = SendMessage( hwndEdit , SCI_MARKERGET , iCurLine-1 , 0 );
+ if( bitmask & 1 )
+ {
+ SendMessage( hwndEdit , SCI_MARKERDELETE , iCurLine-1 , 0 );
+ SendMessage( hwndEdit , SCI_MARKERADD , iCurLine , 0 );
+ }
+ }
+ }
+#endif
+
+
if (iCurLine > 0/* && iLineLength <= 2*/)
{
int iPrevLineLength = SendMessage(hwndEdit,SCI_LINELENGTH,iCurLine-1,0);
@@ -5795,6 +5989,17 @@ void UpdateStatusbar()
WCHAR tchOvrMode[32];
WCHAR tchLexerName[128];
+#ifdef BOOKMARK_EDITION
+ int iSelStart;
+ int iSelEnd;
+ int iLineStart;
+ int iLineEnd;
+ int iStartOfLinePos;
+ int iLinesSelected;
+ WCHAR tchLinesSelected[32];
+#endif
+
+
if (!bShowStatusbar)
return;
@@ -5826,10 +6031,29 @@ void UpdateStatusbar()
else
lstrcpy(tchSel,L"--");
- if (!bMarkLongLines)
- FormatString(tchDocPos,COUNTOF(tchDocPos),IDS_DOCPOS,tchLn,tchLines,tchCol,tchSel);
- else
- FormatString(tchDocPos,COUNTOF(tchDocPos),IDS_DOCPOS2,tchLn,tchLines,tchCol,tchCols,tchSel);
+#ifdef BOOKMARK_EDITION
+ // Print number of lines selected lines in statusbar
+ iSelStart = SendMessage( hwndEdit , SCI_GETSELECTIONSTART , 0 , 0 );
+ iSelEnd = SendMessage( hwndEdit , SCI_GETSELECTIONEND , 0 , 0 );
+ iLineStart = SendMessage( hwndEdit , SCI_LINEFROMPOSITION , iSelStart , 0 );
+ iLineEnd = SendMessage( hwndEdit , SCI_LINEFROMPOSITION , iSelEnd , 0 );
+ iStartOfLinePos = SendMessage( hwndEdit , SCI_POSITIONFROMLINE , iLineEnd , 0 );
+ iLinesSelected = iLineEnd - iLineStart;
+ if( iSelStart != iSelEnd && iStartOfLinePos != iSelEnd ) iLinesSelected += 1;
+ wsprintf(tchLinesSelected,L"%i",iLinesSelected);
+ FormatNumberStr(tchLinesSelected);
+
+ if (!bMarkLongLines)
+ FormatString(tchDocPos,COUNTOF(tchDocPos),IDS_DOCPOS,tchLn,tchLines,tchCol,tchSel,tchLinesSelected);
+ else
+ FormatString(tchDocPos,COUNTOF(tchDocPos),IDS_DOCPOS2,tchLn,tchLines,tchCol,tchCols,tchSel,tchLinesSelected);
+#else
+ if (!bMarkLongLines)
+ FormatString(tchDocPos,COUNTOF(tchDocPos),IDS_DOCPOS,tchLn,tchLines,tchCol,tchSel);
+ else
+ FormatString(tchDocPos,COUNTOF(tchDocPos),IDS_DOCPOS2,tchLn,tchLines,tchCol,tchCols,tchSel);
+#endif
+
iBytes = SendMessage(hwndEdit,SCI_GETLENGTH,0,0);
StrFormatByteSize(iBytes,tchBytes,COUNTOF(tchBytes));
View
6 src/Notepad2.h
@@ -19,6 +19,12 @@
******************************************************************************/
+//==== Bookmark Edition ============================================================
+#define BOOKMARK_EDITION
+// Most changes to the source code are within a BOOKMARK_EDITION #ifdef
+// Other changes:
+// Resources: No #ifdef's since it is a generated file.
+
//==== Main Window ============================================================
#define WC_NOTEPAD2 L"Notepad2"
View
546 src/Notepad2.rc
@@ -53,13 +53,6 @@ IDC_COPY CURSOR "..\\res\\Copy.cur"
/////////////////////////////////////////////////////////////////////////////
//
-// RT_MANIFEST
-//
-
-IDR_RT_MANIFEST RT_MANIFEST "..\\res\\Notepad2.exe.manifest"
-
-/////////////////////////////////////////////////////////////////////////////
-//
// Menu
//
@@ -71,7 +64,7 @@ BEGIN
MENUITEM "&Open...\tCtrl+O", IDM_FILE_OPEN
MENUITEM "Re&vert\tF5", IDM_FILE_REVERT
MENUITEM "&Save\tCtrl+S", IDM_FILE_SAVE
- MENUITEM "Save &As...\tF6", IDM_FILE_SAVEAS
+ MENUITEM "Save &As...\tF12", BME_SAVEAS2
MENUITEM "Save &Copy...\tCtrl+F6", IDM_FILE_SAVECOPY
MENUITEM "&Read Only", IDM_FILE_READONLY
MENUITEM SEPARATOR
@@ -105,7 +98,6 @@ BEGIN
MENUITEM "&Mac (CR)", IDM_LINEENDINGS_CR
MENUITEM SEPARATOR
MENUITEM "&Default...", IDM_LINEENDINGS_SETDEFAULT
-
END
MENUITEM SEPARATOR
MENUITEM "Page Se&tup...", IDM_FILE_PAGESETUP
@@ -159,11 +151,8 @@ BEGIN
MENUITEM "&Indent\tTab", IDM_EDIT_INDENT
MENUITEM "&Unindent\tShift+Tab", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
- MENUITEM "&Enclose Selection...\tAlt+Q",
- IDM_EDIT_ENCLOSESELECTION
-
+ MENUITEM "&Enclose Selection...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION
MENUITEM "&Duplicate Selection\tAlt+D", IDM_EDIT_SELECTIONDUPLICATE
-
MENUITEM SEPARATOR
MENUITEM "&Pad With Spaces\tAlt+B", IDM_EDIT_PADWITHSPACES
MENUITEM "Strip &First Character\tAlt+Z", IDM_EDIT_STRIP1STCHAR
@@ -171,7 +160,6 @@ BEGIN
MENUITEM "Strip &Trailing Blanks\tAlt+W", IDM_EDIT_TRIMLINES
MENUITEM "Compress &Whitespace\tAlt+P", IDM_EDIT_COMPRESSWS
MENUITEM "&Remove Blank Lines\tAlt+R", IDM_EDIT_REMOVEBLANKLINES
-
MENUITEM SEPARATOR
MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES
MENUITEM "S&ort Lines...\tAlt+O", IDM_EDIT_SORTLINES
@@ -179,18 +167,14 @@ BEGIN
POPUP "C&onvert"
BEGIN
MENUITEM "&Uppercase\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE
-
MENUITEM "&Lowercase\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE
-
MENUITEM SEPARATOR
MENUITEM "&Invert Case\tCtrl+Alt+U", IDM_EDIT_INVERTCASE
MENUITEM "Title &Case\tCtrl+Alt+I", IDM_EDIT_TITLECASE
MENUITEM "&Sentence Case\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE
MENUITEM SEPARATOR
- MENUITEM "&Tabify Selection\tCtrl+Shift+T",
- IDM_EDIT_CONVERTSPACES
- MENUITEM "U&ntabify Selection\tCtrl+Shift+S",
- IDM_EDIT_CONVERTTABS
+ MENUITEM "&Tabify Selection\tCtrl+Shift+T", IDM_EDIT_CONVERTSPACES
+ MENUITEM "U&ntabify Selection\tCtrl+Shift+S", IDM_EDIT_CONVERTTABS
MENUITEM SEPARATOR
MENUITEM "Ta&bify Indent\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2
MENUITEM "Untabi&fy Indent\tCtrl+Alt+S", IDM_EDIT_CONVERTTABS2
@@ -199,18 +183,13 @@ BEGIN
BEGIN
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR
- MENUITEM "&Encoding Identifier\tCtrl+F8",
- IDM_EDIT_INSERT_ENCODING
+ MENUITEM "&Encoding Identifier\tCtrl+F8", IDM_EDIT_INSERT_ENCODING
MENUITEM SEPARATOR
- MENUITEM "Time/Date (&Short Form)\tCtrl+F5",
- IDM_EDIT_INSERT_SHORTDATE
-
- MENUITEM "Time/Date (&Long Form)\tCtrl+Shift+F5",
- IDM_EDIT_INSERT_LONGDATE
+ MENUITEM "Time/Date (&Short Form)\tCtrl+F5", IDM_EDIT_INSERT_SHORTDATE
+ MENUITEM "Time/Date (&Long Form)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE
MENUITEM SEPARATOR
MENUITEM "&Filename\tCtrl+F9", IDM_EDIT_INSERT_FILENAME
- MENUITEM "&Path and Filename\tCtrl+Shift+F9",
- IDM_EDIT_INSERT_PATHNAME
+ MENUITEM "&Path and Filename\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME
END
POPUP "Spec&ial"
BEGIN
@@ -221,46 +200,46 @@ BEGIN
MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE
MENUITEM SEPARATOR
MENUITEM "Esca&pe C Chars\tCtrl+Alt+E", IDM_EDIT_ESCAPECCHARS
- MENUITEM "&Unescape C Chars\tCtrl+Alt+U",
- IDM_EDIT_UNESCAPECCHARS
+ MENUITEM "&Unescape C Chars\tCtrl+Alt+U", IDM_EDIT_UNESCAPECCHARS
MENUITEM SEPARATOR
- MENUITEM "&Find Matching Brace\tCtrl+B",
- IDM_EDIT_FINDMATCHINGBRACE
-
- MENUITEM "&Select To Matching Brace\tCtrl+Shift+B",
- IDM_EDIT_SELTOMATCHINGBRACE
-
+ MENUITEM "&Find Matching Brace\tCtrl+B", IDM_EDIT_FINDMATCHINGBRACE
+ MENUITEM "&Select To Matching Brace\tCtrl+Shift+B", IDM_EDIT_SELTOMATCHINGBRACE
+ END
+ POPUP "Bookmarks"
+ BEGIN
+ MENUITEM "Toggle\tCtrl+F2", BME_EDIT_BOOKMARKTOGGLE
+ MENUITEM SEPARATOR
+ MENUITEM "Goto Next\tF2", BME_EDIT_BOOKMARKNEXT
+ MENUITEM "Goto Previous\tShift+F2", BME_EDIT_BOOKMARKPREV
+ MENUITEM SEPARATOR
+ MENUITEM "Clear All\tAlt+F2", BME_EDIT_BOOKMARKCLEAR
END
MENUITEM SEPARATOR
MENUITEM "&Find...\tCtrl+F", IDM_EDIT_FIND
MENUITEM "Sa&ve Find Text\tAlt+F3", IDM_EDIT_SAVEFIND
MENUITEM "Find Ne&xt\tF3", IDM_EDIT_FINDNEXT
MENUITEM "Find Pre&vious\tShift+F3", IDM_EDIT_FINDPREV
- MENUITEM "Select To Ne&xt\tF2", IDM_EDIT_SELTONEXT
+ MENUITEM "Select To Ne&xt\tAlt+Ctrl+F3", IDM_EDIT_SELTONEXT
MENUITEM "R&eplace...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "&Goto...\tCtrl+G", IDM_EDIT_GOTOLINE
END
POPUP "&View"
BEGIN
- MENUITEM "&Syntax Scheme...\tF12", IDM_VIEW_SCHEME
+ MENUITEM "&Syntax Scheme...\tCtrl+F12", IDM_VIEW_SCHEME
MENUITEM "&2nd Default Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT
- MENUITEM "&Customize Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
+ MENUITEM "&Customize Schemes...", IDM_VIEW_SCHEMECONFIG
MENUITEM "&Default Font...\tAlt+F12", IDM_VIEW_FONT
MENUITEM SEPARATOR
MENUITEM "Word W&rap\tCtrl+W", IDM_VIEW_WORDWRAP
MENUITEM "&Long Line Marker\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER
- MENUITEM "Indentation &Guides\tCtrl+Shift+G",
- IDM_VIEW_SHOWINDENTGUIDES
+ MENUITEM "Indentation &Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES
MENUITEM SEPARATOR
MENUITEM "Show &Whitespace\tCtrl+Shift+8", IDM_VIEW_SHOWWHITESPACE
MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
- MENUITEM "Show Wrap S&ymbols\tCtrl+Shift+0",
- IDM_VIEW_WORDWRAPSYMBOLS
+ MENUITEM "Show Wrap S&ymbols\tCtrl+Shift+0", IDM_VIEW_WORDWRAPSYMBOLS
MENUITEM SEPARATOR
- MENUITEM "Visual &Brace Matching\tCtrl+Shift+V",
- IDM_VIEW_MATCHBRACES
- MENUITEM "Highlight C&urrent Line\tCtrl+Shift+I",
- IDM_VIEW_HILITECURRENTLINE
+ MENUITEM "Visual &Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
+ MENUITEM "Highlight C&urrent Line\tCtrl+Shift+I", IDM_VIEW_HILITECURRENTLINE
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
@@ -276,8 +255,7 @@ BEGIN
MENUITEM "&Word Wrap Settings...", IDM_VIEW_WORDWRAPSETTINGS
MENUITEM "&Long Line Settings...", IDM_VIEW_LONGLINESETTINGS
MENUITEM "Auto In&dent Text", IDM_VIEW_AUTOINDENTTEXT
- MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H",
- IDM_VIEW_AUTOCLOSETAGS
+ MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS
MENUITEM SEPARATOR
MENUITEM "&Reuse Window", IDM_VIEW_REUSEWINDOW
MENUITEM "Sticky Window &Position", IDM_VIEW_STICKYWINPOS
@@ -286,14 +264,11 @@ BEGIN
MENUITEM "Transparent &Mode\tCtrl+0", IDM_VIEW_TRANSPARENT
MENUITEM SEPARATOR
MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE
- MENUITEM "File &Change Notification...\tAlt+F5",
- IDM_VIEW_CHANGENOTIFY
+ MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
POPUP "Window Title Displa&y"
BEGIN
MENUITEM "Filename &Only", IDM_VIEW_SHOWFILENAMEONLY
-
MENUITEM "Filename and &Directory", IDM_VIEW_SHOWFILENAMEFIRST
-
MENUITEM "Full &Pathname", IDM_VIEW_SHOWFULLPATH
MENUITEM "&Text Excerpt\tCtrl+9", IDM_VIEW_SHOWEXCERPT
END
@@ -304,7 +279,6 @@ BEGIN
MENUITEM "E&xit Notepad2", IDM_VIEW_ESCEXIT
END
MENUITEM "Sa&ve Before Running Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS
-
MENUITEM "Remember Recent F&iles", IDM_VIEW_NOSAVERECENT
MENUITEM "Remember S&earch Strings", IDM_VIEW_NOSAVEFINDREPL
MENUITEM SEPARATOR
@@ -358,137 +332,113 @@ IDR_MAINWND ACCELERATORS
BEGIN
"0", IDM_VIEW_TRANSPARENT, VIRTKEY, CONTROL, NOINVERT
"0", IDM_FILE_NEWWINDOW2, VIRTKEY, ALT, NOINVERT
- "0", IDM_VIEW_WORDWRAPSYMBOLS, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "0", IDM_VIEW_WORDWRAPSYMBOLS, VIRTKEY, SHIFT, CONTROL, NOINVERT
"1", CMD_STRINGIFY, VIRTKEY, CONTROL, NOINVERT
- "1", CMD_WEBACTION1, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "1", CMD_WEBACTION1, VIRTKEY, SHIFT, CONTROL, NOINVERT
"2", CMD_STRINGIFY2, VIRTKEY, CONTROL, NOINVERT
- "2", CMD_WEBACTION2, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "2", CMD_WEBACTION2, VIRTKEY, SHIFT, CONTROL, NOINVERT
"3", CMD_EMBRACE, VIRTKEY, CONTROL, NOINVERT
"4", CMD_EMBRACE2, VIRTKEY, CONTROL, NOINVERT
"5", CMD_EMBRACE3, VIRTKEY, CONTROL, NOINVERT
"6", CMD_EMBRACE4, VIRTKEY, CONTROL, NOINVERT
- "8", IDM_VIEW_SHOWWHITESPACE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "8", IDM_VIEW_SHOWWHITESPACE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"9", CMD_TOGGLETITLE, VIRTKEY, CONTROL, NOINVERT
- "9", IDM_VIEW_SHOWEOLS, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "9", IDM_VIEW_SHOWEOLS, VIRTKEY, SHIFT, CONTROL, NOINVERT
"A", IDM_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT
- "A", CMD_RELOADANSI, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "A", CMD_RELOADANSI, VIRTKEY, SHIFT, CONTROL, NOINVERT
"B", IDM_EDIT_FINDMATCHINGBRACE, VIRTKEY, CONTROL, NOINVERT
"B", IDM_EDIT_PADWITHSPACES, VIRTKEY, ALT, NOINVERT
- "B", IDM_EDIT_SELTOMATCHINGBRACE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "B", IDM_EDIT_SELTOMATCHINGBRACE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"C", IDM_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
"C", IDM_EDIT_COPYALL, VIRTKEY, ALT, NOINVERT
- "C", IDM_EDIT_COPYLINE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "C", IDM_EDIT_COPYLINE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"D", IDM_EDIT_DUPLICATELINE, VIRTKEY, CONTROL, NOINVERT
"D", IDM_EDIT_SELECTIONDUPLICATE, VIRTKEY, ALT, NOINVERT
- "D", IDM_EDIT_DELETELINE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "D", IDM_EDIT_DELETELINE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"E", IDM_EDIT_COPYADD, VIRTKEY, CONTROL, NOINVERT
"E", IDM_EDIT_ESCAPECCHARS, VIRTKEY, CONTROL, ALT, NOINVERT
- "E", IDM_EDIT_URLENCODE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "E", IDM_EDIT_URLENCODE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"F", IDM_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", IDM_EDIT_GOTOLINE, VIRTKEY, CONTROL, NOINVERT
- "G", IDM_VIEW_SHOWINDENTGUIDES, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "G", IDM_VIEW_SHOWINDENTGUIDES, VIRTKEY, SHIFT, CONTROL, NOINVERT
"H", IDM_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
"H", IDM_FILE_RECENT, VIRTKEY, ALT, NOINVERT
- "H", IDM_VIEW_AUTOCLOSETAGS, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "H", IDM_VIEW_AUTOCLOSETAGS, VIRTKEY, SHIFT, CONTROL, NOINVERT
"I", IDM_EDIT_SPLITLINES, VIRTKEY, CONTROL, NOINVERT
"I", IDM_FILE_OPENFAV, VIRTKEY, ALT, NOINVERT
"I", IDM_EDIT_TITLECASE, VIRTKEY, CONTROL, ALT, NOINVERT
- "I", IDM_VIEW_HILITECURRENTLINE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "I", IDM_VIEW_HILITECURRENTLINE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"J", IDM_EDIT_JOINLINES, VIRTKEY, CONTROL, NOINVERT
- "J", IDM_EDIT_JOINLINESEX, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "J", IDM_EDIT_JOINLINESEX, VIRTKEY, SHIFT, CONTROL, NOINVERT
"K", IDM_EDIT_SWAP, VIRTKEY, CONTROL, NOINVERT
"K", IDM_FILE_ADDTOFAV, VIRTKEY, ALT, NOINVERT
"L", IDM_FILE_LAUNCH, VIRTKEY, CONTROL, NOINVERT
"L", IDM_FILE_OPENWITH, VIRTKEY, ALT, NOINVERT
- "L", IDM_VIEW_LONGLINEMARKER, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "L", IDM_VIEW_LONGLINEMARKER, VIRTKEY, SHIFT, CONTROL, NOINVERT
"M", IDM_FILE_BROWSE, VIRTKEY, CONTROL, NOINVERT
"M", IDM_EDIT_MODIFYLINES, VIRTKEY, ALT, NOINVERT
- "M", IDM_VIEW_MARGIN, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "M", IDM_VIEW_MARGIN, VIRTKEY, SHIFT, CONTROL, NOINVERT
"N", IDM_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"N", IDM_FILE_NEWWINDOW, VIRTKEY, ALT, NOINVERT
- "N", IDM_VIEW_LINENUMBERS, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "N", IDM_VIEW_LINENUMBERS, VIRTKEY, SHIFT, CONTROL, NOINVERT
"O", IDM_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"O", IDM_EDIT_SORTLINES, VIRTKEY, ALT, NOINVERT
"O", IDM_EDIT_SENTENCECASE, VIRTKEY, CONTROL, ALT, NOINVERT
- "O", CMD_RELOADOEM, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "O", CMD_RELOADOEM, VIRTKEY, SHIFT, CONTROL, NOINVERT
"P", IDM_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
"P", IDM_EDIT_COMPRESSWS, VIRTKEY, ALT, NOINVERT
"Q", IDM_EDIT_LINECOMMENT, VIRTKEY, CONTROL, NOINVERT
"Q", IDM_EDIT_ENCLOSESELECTION, VIRTKEY, ALT, NOINVERT
- "Q", IDM_EDIT_STREAMCOMMENT, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "Q", IDM_EDIT_STREAMCOMMENT, VIRTKEY, SHIFT, CONTROL, NOINVERT
"R", IDM_FILE_RUN, VIRTKEY, CONTROL, NOINVERT
"R", IDM_EDIT_REMOVEBLANKLINES, VIRTKEY, ALT, NOINVERT
- "R", IDM_EDIT_URLDECODE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "R", IDM_EDIT_URLDECODE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"S", IDM_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT
"S", IDM_EDIT_CONVERTTABS2, VIRTKEY, CONTROL, ALT, NOINVERT
- "S", IDM_EDIT_CONVERTTABS, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "S", IDM_EDIT_CONVERTTABS, VIRTKEY, SHIFT, CONTROL, NOINVERT
"T", IDM_VIEW_TABSETTINGS, VIRTKEY, CONTROL, NOINVERT
"T", IDM_VIEW_ALWAYSONTOP, VIRTKEY, ALT, NOINVERT
"T", IDM_EDIT_CONVERTSPACES2, VIRTKEY, CONTROL, ALT, NOINVERT
- "T", IDM_EDIT_CONVERTSPACES, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "T", IDM_EDIT_CONVERTSPACES, VIRTKEY, SHIFT, CONTROL, NOINVERT
"U", IDM_EDIT_CONVERTLOWERCASE, VIRTKEY, CONTROL, NOINVERT
"U", IDM_EDIT_STRIPLASTCHAR, VIRTKEY, ALT, NOINVERT
"U", IDM_EDIT_INVERTCASE, VIRTKEY, CONTROL, ALT, NOINVERT
"U", IDM_EDIT_UNESCAPECCHARS, VIRTKEY, CONTROL, ALT, NOINVERT
- "U", IDM_EDIT_CONVERTUPPERCASE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "U", IDM_EDIT_CONVERTUPPERCASE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"V", IDM_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
- "V", IDM_VIEW_MATCHBRACES, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "V", IDM_VIEW_MATCHBRACES, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_ADD, IDM_VIEW_ZOOMIN, VIRTKEY, CONTROL, NOINVERT
VK_ADD, CMD_INCLINELIMIT, VIRTKEY, ALT, NOINVERT
VK_ADD, CMD_INCREASENUM, VIRTKEY, CONTROL, ALT, NOINVERT
VK_BACK, CMD_CTRLBACK, VIRTKEY, CONTROL, NOINVERT
VK_BACK, IDM_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
- VK_BACK, IDM_EDIT_DELETELINELEFT, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ VK_BACK, IDM_EDIT_DELETELINELEFT, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_DELETE, CMD_CTRLDEL, VIRTKEY, CONTROL, NOINVERT
VK_DELETE, IDM_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
- VK_DELETE, IDM_EDIT_DELETELINERIGHT, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ VK_DELETE, IDM_EDIT_DELETELINERIGHT, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_DIVIDE, IDM_VIEW_RESETZOOM, VIRTKEY, CONTROL, NOINVERT
- VK_DOWN, IDM_EDIT_MOVELINEDOWN, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ VK_DOWN, IDM_EDIT_MOVELINEDOWN, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_ESCAPE, CMD_ESCAPE, VIRTKEY, NOINVERT
VK_ESCAPE, CMD_SHIFTESC, VIRTKEY, SHIFT, NOINVERT
VK_F1, IDM_HELP_ABOUT, VIRTKEY, NOINVERT
VK_F11, CMD_LEXDEFAULT, VIRTKEY, NOINVERT
VK_F11, CMD_LEXHTML, VIRTKEY, CONTROL, NOINVERT
VK_F11, CMD_LEXXML, VIRTKEY, SHIFT, NOINVERT
- VK_F12, IDM_VIEW_SCHEME, VIRTKEY, NOINVERT
- VK_F12, IDM_VIEW_SCHEMECONFIG, VIRTKEY, CONTROL, NOINVERT
+ VK_F12, BME_SAVEAS2, VIRTKEY, NOINVERT
+ VK_F12, IDM_VIEW_SCHEME, VIRTKEY, CONTROL, NOINVERT
VK_F12, IDM_VIEW_FONT, VIRTKEY, ALT, NOINVERT
VK_F12, IDM_VIEW_USE2NDDEFAULT, VIRTKEY, SHIFT, NOINVERT
- VK_F2, IDM_EDIT_SELTONEXT, VIRTKEY, NOINVERT
- VK_F2, IDM_EDIT_SELTOPREV, VIRTKEY, SHIFT, NOINVERT
+ VK_F2, BME_EDIT_BOOKMARKNEXT, VIRTKEY, NOINVERT
+ VK_F2, BME_EDIT_BOOKMARKTOGGLE, VIRTKEY, CONTROL, NOINVERT
+ VK_F2, BME_EDIT_BOOKMARKCLEAR, VIRTKEY, ALT, NOINVERT
+ VK_F2, BME_EDIT_BOOKMARKPREV, VIRTKEY, SHIFT, NOINVERT
VK_F3, IDM_EDIT_FINDNEXT, VIRTKEY, NOINVERT
VK_F3, CMD_FINDNEXTSEL, VIRTKEY, CONTROL, NOINVERT
VK_F3, IDM_EDIT_SAVEFIND, VIRTKEY, ALT, NOINVERT
+ VK_F3, IDM_EDIT_SELTONEXT, VIRTKEY, CONTROL, ALT, NOINVERT
VK_F3, IDM_EDIT_FINDPREV, VIRTKEY, SHIFT, NOINVERT
- VK_F3, CMD_FINDPREVSEL, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ VK_F3, CMD_FINDPREVSEL, VIRTKEY, SHIFT, CONTROL, NOINVERT
+ VK_F3, IDM_EDIT_SELTOPREV, VIRTKEY, SHIFT, ALT, NOINVERT
VK_F4, IDM_EDIT_REPLACENEXT, VIRTKEY, NOINVERT
VK_F4, IDM_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
VK_F4, IDM_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
@@ -496,8 +446,7 @@ BEGIN
VK_F5, IDM_EDIT_INSERT_SHORTDATE, VIRTKEY, CONTROL, NOINVERT
VK_F5, IDM_VIEW_CHANGENOTIFY, VIRTKEY, ALT, NOINVERT
VK_F5, CMD_TIMESTAMPS, VIRTKEY, SHIFT, NOINVERT
- VK_F5, IDM_EDIT_INSERT_LONGDATE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ VK_F5, IDM_EDIT_INSERT_LONGDATE, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_F6, IDM_FILE_SAVEAS, VIRTKEY, NOINVERT
VK_F6, IDM_FILE_SAVECOPY, VIRTKEY, CONTROL, NOINVERT
VK_F7, IDM_VIEW_SAVESETTINGSNOW, VIRTKEY, NOINVERT
@@ -510,8 +459,7 @@ BEGIN
VK_F9, IDM_EDIT_INSERT_FILENAME, VIRTKEY, CONTROL, NOINVERT
VK_F9, IDM_FILE_MANAGEFAV, VIRTKEY, ALT, NOINVERT
VK_F9, CMD_COPYPATHNAME, VIRTKEY, SHIFT, NOINVERT
- VK_F9, IDM_EDIT_INSERT_PATHNAME, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ VK_F9, IDM_EDIT_INSERT_PATHNAME, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_OEM_2, IDM_VIEW_RESETZOOM, VIRTKEY, CONTROL, NOINVERT
VK_OEM_COMMA, CMD_JUMP2SELSTART, VIRTKEY, CONTROL, NOINVERT
VK_OEM_MINUS, IDM_VIEW_ZOOMOUT, VIRTKEY, CONTROL, NOINVERT
@@ -521,29 +469,23 @@ BEGIN
VK_OEM_PLUS, CMD_INCREASENUM, VIRTKEY, CONTROL, ALT, NOINVERT
VK_RETURN, CMD_CTRLENTER, VIRTKEY, CONTROL, NOINVERT
VK_SPACE, IDM_EDIT_SELECTWORD, VIRTKEY, CONTROL, NOINVERT
- VK_SPACE, IDM_EDIT_SELECTLINE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ VK_SPACE, IDM_EDIT_SELECTLINE, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_SUBTRACT, IDM_VIEW_ZOOMOUT, VIRTKEY, CONTROL, NOINVERT
VK_SUBTRACT, CMD_DECLINELIMIT, VIRTKEY, ALT, NOINVERT
VK_SUBTRACT, CMD_DECREASENUM, VIRTKEY, CONTROL, ALT, NOINVERT
VK_TAB, CMD_CTRLTAB, VIRTKEY, CONTROL, NOINVERT
- VK_UP, IDM_EDIT_MOVELINEUP, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ VK_UP, IDM_EDIT_MOVELINEUP, VIRTKEY, SHIFT, CONTROL, NOINVERT
"W", IDM_VIEW_WORDWRAP, VIRTKEY, CONTROL, NOINVERT
"W", IDM_EDIT_TRIMLINES, VIRTKEY, ALT, NOINVERT
- "W", IDM_EDIT_COLUMNWRAP, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "W", IDM_EDIT_COLUMNWRAP, VIRTKEY, SHIFT, CONTROL, NOINVERT
"X", IDM_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT
"X", IDM_EDIT_INSERT_TAG, VIRTKEY, ALT, NOINVERT
- "X", IDM_EDIT_CUTLINE, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "X", IDM_EDIT_CUTLINE, VIRTKEY, SHIFT, CONTROL, NOINVERT
"Y", IDM_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
- "Y", IDM_EDIT_UNDO, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "Y", IDM_EDIT_UNDO, VIRTKEY, SHIFT, CONTROL, NOINVERT
"Z", IDM_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
"Z", IDM_EDIT_STRIP1STCHAR, VIRTKEY, ALT, NOINVERT
- "Z", IDM_EDIT_REDO, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
+ "Z", IDM_EDIT_REDO, VIRTKEY, SHIFT, CONTROL, NOINVERT
END
IDR_ACCFINDREPLACE ACCELERATORS
@@ -560,48 +502,39 @@ END
// Dialog
//
-IDD_ABOUT DIALOGEX 0, 0, 226, 70
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP |
- WS_CAPTION | WS_SYSMENU
+IDD_ABOUT DIALOGEX 0, 0, 226, 107
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Notepad2"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- DEFPUSHBUTTON "OK",IDOK,169,49,50,14
+ DEFPUSHBUTTON "OK",IDOK,169,86,50,14
ICON IDR_MAINWND,IDC_STATIC,7,7,20,20
LTEXT "",IDC_VERSION,45,7,174,8
LTEXT "Copyright � 2004-2010",IDC_STATIC,45,19,174,8
- LTEXT "flo's freeware - http://www.flos-freeware.ch",
- IDC_WEBPAGE2,45,31,174,8,NOT WS_VISIBLE | WS_DISABLED
+ LTEXT "flo's freeware - http://www.flos-freeware.ch",IDC_WEBPAGE2,45,31,174,8,NOT WS_VISIBLE | WS_DISABLED
CONTROL "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,45,31,174,10
LTEXT "Florian Balmer",IDC_STATIC,45,43,116,8
- LTEXT "florian.balmer@gmail.com",IDC_EMAIL2,45,55,116,8,NOT
- WS_VISIBLE | WS_DISABLED
+ LTEXT "florian.balmer@gmail.com",IDC_EMAIL2,45,55,116,8,NOT WS_VISIBLE | WS_DISABLED
CONTROL "",IDC_EMAIL,"SysLink",WS_TABSTOP,45,55,116,10
+ LTEXT "Bookmark Edition by RL Vision",IDC_STATIC,45,78,116,8
+ CONTROL "<a>http://www.rlvision.com</a>",BME_RLV_LINK,"SysLink",WS_TABSTOP,45,90,116,10
+ LTEXT "http://www.rlvision.com",BME_RLV_LINK2,45,90,116,8,NOT WS_VISIBLE | WS_DISABLED
END
IDD_FIND DIALOGEX 0, 0, 272, 101
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP |
- WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Find Text"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Search Strin&g:",IDC_STATIC,7,7,46,8
- COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL |
- WS_VSCROLL | WS_TABSTOP
- CONTROL "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,37,53,10
- CONTROL "Match &whole word only",IDC_FINDWORD,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10
- CONTROL "Match &beginning of word only",IDC_FINDSTART,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10
- CONTROL "Regular &expression search",IDC_FINDREGEXP,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,73,101,10
- CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,85,89,10
- CONTROL "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,125,37,75,10
- CONTROL "C&lose after find",IDC_FINDCLOSE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,125,49,65,10
+ COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,53,10
+ CONTROL "Match &whole word only",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10
+ CONTROL "Match &beginning of word only",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10
+ CONTROL "Regular &expression search",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,96,10
+ CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,85,10
+ CONTROL "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10
+ CONTROL "C&lose after find",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,65,10
DEFPUSHBUTTON "&Find Next",IDOK,215,7,50,14
PUSHBUTTON "Find &Previous",IDC_FINDPREV,215,24,50,14
PUSHBUTTON "&Select Down",IDC_SELECTTO,215,41,50,14
@@ -609,34 +542,28 @@ BEGIN
PUSHBUTTON "Close",IDCANCEL,215,75,50,14
CONTROL "<a>Goto Replace (Ctrl+H)</a>",IDC_TOGGLEFINDREPLACE,
"SysLink",0x0,125,85,74,10
+ CONTROL "<a>(?)</a>",IDC_BACKSLASHHELP,"SysLink",0x0,96,85,14,10
+ CONTROL "<a>(?)</a>",IDC_REGEXPHELP,"SysLink",0x0,106,73,14,10
+ CONTROL "W&ildcard Search",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,63,10
+ CONTROL "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,61,14,10
END
IDD_REPLACE DIALOGEX 0, 0, 272, 130
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP |
- WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Replace Text"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Search Strin&g:",IDC_STATIC,7,7,46,8
- COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL |
- WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "Replace wit&h:",IDC_STATIC,7,35,44,8
- COMBOBOX IDC_REPLACETEXT,7,46,192,116,CBS_DROPDOWN |
- CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- CONTROL "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,66,53,10
- CONTROL "Match &whole word only",IDC_FINDWORD,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10
- CONTROL "Match &beginning of word only",IDC_FINDSTART,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10
- CONTROL "Regular &expression search",IDC_FINDREGEXP,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,102,101,10
- CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,114,89,10
- CONTROL "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,125,66,75,10
- CONTROL "C&lose after replace",IDC_FINDCLOSE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,125,78,77,10
+ COMBOBOX IDC_REPLACETEXT,7,46,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,53,10
+ CONTROL "Match &whole word only",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10
+ CONTROL "Match &beginning of word only",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10
+ CONTROL "Regular &expression search",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,97,10
+ CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,86,10
+ CONTROL "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10
+ CONTROL "C&lose after replace",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,77,10
DEFPUSHBUTTON "&Find Next",IDOK,215,7,50,14
PUSHBUTTON "Find &Previous",IDC_FINDPREV,215,24,50,14
PUSHBUTTON "&Replace",IDC_REPLACE,215,41,50,14
@@ -645,17 +572,19 @@ BEGIN
PUSHBUTTON "Close",IDCANCEL,215,92,50,14
CONTROL "<a>Goto Find (Ctrl+F)</a>",IDC_TOGGLEFINDREPLACE,
"SysLink",0x0,125,114,74,10
+ CONTROL "<a>(?)</a>",IDC_BACKSLASHHELP,"SysLink",0x0,94,114,14,10
+ CONTROL "<a>(?)</a>",IDC_REGEXPHELP,"SysLink",0x0,107,102,14,10
+ CONTROL "W&ildcard Search",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,63,10
+ CONTROL "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,90,14,10
END
IDD_RUN DIALOGEX 0, 0, 224, 85
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Run"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
ICON IDI_RUN,IDC_STATIC,7,7,20,20
- LTEXT "Enter the name of an executable program file,\na folder or a document to open.",
- IDC_STATIC,35,7,188,17
+ LTEXT "Enter the name of an executable program file,\na folder or a document to open.",IDC_STATIC,35,7,188,17
EDITTEXT IDC_COMMANDLINE,35,35,165,13,ES_AUTOHSCROLL
PUSHBUTTON "",IDC_SEARCHEXE,204,35,13,13
DEFPUSHBUTTON "OK",IDOK,112,64,50,14
@@ -663,35 +592,27 @@ BEGIN
END
IDD_OPENWITH DIALOGEX 0, 0, 165, 129
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Open with..."
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- CONTROL "",IDC_OPENWITHDIR,"SysListView32",LVS_REPORT |
- LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS |
- LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER |
- WS_TABSTOP,7,7,151,69
+ CONTROL "",IDC_OPENWITHDIR,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,69
PUSHBUTTON "",IDC_GETOPENWITHDIR,7,83,13,13
- LTEXT "Click here to specify the directory with links to your favorite applications.",
- IDC_OPENWITHDESCR,26,83,132,18
+ LTEXT "Click here to specify the directory with links to your favorite applications.",IDC_OPENWITHDESCR,26,83,132,18
DEFPUSHBUTTON "OK",IDOK,52,108,50,14
PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14
SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10
END
IDD_DEFENCODING DIALOGEX 0, 0, 180, 108
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Encoding"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "&Default encoding:",IDC_STATIC,7,7,58,8
- CONTROL "",IDC_ENCODINGLIST,"ComboBoxEx32",CBS_DROPDOWNLIST |
- WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,7,20,166,128
- CONTROL "Skip automatic &Unicode detection.",
- IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,43,124,10
+ CONTROL "",IDC_ENCODINGLIST,"ComboBoxEx32",CBS_DROPDOWNLIST | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,7,20,166,128
+ CONTROL "Skip automatic &Unicode detection.",IDC_NOUNICODEDETECTION,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,43,124,10
CONTROL "Open 7-bit &ASCII files in UTF-8 mode.",IDC_ASCIIASUTF8,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,53,136,10
CONTROL "Don't parse encoding &tags.",IDC_ENCODINGFROMFILEVARS,
@@ -701,27 +622,22 @@ BEGIN
END
IDD_DEFEOLMODE DIALOGEX 0, 0, 180, 78
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Line Endings"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "&Default line ending mode:",IDC_STATIC,7,7,82,8
- COMBOBOX 100,7,20,98,196,CBS_DROPDOWNLIST | WS_VSCROLL |
- WS_TABSTOP
- CONTROL "&Ensure consistent line endings when saving.",
- IDC_CONSISTENTEOLS,"Button",BS_AUTOCHECKBOX | BS_VCENTER |
- WS_TABSTOP,7,48,157,10
- CONTROL "&Strip trailing blanks when saving.",
- IDC_AUTOSTRIPBLANKS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,60,121,10
+ COMBOBOX 100,7,20,98,196,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "&Ensure consistent line endings when saving.",IDC_CONSISTENTEOLS,
+ "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,48,157,10
+ CONTROL "&Strip trailing blanks when saving.",IDC_AUTOSTRIPBLANKS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,121,10
DEFPUSHBUTTON "OK",IDOK,123,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,123,24,50,14
END
IDD_LINENUM DIALOGEX 0, 0, 186, 47
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Goto"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
@@ -734,50 +650,36 @@ BEGIN
END
IDD_FILEMRU DIALOGEX 0, 0, 180, 134
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Open Recent File"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- CONTROL "",IDC_FILEMRU,"SysListView32",LVS_REPORT |
- LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS |
- LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER |
- WS_TABSTOP,7,7,166,80
- CONTROL "&Save recent files on exit.",IDC_SAVEMRU,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,95,96,10
+ CONTROL "",IDC_FILEMRU,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,166,80
+ CONTROL "&Save recent files on exit.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,96,10
DEFPUSHBUTTON "OK",IDOK,67,113,50,14,WS_DISABLED
PUSHBUTTON "Cancel",IDCANCEL,123,113,50,14
SCROLLBAR IDC_RESIZEGRIP,7,117,10,10
END
IDD_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "File Change Notification"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- CONTROL "&None.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP |
- WS_TABSTOP,7,7,35,10
- CONTROL "&Display message.",101,"Button",BS_AUTORADIOBUTTON |
- WS_TABSTOP,7,19,71,10
- CONTROL "&Auto-reload (unmodified).",102,"Button",
- BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
- CONTROL "&Reset if a new file is opened.",103,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
+ CONTROL "&None.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
+ CONTROL "&Display message.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
+ CONTROL "&Auto-reload (unmodified).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
+ CONTROL "&Reset if a new file is opened.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14
END
IDD_STYLESELECT DIALOGEX 0, 0, 165, 134
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Select Scheme"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT |
- LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS |
- LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER |
- WS_TABSTOP,7,7,151,70
+ CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70
CONTROL "Set selected scheme as &default.",IDC_DEFAULTSCHEME,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10
CONTROL "&Auto-select by filename extension.",IDC_AUTOSELECT,
@@ -788,13 +690,11 @@ BEGIN
END
IDD_STYLECONFIG DIALOGEX 0, 0, 468, 238
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Customize Schemes"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- CONTROL "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS |
- WS_BORDER | WS_TABSTOP | 0x400,7,7,164,224
+ CONTROL "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_TABSTOP,7,7,164,224
LTEXT "",IDC_STYLELABEL,181,140,280,8
EDITTEXT IDC_STYLEEDIT,181,152,280,15,ES_AUTOHSCROLL
PUSHBUTTON "For&e...",IDC_STYLEFORE,181,174,46,14
@@ -811,15 +711,12 @@ BEGIN
GROUPBOX "Info",IDC_STATIC,181,7,280,127
ICON IDI_STYLES,IDC_STATIC,189,19,20,20
LTEXT "Customize Schemes",IDC_TITLE,220,25,200,12
- LTEXT "Filename extensions must be separated by ;\n\nStyle format:\nfont:Name;size:nn;bold;italic;underline;fore:#ffffff;back:#bbbbbb;eolfilled\n\nStyle properties can be copied using copy and paste or drag and drop.\n\nThe ""Preview"" button will not apply any changes.",
- IDC_STATIC,197,50,252,70
- LTEXT "Associated file&name extensions:|Style &settings:",
- IDC_STYLELABELS,315,230,152,8,NOT WS_VISIBLE
+ LTEXT "Filename extensions must be separated by ;\n\nStyle format:\nfont:Name;size:nn;bold;italic;underline;fore:#ffffff;back:#bbbbbb;eolfilled\n\nStyle properties can be copied using copy and paste or drag and drop.\n\nThe ""Preview"" button will not apply any changes.",IDC_STATIC,197,50,252,70
+ LTEXT "Associated file&name extensions:|Style &settings:",IDC_STYLELABELS,315,230,152,8,NOT WS_VISIBLE
END
IDD_TABSETTINGS DIALOGEX 0, 0, 174, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Tab Settings"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
@@ -827,77 +724,58 @@ BEGIN
EDITTEXT 100,67,7,30,14,ES_AUTOHSCROLL
LTEXT "&Indentation size:",IDC_STATIC,7,30,55,8
EDITTEXT 101,67,27,30,14,ES_AUTOHSCROLL
- CONTROL "Insert tabs as &spaces.",102,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,87,10
- CONTROL "Tab &key reformats indentation.",103,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,59,115,10
+ CONTROL "Insert tabs as &spaces.",102,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,87,10
+ CONTROL "Tab &key reformats indentation.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,115,10
DEFPUSHBUTTON "OK",IDOK,117,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,117,24,50,14
END
IDD_LONGLINES DIALOGEX 0, 0, 184, 55
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Long Lines"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Limit for long lines:",IDC_STATIC,7,10,60,8
EDITTEXT 100,77,7,30,14,ES_AUTOHSCROLL
- CONTROL "Show &edge line.",101,"Button",BS_AUTORADIOBUTTON |
- WS_GROUP | WS_TABSTOP,7,27,67,10
- CONTROL "Change &background color.",102,"Button",
- BS_AUTORADIOBUTTON | WS_TABSTOP,7,38,100,10
+ CONTROL "Show &edge line.",101,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,27,67,10
+ CONTROL "Change &background color.",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,38,100,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14
END
IDD_WORDWRAP DIALOGEX 0, 0, 196, 126
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Word Wrap Settings"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "&Subline indent:",IDC_STATIC,7,7,48,8
- COMBOBOX 100,7,17,182,196,CBS_DROPDOWNLIST | WS_VSCROLL |
- WS_TABSTOP
+ COMBOBOX 100,7,17,182,196,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Visual indicators:",IDC_STATIC,7,33,54,8
- COMBOBOX 101,7,43,182,196,CBS_DROPDOWNLIST | WS_VSCROLL |
- WS_TABSTOP
- COMBOBOX 102,7,57,182,196,CBS_DROPDOWNLIST | WS_VSCROLL |
- WS_TABSTOP
+ COMBOBOX 101,7,43,182,196,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 102,7,57,182,196,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Break &mode:",IDC_STATIC,7,73,41,8
- COMBOBOX 103,7,83,182,196,CBS_DROPDOWNLIST | WS_VSCROLL |
- WS_TABSTOP
+ COMBOBOX 103,7,83,182,196,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,83,105,50,14
PUSHBUTTON "Cancel",IDCANCEL,139,105,50,14
- LTEXT "None|1 character|2 characters|1 indent level|2 indent levels|As first subline|1 level more than first subline",