From 33ea2a0474cec4f17d44cff0a0a7390491334c01 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Mon, 19 Jul 2021 00:42:09 -0600 Subject: [PATCH 01/25] Initial implementation of styles --- flamerobin_flamerobin.vcxproj | 142 +-- flamerobin_flamerobin.vcxproj.filters | 6 + src/config/Config.cpp | 10 +- src/config/Config.h | 5 + src/gui/AdvancedSearchFrame.cpp | 2 +- src/gui/EditBlobDialog.cpp | 6 +- src/gui/ExecuteSqlFrame.cpp | 49 +- src/gui/FRLayoutConfig.cpp | 3 +- src/gui/FRLayoutConfig.h | 1 + src/gui/FRStyle.cpp | 517 +++++++++ src/gui/FRStyle.h | 232 +++++ src/gui/StatementHistoryDialog.cpp | 2 +- src/gui/controls/DataGrid.cpp | 17 + src/gui/controls/DataGridTable.cpp | 4 +- src/gui/controls/DataGridTable.h | 1 + src/gui/controls/LogTextControl.cpp | 2 +- src/gui/controls/TextControl.cpp | 2 + xml-styles/Bespin.xml | 792 ++++++++++++++ xml-styles/Black board.xml | 790 ++++++++++++++ xml-styles/Choco.xml | 790 ++++++++++++++ xml-styles/DansLeRuSH-Dark.xml | 910 ++++++++++++++++ xml-styles/DarkModeDefault.xml | 1385 +++++++++++++++++++++++++ xml-styles/Deep Black.xml | 770 ++++++++++++++ xml-styles/Hello Kitty.xml | 765 ++++++++++++++ xml-styles/HotFudgeSundae.xml | 928 +++++++++++++++++ xml-styles/Mono Industrial.xml | 794 ++++++++++++++ xml-styles/Monokai.xml | 810 +++++++++++++++ xml-styles/MossyLawn.xml | 929 +++++++++++++++++ xml-styles/Navajo.xml | 926 +++++++++++++++++ xml-styles/Obsidian.xml | 811 +++++++++++++++ xml-styles/Plastic Code Wrap.xml | 806 ++++++++++++++ xml-styles/Ruby Blue.xml | 643 ++++++++++++ xml-styles/Solarized-light.xml | 937 +++++++++++++++++ xml-styles/Solarized.xml | 937 +++++++++++++++++ xml-styles/Twilight.xml | 795 ++++++++++++++ xml-styles/Vibrant Ink.xml | 766 ++++++++++++++ xml-styles/Zenburn.xml | 1385 +++++++++++++++++++++++++ xml-styles/khaki.xml | 926 +++++++++++++++++ xml-styles/stylers.xml | 50 + xml-styles/vim Dark Blue.xml | 760 ++++++++++++++ 40 files changed, 20295 insertions(+), 111 deletions(-) create mode 100644 src/gui/FRStyle.cpp create mode 100644 src/gui/FRStyle.h create mode 100644 xml-styles/Bespin.xml create mode 100644 xml-styles/Black board.xml create mode 100644 xml-styles/Choco.xml create mode 100644 xml-styles/DansLeRuSH-Dark.xml create mode 100644 xml-styles/DarkModeDefault.xml create mode 100644 xml-styles/Deep Black.xml create mode 100644 xml-styles/Hello Kitty.xml create mode 100644 xml-styles/HotFudgeSundae.xml create mode 100644 xml-styles/Mono Industrial.xml create mode 100644 xml-styles/Monokai.xml create mode 100644 xml-styles/MossyLawn.xml create mode 100644 xml-styles/Navajo.xml create mode 100644 xml-styles/Obsidian.xml create mode 100644 xml-styles/Plastic Code Wrap.xml create mode 100644 xml-styles/Ruby Blue.xml create mode 100644 xml-styles/Solarized-light.xml create mode 100644 xml-styles/Solarized.xml create mode 100644 xml-styles/Twilight.xml create mode 100644 xml-styles/Vibrant Ink.xml create mode 100644 xml-styles/Zenburn.xml create mode 100644 xml-styles/khaki.xml create mode 100644 xml-styles/stylers.xml create mode 100644 xml-styles/vim Dark Blue.xml diff --git a/flamerobin_flamerobin.vcxproj b/flamerobin_flamerobin.vcxproj index 0c79b6d2..42c9bd7b 100644 --- a/flamerobin_flamerobin.vcxproj +++ b/flamerobin_flamerobin.vcxproj @@ -290,12 +290,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -314,14 +314,14 @@ _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) vcud\flamerobin.exe true - $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) true vcud\flamerobin.pdb Windows @@ -335,12 +335,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_x64_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_x64_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN64;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -359,13 +359,13 @@ _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) true - $(WXDIR)\lib\vc_x64_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_x64_lib;%(AdditionalLibraryDirectories) true vcud\flamerobin.pdb Windows @@ -378,7 +378,7 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) @@ -402,14 +402,14 @@ _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) flamerobin.exe true - $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) true vcusd\flamerobin.pdb Windows @@ -423,7 +423,7 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) @@ -447,14 +447,14 @@ _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) + wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) vcusd\flamerobin.exe true - $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) true vcusd\flamerobin.pdb Windows @@ -467,7 +467,7 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) @@ -489,14 +489,14 @@ _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) vcu\flamerobin.exe true - $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) vcu\flamerobin.pdb Windows MachineX86 @@ -509,12 +509,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_x64_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_x64_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) _WIN64;_WINDOWS;__WINDOWS__;WINVER=0x500;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -532,14 +532,14 @@ _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) vcu\flamerobin.exe true - $(WXDIR)\lib\vc_x64_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_x64_lib;%(AdditionalLibraryDirectories) vcu\flamerobin.pdb Windows @@ -551,12 +551,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x500;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreaded @@ -573,14 +573,14 @@ _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) vcus\flamerobin.exe true - $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) vcus\flamerobin.pdb Windows MachineX86 @@ -593,12 +593,12 @@ WIN64;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_x64_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_x64_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN64;_WINDOWS;__WINDOWS__;WINVER=0x500;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreaded @@ -616,14 +616,14 @@ _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) vcus\flamerobin.exe true - $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) vcus\flamerobin.pdb Windows @@ -635,12 +635,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -659,14 +659,14 @@ _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) + wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) vcud\flamerobin.exe true - $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) true vcud\flamerobin.pdb Windows @@ -680,12 +680,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -704,14 +704,14 @@ _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) + wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) vcud\flamerobin.exe true - $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) true vcud\flamerobin.pdb Windows @@ -724,12 +724,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_WINDOWS;__WINDOWS__;WINVER=0X0400;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -748,14 +748,14 @@ _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) + wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) vcusd\flamerobin.exe true - $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) true vcusd\flamerobin.pdb Windows @@ -769,12 +769,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -793,14 +793,14 @@ _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) + wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) vcusd\flamerobin.exe true - $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) true vcusd\flamerobin.pdb Windows @@ -813,12 +813,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -835,14 +835,14 @@ _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30u_aui.lib;wxmsw30u_stc.lib;wxmsw30u_html.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxbase30u_xml.lib;wxbase30u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) + wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) vcu\flamerobin.exe true - $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) vcu\flamerobin.pdb Windows MachineX86 @@ -855,12 +855,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -878,14 +878,14 @@ _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30u_aui.lib;wxmsw30u_stc.lib;wxmsw30u_html.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxbase30u_xml.lib;wxbase30u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) + wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) vcu\flamerobin.exe true - $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) vcu\flamerobin.pdb Windows @@ -897,12 +897,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreaded @@ -919,14 +919,14 @@ _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30u_aui.lib;wxmsw30u_stc.lib;wxmsw30u_html.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxbase30u_xml.lib;wxbase30u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) + wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) vcus\flamerobin.exe true - $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) vcus\flamerobin.pdb Windows MachineX86 @@ -939,12 +939,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreaded @@ -962,14 +962,14 @@ _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw30u_aui.lib;wxmsw30u_stc.lib;wxmsw30u_html.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxbase30u_xml.lib;wxbase30u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) + wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) vcus\flamerobin.exe true - $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) vcus\flamerobin.pdb Windows @@ -1062,6 +1062,7 @@ + @@ -1172,6 +1173,7 @@ + diff --git a/flamerobin_flamerobin.vcxproj.filters b/flamerobin_flamerobin.vcxproj.filters index dc8efa78..b6f1f031 100644 --- a/flamerobin_flamerobin.vcxproj.filters +++ b/flamerobin_flamerobin.vcxproj.filters @@ -342,6 +342,9 @@ Source Files + + Source Files + @@ -674,6 +677,9 @@ Header Files + + Header Files + diff --git a/src/config/Config.cpp b/src/config/Config.cpp index 7e768b6c..c8fe4612 100644 --- a/src/config/Config.cpp +++ b/src/config/Config.cpp @@ -39,13 +39,13 @@ #include "frconfig.h" #endif #include "core/FRError.h" - +#include"gui/FRStyle.h" const wxString Config::pathSeparator = "/"; FRConfig& config() { - static FRConfig c; + static FRConfig c; return c; } @@ -402,6 +402,12 @@ const wxString FRConfig::getSysTemplateFileName(const wxString& templateName) return fileName.GetFullPath(); } +wxString FRConfig::getXmlStylesPath() const +{ + return getHomePath() + "xml-styles" + + wxFileName::GetPathSeparator(); +} + bool FRConfig::getUseLocalConfig() const { bool b; diff --git a/src/config/Config.h b/src/config/Config.h index ca2ec3e4..3fa962b3 100644 --- a/src/config/Config.h +++ b/src/config/Config.h @@ -30,6 +30,7 @@ #include "core/Observer.h" #include "core/Subject.h" +#include "gui/FRStyle.h" enum StorageGranularity { @@ -60,6 +61,7 @@ class Config: public Subject wxString homePathM; wxString userHomePathM; wxFileName configFileNameM; + protected: virtual void lockedChanged(bool locked); public: @@ -147,6 +149,9 @@ class FRConfig: public Config // Returns the full pathname of the specified system template, giving // precedence to any existing user override. const wxString getSysTemplateFileName(const wxString& templateName); + // returns the path containing the xml styles. + wxString getXmlStylesPath() const; + bool getUseLocalConfig() const; }; diff --git a/src/gui/AdvancedSearchFrame.cpp b/src/gui/AdvancedSearchFrame.cpp index 3e4de2e2..96bd2c0d 100644 --- a/src/gui/AdvancedSearchFrame.cpp +++ b/src/gui/AdvancedSearchFrame.cpp @@ -456,7 +456,7 @@ void AdvancedSearchFrame::OnListCtrlResultsItemSelected(wxListEvent& event) p = sql.find(sfind, p+1); if (p == int(wxString::npos)) break; - stc_ddl->StartStyling(p, 0); + stc_ddl->StartStyling(p); stc_ddl->SetStyling(len, 1+color%2); } } diff --git a/src/gui/EditBlobDialog.cpp b/src/gui/EditBlobDialog.cpp index 00415b0a..60a576a7 100644 --- a/src/gui/EditBlobDialog.cpp +++ b/src/gui/EditBlobDialog.cpp @@ -127,12 +127,12 @@ void EditBlobDialogSTC::setIsNull(bool isNull) { wxStyledTextCtrl::SetText("[null]"); SelectAll(); - StartStyling(0, 0); + StartStyling(0); SetStyling(GetTextLength(), 0x0A); } else { - StartStyling(0, 0); + StartStyling(0); SetStyling(GetTextLength(), 0); } isNullM = isNull; @@ -785,7 +785,7 @@ bool EditBlobDialog::loadFromStreamAsBinary(wxInputStream& stream, bool isNull, } } // Set text styling - blob_binary->StartStyling(0, 0); + blob_binary->StartStyling(0); for (int i = 0; i < blob_binary->GetLineCount(); i++) blob_binary->SetStyleBytes(CharsPerLine, &styleBytes[0]); progressEnd(); diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp index fefbad2a..42b0550f 100644 --- a/src/gui/ExecuteSqlFrame.cpp +++ b/src/gui/ExecuteSqlFrame.cpp @@ -87,6 +87,8 @@ #include "sql/StatementBuilder.h" #include "statementHistory.h" +#include "gui/FRStyle.h" + class SqlEditorDropTarget : public wxDropTarget { public: @@ -253,7 +255,7 @@ bool SqlEditorDropTarget::OnDropText(wxCoord, wxCoord, const wxString& text) SqlEditor::SqlEditor(wxWindow *parent, wxWindowID id) : SearchableEditor(parent, id) { - wxString s; + /*wxString s; if (config().getValue("SqlEditorFont", s) && !s.empty()) { wxFont f; @@ -270,7 +272,7 @@ SqlEditor::SqlEditor(wxWindow *parent, wxWindowID id) int charset; if (config().getValue("SqlEditorCharset", charset)) StyleSetCharacterSet(wxSTC_STYLE_DEFAULT, charset); - + */ setup(); } @@ -308,32 +310,9 @@ void SqlEditor::setChars(bool firebirdIdentifierOnly) //! This code has to be called each time the font has changed, so that the control updates void SqlEditor::setup() { + stylerManager().assignGlobal(this); StyleClearAll(); - - StyleSetForeground(wxSTC_SQL_DEFAULT, wxColour(0x80, 0x00, 0x00)); - StyleSetForeground(wxSTC_SQL_COMMENT, wxColour(0x00, 0xa0, 0x00)); // multiline comment - StyleSetForeground(wxSTC_SQL_COMMENTLINE, wxColour(0x00, 0xa0, 0x00)); // one-line comment - StyleSetForeground(wxSTC_SQL_COMMENTDOC, wxColour(0x00, 0xff, 0x00)); - StyleSetForeground(wxSTC_SQL_NUMBER, wxColour(0x00, 0x00, 0xff)); // number - StyleSetForeground(wxSTC_SQL_WORD, wxColour(0x00, 0x00, 0x7f)); // keyword - StyleSetForeground(wxSTC_SQL_STRING, wxColour(0x00, 0x00, 0xff)); // 'single quotes' - StyleSetForeground(wxSTC_SQL_CHARACTER, wxColour(0xff, 0x00, 0xff)); - StyleSetForeground(wxSTC_SQL_SQLPLUS, wxColour(0x00, 0x7f, 0x7f)); - StyleSetForeground(wxSTC_SQL_SQLPLUS_PROMPT, wxColour(0xff, 0x00, 0x00)); - StyleSetForeground(wxSTC_SQL_OPERATOR, wxColour(0x00, 0x00, 0x00)); // ops - StyleSetForeground(wxSTC_SQL_IDENTIFIER, wxColour(0x00, 0x00, 0x00)); - - StyleSetBackground(wxSTC_STYLE_BRACELIGHT, wxColour(0xff, 0xcc, 0x00)); // brace highlight - StyleSetBackground(wxSTC_STYLE_BRACEBAD, wxColour(0xff, 0x33, 0x33)); // brace bad highlight - - StyleSetBold(wxSTC_SQL_WORD, TRUE); - StyleSetBold(wxSTC_SQL_OPERATOR, TRUE); - StyleSetBold(wxSTC_STYLE_BRACELIGHT, TRUE); - StyleSetBold(wxSTC_STYLE_BRACEBAD, TRUE); - - StyleSetItalic(wxSTC_SQL_COMMENT, TRUE); - StyleSetItalic(wxSTC_SQL_COMMENTLINE, TRUE); - + stylerManager().assignLexer(this); SetLexer(wxSTC_LEX_SQL); setChars(false); @@ -348,6 +327,7 @@ void SqlEditor::setup() SetMarginWidth(0, 40); // turn on the linenumbers margin, set width to 40pixels SetMarginWidth(1, 0); // turn off the folding margin SetMarginType(0, 1); // set margin type to linenumbers + //SetCaretLineVisible(true); if (config().get("sqlEditorShowEdge", false)) { SetEdgeMode(wxSTC_EDGE_LINE); @@ -355,8 +335,8 @@ void SqlEditor::setup() } if (!config().get("sqlEditorSmartHomeKey", true)) - CmdKeyAssign(wxSTC_KEY_HOME, wxSTC_SCMOD_NORM, wxSTC_CMD_HOMEDISPLAY); - + CmdKeyAssign(wxSTC_KEY_HOME, wxSTC_KEYMOD_NORM, wxSTC_CMD_HOMEDISPLAY); + centerCaret(false); } @@ -412,6 +392,7 @@ void SqlEditor::OnKillFocus(wxFocusEvent& event) void SqlEditor::setFont() { +/* // step 1 of 2: set font wxFont f, f2; wxString s; // since we can't get the font from control we ask config() for it @@ -478,6 +459,7 @@ void SqlEditor::setFont() showInformationDialog(wxGetTopLevelParent(this), _("The SQL editor font has been changed."), _("This setting affects only the SQL editor font. The font used in the result set data grid has to be changed separately."), AdvancedMessageDialogButtonsOk(), config(), "DIALOG_WarnFont", _("Do not show this information again")); +*/ } class ScrollAtEnd @@ -546,14 +528,20 @@ ExecuteSqlFrame::ExecuteSqlFrame(wxWindow* WXUNUSED(parent), int id, splitter_window_1 = new wxSplitterWindow(panel_contents, -1); styled_text_ctrl_sql = new SqlEditor(splitter_window_1, ID_stc_sql); + + notebook_1 = new wxNotebook(splitter_window_1, -1, wxDefaultPosition, wxDefaultSize, 0); notebook_pane_1 = new wxPanel(notebook_1, -1); styled_text_ctrl_stats = new wxStyledTextCtrl(notebook_pane_1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_THEME); + stylerManager().assignGlobal(styled_text_ctrl_stats); + + styled_text_ctrl_stats->StyleClearAll(); styled_text_ctrl_stats->SetWrapMode(wxSTC_WRAP_WORD); styled_text_ctrl_stats->StyleSetForeground(1, *wxRED); styled_text_ctrl_stats->StyleSetForeground(2, *wxBLUE); + notebook_1->AddPage(notebook_pane_1, _("Statistics")); notebook_pane_2 = new wxPanel(notebook_1, -1); @@ -800,6 +788,7 @@ void ExecuteSqlFrame::set_properties() statusbar_1->SetStatusText("Transaction status", 3); grid_data->SetTable(new DataGridTable(statementM, databaseM), true); + grid_data->SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); splitter_window_1->Initialize(styled_text_ctrl_sql); viewModeM = vmEditor; @@ -2950,7 +2939,7 @@ void ExecuteSqlFrame::log(wxString s, TextType type) if (type == ttSql) style = 2; - styled_text_ctrl_stats->StartStyling(startpos, 0); + styled_text_ctrl_stats->StartStyling(startpos); styled_text_ctrl_stats->SetStyling(endpos-startpos-1, style); } diff --git a/src/gui/FRLayoutConfig.cpp b/src/gui/FRLayoutConfig.cpp index fc622ab0..07d18a77 100644 --- a/src/gui/FRLayoutConfig.cpp +++ b/src/gui/FRLayoutConfig.cpp @@ -195,7 +195,8 @@ wxColour FRLayoutConfig::getReadonlyColour() { // first try to compute a colour that is between "white" and "gray" // (but use the actual system colours instead of hard-coded values) - wxColour clWnd(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + //wxColour clWnd(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + wxColour clWnd(stylerManager().getDefaultStyle()->getbgColor()); int r1 = clWnd.Red(), g1 = clWnd.Green(), b1 = clWnd.Blue(); wxColour clBtn = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); int r2 = clBtn.Red(), g2 = clBtn.Green(), b2 = clBtn.Blue(); diff --git a/src/gui/FRLayoutConfig.h b/src/gui/FRLayoutConfig.h index f435688b..9f59d5b5 100644 --- a/src/gui/FRLayoutConfig.h +++ b/src/gui/FRLayoutConfig.h @@ -29,6 +29,7 @@ #include +#include "gui/FRStyle.h" class FRLayoutConfig { diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp new file mode 100644 index 00000000..4c4bf5ad --- /dev/null +++ b/src/gui/FRStyle.cpp @@ -0,0 +1,517 @@ +/* + Copyright (c) 2004-2021 The FlameRobin Development Team + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +// for all others, include the necessary headers (this file is usually all you +// need because it includes almost all "standard" wxWindows headers +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif + +#include + +#include "wx/filename.h" +#include "wx/xml/xml.h" + +#include "FRStyle.h" + + + +FRStyle::FRStyle() + :styleIDM(-1), styleDescM(""), fgColorM(STYLE_NOT_USED), bgColorM(STYLE_NOT_USED), colorStyleM(COLORSTYLE_ALL), + fontNameM(""), fontStyleM(FONTSTYLE_NONE), fontSizeM(STYLE_NOT_USED), nestingM(FONTSTYLE_NONE), + keywordClassM(STYLE_NOT_USED), keywordsM("") +{ +} + +FRStyle::FRStyle(const FRStyle& style) +{ + styleIDM = style.styleIDM; + styleDescM = style.styleDescM; + fgColorM = style.fgColorM; + bgColorM = style.bgColorM; + colorStyleM = style.colorStyleM; + fontNameM = style.fontNameM; + fontSizeM = style.fontSizeM; + fontStyleM = style.fontStyleM; + keywordClassM = style.keywordClassM; + nestingM = style.nestingM; + keywordsM = style.keywordsM; +} + +FRStyle::~FRStyle() +{ +} + +FRStyle& FRStyle::operator=(const FRStyle& style) +{ + styleIDM = style.styleIDM; + styleDescM = style.styleDescM; + fgColorM = style.fgColorM; + bgColorM = style.bgColorM; + colorStyleM = style.colorStyleM; + fontNameM = style.fontNameM; + fontSizeM = style.fontSizeM; + fontStyleM = style.fontStyleM; + keywordClassM = style.keywordClassM; + nestingM = style.nestingM; + keywordsM = style.keywordsM; + + return *this; +} + +wxFont FRStyle::getFont() +{ + wxFontInfo fontInfo(getFontSize()); + + if (!getFontName().IsEmpty()) + fontInfo.FaceName(getFontName()); + + fontInfo.Bold(getFontStyle() & FONTSTYLE_BOLD); + fontInfo.Italic(getFontStyle() & FONTSTYLE_ITALIC); + fontInfo.Underlined(getFontStyle() & FONTSTYLE_UNDERLINE); + + wxFont font(fontInfo); + + return font; +} + +FRStyles::FRStyles() +{ + styleVectorM.clear(); +} + +FRStyles& FRStyles::operator=(const FRStyles& sa) +{ + if (this != &sa) + { + this->styleVectorM = sa.styleVectorM; + } + return *this; +} + +int FRStyles::getStylerIndexByID(int id) +{ + std::vector::iterator it; + it = std::find_if(styleVectorM.begin(), styleVectorM.end(), [id](FRStyle* style)->bool {return style->getStyleID() == id; }); + + if (it == styleVectorM.end()) + return -1; + else + return std::distance(styleVectorM.begin(), it); +} + +void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) +{ + /*bool isUser = styleID >> 16 == L_USER; + if (isUser) + { + styleID = (styleID & 0xFFFF); + index = styleID; + if (index >= SCE_USER_STYLE_TOTAL_STYLES || _styleArray[index]._styleID != -1) + return; + }*/ + + FRStyle* newStyle = new FRStyle(); + newStyle->setStyleID(styleID); + + if (styleNode) + { + wxXmlNode* element = styleNode; + + wxString str = element->GetAttribute("name"); + if (!str.IsEmpty()) + { + /*if (isUser) + _styleArray[index]._styleDesc = globalMappper().styleNameMapper[index].c_str(); + else*/ + newStyle->setStyleDesc(str); + } + + str = element->GetAttribute("fgColor"); + if (!str.IsEmpty()) + { + + long result; + str.ToLong(&result, 16); + newStyle->setfgColor((RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + + } + + str = element->GetAttribute("bgColor"); + if (!str.IsEmpty()) + { + long result; + str.ToLong(&result, 16); + newStyle->setbgColor((RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + } + + str = element->GetAttribute("colorStyle"); + if (!str.IsEmpty()) + { + long temp; + str.ToLong(&temp, 10); + newStyle->setColorStyle(temp); + } + + str = element->GetAttribute("fontName"); + newStyle->setFontName(str); + + str = element->GetAttribute("fontStyle"); + if (!str.IsEmpty()) + { + long temp; + str.ToLong(&temp, 10); + newStyle->setFontStyle(temp); + } + + str = element->GetAttribute("fontSize"); + if (!str.IsEmpty()) + { + long temp; + str.ToLong(&temp, 10); + newStyle->setFontSize(temp); + } + + str = element->GetAttribute("caseVisible"); + if (!str.IsEmpty()) + { + long temp; + str.ToLong(&temp, 10); + newStyle->setCaseVisible(temp); + } + + str = element->GetAttribute("nesting"); + if (!str.IsEmpty()) + { + long temp; + str.ToLong(&temp, 10); + newStyle->setNesting(temp); + } + + /*str = element->GetAttribute("keywordClass"); + if (!str.IsEmpty()) + { + newStyle->setKeywordClass(getKwClassFromName(str)); + }*/ + + wxXmlNode* v = styleNode->GetChildren(); + if (v) + { + newStyle->setKeywords(v->GetContent()); + } + } + + styleVectorM.push_back(newStyle); +} + +void FRStyles::addStyler(int styleID, const wxString styleName) +{ + FRStyle* newStyle = new FRStyle(); + newStyle->setStyleID(styleID); + newStyle->setStyleDesc(styleName); + newStyle->setfgColor(wxBLACK->GetRGB()); + newStyle->setbgColor(wxWHITE->GetRGB()); + + styleVectorM.push_back(newStyle); + +} + +int FRStyles::getStylerIndexByName(wxString styleName) +{ + if (styleName.IsEmpty()) + return -1; + + std::vector::iterator it; + it = std::find_if(styleVectorM.begin(), styleVectorM.end(), [styleName](FRStyle* style)->bool {return style->getStyleDesc() == styleName; }); + + if (it == styleVectorM.end()) + return -1; + else + return std::distance(styleVectorM.begin(), it); +} + +FRStyle* FRStyles::getStyle(size_t index) +{ + assert(index < wxSTC_STYLE_MAX); + return styleVectorM[index]; +} + + +FRLexerStyler::FRLexerStyler() + :FRStyles() +{ + +} + +FRLexerStyler& FRLexerStyler::operator=(const FRLexerStyler& ls) +{ + if (this != &ls) + { + *(static_cast(this)) = ls; + this->setLexerName(ls.getLexerName()); + this->setLexerDesc(ls.getLexerDesc()); + this->setLexerUserExt(ls.getLexerUserExt()); + } + return *this; +} + + +FRLexerStylers::FRLexerStylers() +{ + lexerStylerVectorM.clear(); +} + +FRLexerStylers& FRLexerStylers::operator=(const FRLexerStylers& lsa) +{ + if (this != &lsa) + { + this->lexerStylerVectorM = lsa.lexerStylerVectorM; + } + return *this; +} + +FRLexerStyler* FRLexerStylers::getLexerStylerByName(wxString lexerName) +{ + if (!lexerName) + return NULL; + + std::vector::iterator it; + it = std::find_if(lexerStylerVectorM.begin(), lexerStylerVectorM.end(), [lexerName](FRLexerStyler* style)->bool {return style->getLexerName() == lexerName; }); + + if (it == lexerStylerVectorM.end()) + return NULL; + else + return (FRLexerStyler*)&*it; + +} + +int FRLexerStylers::getLexerStylerIndexByName(wxString lexerName) +{ + if (lexerName.IsEmpty()) + return -1; + + std::vector::iterator it; + it = std::find_if(lexerStylerVectorM.begin(), lexerStylerVectorM.end(), [lexerName](FRLexerStyler* style)->bool {return style->getLexerName() == lexerName; }); + if (it == lexerStylerVectorM.end()) + return -1; + else + return std::distance(lexerStylerVectorM.begin(), it); +} + +void FRLexerStylers::addLexerStyler(wxString lexerName, wxString lexerDesc, wxString lexerUserExt, wxXmlNode* lexerNode) +{ + FRLexerStyler* ls = new FRLexerStyler(); + ls->setLexerName(lexerName); + + if (!lexerDesc.IsEmpty()) + ls->setLexerDesc(lexerDesc); + + if (!lexerUserExt.IsEmpty()) + ls->setLexerUserExt(lexerUserExt); + + wxXmlNode* child = lexerNode->GetChildren(); + while (child) { + if (child->GetName() == "WordsStyle") { + long styleID = -1; + if (child->GetAttribute("styleID").ToLong(&styleID)) { + ls->addStyler(styleID, child); + } + } + child = child->GetNext(); + } + + lexerStylerVectorM.push_back(ls); +} + +void FRLexerStylers::eraseAll() +{ + //std::for_each(lexerStylerVectorM.begin(), lexerStylerVectorM.end(), [] {lexerStylerVectorM[].clear();}); + lexerStylerVectorM.clear(); +} + +FRStyleManager& stylerManager() +{ + const wxString STYLE = "Style"; + const wxString def = "stylers.xml"; + + wxFileName file = wxFileName(config().getXmlStylesPath(), config().get(STYLE, def)); + static FRStyleManager s(file); + return s; +} + +void FRStyleManager::loadLexerStyles(wxXmlNode* node) +{ + wxXmlNode* child = node->GetChildren(); + + while (child) { + if (child->GetName() == "LexerType" /*&& child->GetAttribute("name")=="sql"*/) { + lexerStylesM.addLexerStyler(child->GetAttribute("name"), child->GetAttribute("desc"), child->GetAttribute("ext"), child); + } + child = child->GetNext(); + }; + +} + +void FRStyleManager::loadGlobalStyles(wxXmlNode* node) +{ + wxXmlNode* child = node->GetChildren(); + + while (child) { + if (child->GetName() == "WidgetStyle") { + long styleID = -1; + if (child->GetAttribute("styleID").ToLong(&styleID)) { + globalStylesM.addStyler(styleID, child); + } + } + child = child->GetNext(); + }; + +} + +void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) +{ + if (style->getbgColor() != 0){ + text->StyleSetBackground(style->getStyleID(), style->getbgColor()); + } + + if (style->getfgColor() != 0) { + text->StyleSetForeground(style->getStyleID(), style->getfgColor()); + } + + double size = style->getFontSize() == 0 ? globalStyleM->getFontSize() : style->getFontSize(); + wxFontInfo fontInfo(size); + + wxString fontName = style->getFontName().IsEmpty() ? globalStyleM->getFontName() : style->getFontName(); + fontInfo.FaceName(fontName); + + fontInfo.Bold(style->getFontStyle() & FONTSTYLE_BOLD); + fontInfo.Italic(style->getFontStyle() & FONTSTYLE_ITALIC); + fontInfo.Underlined(style->getFontStyle() & FONTSTYLE_UNDERLINE); + + wxFont font(fontInfo); + + text->StyleSetFont(style->getStyleID(), font); + + if (style->getCaseVisible() != 0) { + text->StyleSetCase(style->getStyleID(), style->getCaseVisible()); + } + +} + +FRStyleManager::FRStyleManager(wxFileName style) +{ + wxXmlDocument xmlDoc; + xmlDoc.Load(style.GetFullPath()); + if (xmlDoc.IsOk()) { + wxXmlNode* xmlNode = xmlDoc.GetRoot(); + if (xmlNode->GetName() == "Flamerobin") { + + wxXmlNode* child = xmlNode->GetChildren(); + while (child) { + if (!child) + break; + if (child->GetName() == "LexerStyles") { + loadLexerStyles(child); + } + if (child->GetName() == "GlobalStyles") { + loadGlobalStyles(child); + } + child = child->GetNext(); + } + } + } + +} + +void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) +{ + //text->StyleClearAll(); + + for (int i = 0; i < globalStylesM.getNbStyler(); i++) { + FRStyle* style = globalStylesM.getStyle(i); + if (style->getStyleID() != 0) { + assignWordStyle(text, style); + } + if (style->getStyleDesc() == "Global override") { + globalStyleM = style; + text->StyleResetDefault(); + text->SetBackgroundColour(style->getbgColor()); + text->SetForegroundColour(style->getfgColor()); + assignWordStyle(text, style); + } + if (style->getStyleDesc() == "Default Style") { + defaultStyleM = style; + } + if (style->getStyleDesc() == "Mark colour") {} + if (style->getStyleDesc() == "Selected text colour") { + text->SetSelBackground(true, style->getbgColor()); + //text->SetSelForeground(true, style->getfgColor()); + } + if (style->getStyleDesc() == "Edge colour") { + text->SetEdgeColour(style->getfgColor()); + } + if (style->getStyleDesc() == "Bookmark margin") { + //text->SetMarginBackground(wxSTC_MARGIN_SYMBOL,style->getbgColor()); + //text->SetMarginBackground(wxSTC_MARGIN_NUMBER, style->getbgColor()); + + } + if (style->getStyleDesc() == "Fold") {} + if (style->getStyleDesc() == "Fold active") {} + if (style->getStyleDesc() == "Fold margin") { + text->SetFoldMarginColour(true, style->getbgColor()); + text->SetFoldMarginHiColour(true, style->getfgColor()); + } + if (style->getStyleDesc() == "White space symbol") { + text->SetWhitespaceForeground(true, style->getfgColor()); + text->SetWhitespaceBackground(true, style->getbgColor()); + } + if (style->getStyleDesc() == "Active tab focused indicator") {} + if (style->getStyleDesc() == "Active tab unfocused indicator") {} + if (style->getStyleDesc() == "Active tab text") {} + if (style->getStyleDesc() == "Inactive tabs") {} + if (style->getStyleDesc() == "URL hovered") {} + if (style->getStyleDesc() == "Current line background colour") { + text->SetCaretLineBackground(style->getbgColor()); + text->SetCaretForeground(style->getfgColor()); + } + } + +} + +void FRStyleManager::assignLexer(wxStyledTextCtrl* text) +{ + //FRLexerStyler* lexer= lexerStylesM.getLexerStylerByName("sql"); lexerStylesM. + if (lexerStylesM.getNbLexerStyler() > 0) { + int index = lexerStylesM.getLexerStylerIndexByName("sql"); + FRLexerStyler* lexer = lexerStylesM.getLexerFromIndex(index); + if (lexer) { + int max = lexer->getNbStyler(); + for (int i = 0; i < max; i++) { + assignWordStyle(text, lexer->getStyle(i)); + } + } + } +} diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h new file mode 100644 index 00000000..99a3523b --- /dev/null +++ b/src/gui/FRStyle.h @@ -0,0 +1,232 @@ +/* + Copyright (c) 2004-2021 The FlameRobin Development Team + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#pragma once +#ifndef FR_STYLE_H +#define FR_STYLE_H + +#include +#include + +#include +#include +#include + +#include "config/Config.h" + +const int FONTSTYLE_NONE = 0; +const int FONTSTYLE_BOLD = 1; +const int FONTSTYLE_ITALIC = 2; +const int FONTSTYLE_UNDERLINE = 4; + +const int STYLE_NOT_USED = 0; + +const int COLORSTYLE_FOREGROUND = 0x01; +const int COLORSTYLE_BACKGROUND = 0x02; +const int COLORSTYLE_ALL = COLORSTYLE_FOREGROUND | COLORSTYLE_BACKGROUND; + +const int MAX_LEXER_STYLE = 100; + + + +class FRStyle +{ +protected: + int styleIDM; + wxString styleDescM; + + COLORREF fgColorM; + COLORREF bgColorM; + int colorStyleM; + + wxString fontNameM; + int fontStyleM; + int fontSizeM; + int caseVisibleM; + int nestingM; + + int keywordClassM; + wxString keywordsM; +public: + FRStyle(); + FRStyle(const FRStyle& style); + ~FRStyle(); + + FRStyle& operator = (const FRStyle& style); + + + int getStyleID() { return styleIDM; }; + void setStyleID(int id) { styleIDM = id; }; + + wxString getStyleDesc() { return styleDescM; }; + void setStyleDesc(wxString name) { styleDescM = name; }; + + + COLORREF getfgColor() { return fgColorM; }; + void setfgColor(COLORREF color) { fgColorM = color; }; + + COLORREF getbgColor() { return bgColorM; }; + void setbgColor(COLORREF color) { bgColorM = color; }; + + int getColorStyle() { return colorStyleM; }; + void setColorStyle(int color) { colorStyleM = color; }; + + + + wxString getFontName() { return fontNameM; }; + void setFontName(wxString name) { fontNameM = name; }; + + int getFontStyle() { return fontStyleM; }; + void setFontStyle(int font) { fontStyleM = font; }; + + int getFontSize() { return fontSizeM; }; + void setFontSize(int size) { fontSizeM = size; }; + + int getCaseVisible() { return caseVisibleM; }; + void setCaseVisible(int caseVisible) { caseVisibleM = caseVisible; }; + + int getNesting() { return nestingM; }; + void setNesting(int nesting) { nestingM = nesting; }; + + int getKeywordClass() { return keywordClassM; }; + void setKeywordClass(int keyword) { keywordClassM = keyword; }; + + wxString getKeywords() { return keywordsM; }; + void setKeywords(wxString keywords) { keywordsM = keywords; }; + + wxFont getFont(); + +}; + + +class FRStyles +{ + +protected: + std::vector styleVectorM; + +public: + FRStyles(); + + FRStyles& operator=(const FRStyles& sa); + + int getNbStyler() const { return styleVectorM.size(); }; + //void setNbStyler(int nb) { nbStylerM = nb; }; + + FRStyle* getStyle(size_t index); + + bool hasEnoughSpace() { return (getNbStyler() < wxSTC_STYLE_MAX); }; + void addStyler(int styleID, wxXmlNode* styleNode); + void addStyler(int styleID, const wxString styleName); + + int getStylerIndexByID(int id); + + int getStylerIndexByName(wxString styleName); + void clear() { styleVectorM.clear(); }; + +}; + + +class FRLexerStyler : public FRStyles +{ +private: + wxString lexerNameM; + wxString lexerDescM; + wxString lexerUserExtM; + +public: + FRLexerStyler(); + FRLexerStyler& operator=(const FRLexerStyler& ls); + + wxString getLexerName() const { return lexerNameM; }; + void setLexerName(wxString lexerName) { lexerNameM = lexerName; }; + + void setLexerDesc(wxString lexerDesc) { lexerDescM = lexerDesc; }; + wxString getLexerDesc() const { return lexerDescM; }; + + void setLexerUserExt(wxString lexerUserExt) { lexerUserExtM = lexerUserExt; }; + wxString getLexerUserExt() const { return lexerUserExtM; }; + +}; + + +class FRLexerStylers +{ +private: + std::vector lexerStylerVectorM; +protected: + +public: + FRLexerStylers(); + + FRLexerStylers& operator=(const FRLexerStylers& lsa); + + int getNbLexerStyler() const { return lexerStylerVectorM.size(); }; + //void setNbLexerStyler(int nbLexer) { nbLexerStylerM = nbLexer; }; + bool hasEnoughSpace() { return (getNbLexerStyler() < MAX_LEXER_STYLE); }; + + + + FRLexerStyler* getLexerFromIndex(int index) { return lexerStylerVectorM[index]; }; + + wxString getLexerNameFromIndex(int index) const { return lexerStylerVectorM[index]->getLexerName(); }; + wxString getLexerDescFromIndex(int index) const { return lexerStylerVectorM[index]->getLexerDesc(); }; + + FRLexerStyler* getLexerStylerByName(wxString lexerName); + int getLexerStylerIndexByName(wxString lexerName); + + void addLexerStyler(wxString lexerName, wxString lexerDesc, wxString lexerUserExt, wxXmlNode* lexerNode); + + void eraseAll(); +}; + +class FRStyleManager { +private: + FRStyles globalStylesM; + FRLexerStylers lexerStylesM; + FRStyle* globalStyleM; + FRStyle* defaultStyleM; +protected: + void loadLexerStyles(wxXmlNode* node); + void loadGlobalStyles(wxXmlNode* node); + + void assignWordStyle(wxStyledTextCtrl* text, FRStyle* style); +public: + FRStyleManager(wxFileName style); + + FRStyles getGlobalStyles() { return globalStylesM; }; + + FRStyle* getGlobalStyle() { return globalStyleM; }; + FRStyle* getDefaultStyle() { return defaultStyleM; }; + + void assignGlobal(wxStyledTextCtrl* text); + + void assignLexer(wxStyledTextCtrl* text); + +}; + +FRStyleManager& stylerManager(); + + + +#endif diff --git a/src/gui/StatementHistoryDialog.cpp b/src/gui/StatementHistoryDialog.cpp index 722cd001..37fff793 100644 --- a/src/gui/StatementHistoryDialog.cpp +++ b/src/gui/StatementHistoryDialog.cpp @@ -190,7 +190,7 @@ void StatementHistoryDialog::OnListBoxSelect(wxCommandEvent& WXUNUSED(event)) p = sql.find(searchString, p+1); if (p == int(wxString::npos)) break; - textctrl_statement->StartStyling(p, 0); + textctrl_statement->StartStyling(p); textctrl_statement->SetStyling(searchString.Length(), 1); } } diff --git a/src/gui/controls/DataGrid.cpp b/src/gui/controls/DataGrid.cpp index bc22ecd0..a0831ea1 100644 --- a/src/gui/controls/DataGrid.cpp +++ b/src/gui/controls/DataGrid.cpp @@ -65,6 +65,20 @@ DataGrid::DataGrid(wxWindow* parent, wxWindowID id) SetColLabelAlignment(wxALIGN_LEFT, wxALIGN_CENTRE); SetRowLabelAlignment(wxALIGN_RIGHT, wxALIGN_CENTRE); + SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); + SetForegroundColour(stylerManager().getDefaultStyle()->getfgColor()); + + SetSelectionBackground(stylerManager().getDefaultStyle()->getbgColor()); + SetSelectionForeground(stylerManager().getDefaultStyle()->getfgColor()); + + + SetDefaultCellBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); + SetDefaultCellTextColour(stylerManager().getDefaultStyle()->getfgColor()); + SetCellHighlightColour(stylerManager().getDefaultStyle()->getfgColor()); + + + SetDefaultCellFont(stylerManager().getDefaultStyle()->getFont()); + wxString s; wxFont f; if (config().getValue("DataGridFont", s) && !s.empty()) @@ -73,6 +87,9 @@ DataGrid::DataGrid(wxWindow* parent, wxWindowID id) if (f.Ok()) SetDefaultCellFont(f); } + + SetLabelFont(stylerManager().getDefaultStyle()->getFont()); + if (config().getValue("DataGridHeaderFont", s) && !s.empty()) { f.SetNativeFontInfo(s); diff --git a/src/gui/controls/DataGridTable.cpp b/src/gui/controls/DataGridTable.cpp index 4a8232e3..49e17353 100644 --- a/src/gui/controls/DataGridTable.cpp +++ b/src/gui/controls/DataGridTable.cpp @@ -210,7 +210,7 @@ wxGridCellAttr* DataGridTable::GetAttr(int row, int col, else if (info.fieldModified) textCol = *wxBLUE; else - textCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + textCol = stylerManager().getDefaultStyle()->getfgColor() != 0 ? stylerManager().getDefaultStyle()->getfgColor() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); cellAttriM->SetTextColour(textCol); // background colour @@ -222,7 +222,7 @@ wxGridCellAttr* DataGridTable::GetAttr(int row, int col, else if (readOnlyM || info.fieldReadOnly || info.fieldBlob) bgCol = frlayoutconfig().getReadonlyColour(); else - bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); + bgCol = stylerManager().getDefaultStyle()->getbgColor() != 0 ? stylerManager().getDefaultStyle()->getbgColor() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); cellAttriM->SetBackgroundColour(bgCol); // text alignment diff --git a/src/gui/controls/DataGridTable.h b/src/gui/controls/DataGridTable.h index d5fc49b3..18e203e9 100644 --- a/src/gui/controls/DataGridTable.h +++ b/src/gui/controls/DataGridTable.h @@ -30,6 +30,7 @@ #include #include "gui/controls/DataGridRows.h" +#include "gui/FRStyle.h" class Column; class Database; diff --git a/src/gui/controls/LogTextControl.cpp b/src/gui/controls/LogTextControl.cpp index c44dc19d..a618b4f8 100644 --- a/src/gui/controls/LogTextControl.cpp +++ b/src/gui/controls/LogTextControl.cpp @@ -56,7 +56,7 @@ void LogTextControl::addStyledText(const wxString& message, LogStyle style) bool atEnd = lenBefore == GetCurrentPos(); AppendText(message); int len = GetLength(); - StartStyling(lenBefore, 0); + StartStyling(lenBefore); SetStyling(len - lenBefore - 1, int(style)); if (atEnd) GotoPos(len); diff --git a/src/gui/controls/TextControl.cpp b/src/gui/controls/TextControl.cpp index a33826da..a578279a 100644 --- a/src/gui/controls/TextControl.cpp +++ b/src/gui/controls/TextControl.cpp @@ -33,6 +33,7 @@ #include "gui/CommandManager.h" #include "gui/controls/ControlUtils.h" #include "gui/controls/TextControl.h" +#include "gui/FRStyle.h" TextControl::TextControl(wxWindow *parent, wxWindowID id) : wxStyledTextCtrl(parent, id, wxDefaultPosition, wxDefaultSize, @@ -60,6 +61,7 @@ void TextControl::resetStyles() StyleSetForeground(wxSTC_STYLE_DEFAULT, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); // Make all other styles use these default colours + //stylerManager().assignGlobal(this); StyleClearAll(); } diff --git a/xml-styles/Bespin.xml b/xml-styles/Bespin.xml new file mode 100644 index 00000000..aacb632e --- /dev/null +++ b/xml-styles/Bespin.xml @@ -0,0 +1,792 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the_ID the_post have_posts wp_link_pages the_content + + + + $_POST $_GET $_SESSION + + + + + + + + + + + alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window + XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + ContentScroller + + + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Black board.xml b/xml-styles/Black board.xml new file mode 100644 index 00000000..01bc13aa --- /dev/null +++ b/xml-styles/Black board.xml @@ -0,0 +1,790 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Choco.xml b/xml-styles/Choco.xml new file mode 100644 index 00000000..cba2d597 --- /dev/null +++ b/xml-styles/Choco.xml @@ -0,0 +1,790 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ooooo + + + + + + ooooo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/DansLeRuSH-Dark.xml b/xml-styles/DansLeRuSH-Dark.xml new file mode 100644 index 00000000..c985d46b --- /dev/null +++ b/xml-styles/DansLeRuSH-Dark.xml @@ -0,0 +1,910 @@ + + + + + + + ContentScroller + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + ContentScroller + + + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + bool long int char + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window + XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the_ID the_post have_posts wp_link_pages the_content + + + + $_POST $_GET $_SESSION + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + raise + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/DarkModeDefault.xml b/xml-styles/DarkModeDefault.xml new file mode 100644 index 00000000..9d54812e --- /dev/null +++ b/xml-styles/DarkModeDefault.xml @@ -0,0 +1,1385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Deep Black.xml b/xml-styles/Deep Black.xml new file mode 100644 index 00000000..c35d5476 --- /dev/null +++ b/xml-styles/Deep Black.xml @@ -0,0 +1,770 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Hello Kitty.xml b/xml-styles/Hello Kitty.xml new file mode 100644 index 00000000..fbd072ce --- /dev/null +++ b/xml-styles/Hello Kitty.xml @@ -0,0 +1,765 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/HotFudgeSundae.xml b/xml-styles/HotFudgeSundae.xml new file mode 100644 index 00000000..d2574990 --- /dev/null +++ b/xml-styles/HotFudgeSundae.xml @@ -0,0 +1,928 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ooooo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the_ID the_post have_posts wp_link_pages the_content + + + + $_POST $_GET $_SESSION + + + + + + + + + + + + + + alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window + XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + ContentScroller + + + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + raise + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + bool long int char + + + + + bool long int char + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Mono Industrial.xml b/xml-styles/Mono Industrial.xml new file mode 100644 index 00000000..19da3e06 --- /dev/null +++ b/xml-styles/Mono Industrial.xml @@ -0,0 +1,794 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Monokai.xml b/xml-styles/Monokai.xml new file mode 100644 index 00000000..3c070f8d --- /dev/null +++ b/xml-styles/Monokai.xml @@ -0,0 +1,810 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/MossyLawn.xml b/xml-styles/MossyLawn.xml new file mode 100644 index 00000000..e3b2edf5 --- /dev/null +++ b/xml-styles/MossyLawn.xml @@ -0,0 +1,929 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xml-styles/Navajo.xml b/xml-styles/Navajo.xml new file mode 100644 index 00000000..ee58a7b9 --- /dev/null +++ b/xml-styles/Navajo.xml @@ -0,0 +1,926 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xml-styles/Obsidian.xml b/xml-styles/Obsidian.xml new file mode 100644 index 00000000..8119e4bf --- /dev/null +++ b/xml-styles/Obsidian.xml @@ -0,0 +1,811 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Plastic Code Wrap.xml b/xml-styles/Plastic Code Wrap.xml new file mode 100644 index 00000000..d9e5b128 --- /dev/null +++ b/xml-styles/Plastic Code Wrap.xml @@ -0,0 +1,806 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Ruby Blue.xml b/xml-styles/Ruby Blue.xml new file mode 100644 index 00000000..9172272c --- /dev/null +++ b/xml-styles/Ruby Blue.xml @@ -0,0 +1,643 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Solarized-light.xml b/xml-styles/Solarized-light.xml new file mode 100644 index 00000000..0fa226f2 --- /dev/null +++ b/xml-styles/Solarized-light.xml @@ -0,0 +1,937 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xml-styles/Solarized.xml b/xml-styles/Solarized.xml new file mode 100644 index 00000000..e4a0ac95 --- /dev/null +++ b/xml-styles/Solarized.xml @@ -0,0 +1,937 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xml-styles/Twilight.xml b/xml-styles/Twilight.xml new file mode 100644 index 00000000..10dacd60 --- /dev/null +++ b/xml-styles/Twilight.xml @@ -0,0 +1,795 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + raise + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Vibrant Ink.xml b/xml-styles/Vibrant Ink.xml new file mode 100644 index 00000000..deea338c --- /dev/null +++ b/xml-styles/Vibrant Ink.xml @@ -0,0 +1,766 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/Zenburn.xml b/xml-styles/Zenburn.xml new file mode 100644 index 00000000..9d54812e --- /dev/null +++ b/xml-styles/Zenburn.xml @@ -0,0 +1,1385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/khaki.xml b/xml-styles/khaki.xml new file mode 100644 index 00000000..bd91218b --- /dev/null +++ b/xml-styles/khaki.xml @@ -0,0 +1,926 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xml-styles/stylers.xml b/xml-styles/stylers.xml new file mode 100644 index 00000000..b2b4c12d --- /dev/null +++ b/xml-styles/stylers.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/vim Dark Blue.xml b/xml-styles/vim Dark Blue.xml new file mode 100644 index 00000000..d3927838 --- /dev/null +++ b/xml-styles/vim Dark Blue.xml @@ -0,0 +1,760 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 863f29aa372ee182c2570311d3713b7474da260e Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 02:23:05 -0600 Subject: [PATCH 02/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index b77ab796..425dfd11 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,7 +2,7 @@ name: C/C++ CI on: push: - branches: [ master, dev ] + branches: [ Stylers ] pull_request: branches: [ master, dev ] @@ -16,7 +16,7 @@ jobs: - name: apt update run: sudo apt-get update - name: Install tools and libs - run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk*-gtk3-dev -y + run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk*-gtk3.1-dev -y - name: CMake run: | mkdir build From a01d3e2d9ba8692126ff9a9c9521ebdb50b5c538 Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 02:24:50 -0600 Subject: [PATCH 03/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 425dfd11..00e0a566 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,7 +16,7 @@ jobs: - name: apt update run: sudo apt-get update - name: Install tools and libs - run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk*-gtk3.1-dev -y + run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk*-gtk3-dev -y - name: CMake run: | mkdir build From c7e030e0253c6466dd0349ff56367212e3fb3e18 Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 02:33:04 -0600 Subject: [PATCH 04/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 00e0a566..0fafb183 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,7 +2,7 @@ name: C/C++ CI on: push: - branches: [ Stylers ] + branches: [ master ] pull_request: branches: [ master, dev ] From 760385a083f6021a2f168632446f82c2c5c53bd8 Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 02:35:41 -0600 Subject: [PATCH 05/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 0fafb183..604ce1b7 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,7 +16,7 @@ jobs: - name: apt update run: sudo apt-get update - name: Install tools and libs - run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk*-gtk3-dev -y + run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk3.1-gtk3-dev -y - name: CMake run: | mkdir build From 3f4ca77969b40e3c3039798976458bcc7eb2f637 Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 02:36:24 -0600 Subject: [PATCH 06/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 604ce1b7..8df3db01 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,7 +2,7 @@ name: C/C++ CI on: push: - branches: [ master ] + branches: [ Stylers ] pull_request: branches: [ master, dev ] From b320b6b7ab2ba4e71ae5b6e8692cdecb165b5161 Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 02:37:39 -0600 Subject: [PATCH 07/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 8df3db01..a3d143fd 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,9 +2,9 @@ name: C/C++ CI on: push: - branches: [ Stylers ] + branches: [ master ] pull_request: - branches: [ master, dev ] + branches: [ master ] jobs: build: From 702a3c0bfdfca2539e61567fbb93c34857d8c7b2 Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 03:00:29 -0600 Subject: [PATCH 08/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index a3d143fd..6144dec1 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,7 +2,7 @@ name: C/C++ CI on: push: - branches: [ master ] + branches: [ Stylers ] pull_request: branches: [ master ] @@ -13,10 +13,14 @@ jobs: steps: - uses: actions/checkout@v2 + - name: wxWidgets 3.1 + run: sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc + - name: add repository + run: sudo apt-add-repository 'deb http://repos.codelite.org/wx3.1.5/ubuntu/ xenial universe' - name: apt update run: sudo apt-get update - name: Install tools and libs - run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk3.1-gtk3-dev -y + run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk3.1-dev -y - name: CMake run: | mkdir build From d193197ac07b767500a1913c2b2335df21795849 Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 03:07:36 -0600 Subject: [PATCH 09/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 6144dec1..fa533cad 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,7 +16,7 @@ jobs: - name: wxWidgets 3.1 run: sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc - name: add repository - run: sudo apt-add-repository 'deb http://repos.codelite.org/wx3.1.5/ubuntu/ xenial universe' + run: sudo apt-add-repository 'deb http://repos.codelite.org/wx3.1.5/ubuntu/ groovy universe' - name: apt update run: sudo apt-get update - name: Install tools and libs From 9d620fcaeb665d888ed25c95622ea752f6eb6490 Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 03:11:27 -0600 Subject: [PATCH 10/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index fa533cad..7482719d 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,7 +16,7 @@ jobs: - name: wxWidgets 3.1 run: sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc - name: add repository - run: sudo apt-add-repository 'deb http://repos.codelite.org/wx3.1.5/ubuntu/ groovy universe' + run: sudo apt-add-repository 'deb http://repos.codelite.org/wx3.1.5/ubuntu/ bionic universe' - name: apt update run: sudo apt-get update - name: Install tools and libs From 9fd1e85c70eef3aff97f98a3e2f0b484bdd3018e Mon Sep 17 00:00:00 2001 From: Jdochoa Date: Mon, 19 Jul 2021 03:12:55 -0600 Subject: [PATCH 11/25] Update ccpp.yml --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 7482719d..6144dec1 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,7 +16,7 @@ jobs: - name: wxWidgets 3.1 run: sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc - name: add repository - run: sudo apt-add-repository 'deb http://repos.codelite.org/wx3.1.5/ubuntu/ bionic universe' + run: sudo apt-add-repository 'deb http://repos.codelite.org/wx3.1.5/ubuntu/ xenial universe' - name: apt update run: sudo apt-get update - name: Install tools and libs From c56d9e71d5f066c4552d2d4c840dbc9afb42d9dd Mon Sep 17 00:00:00 2001 From: jdochoa Date: Mon, 19 Jul 2021 12:44:59 -0600 Subject: [PATCH 12/25] Fix COLORREF --- CMakeLists.txt | 2 ++ flamerobin.bkl | 2 ++ src/gui/FRStyle.cpp | 19 +++++++++++++++++-- src/gui/FRStyle.h | 8 ++++++-- src/gui/controls/DataGrid.cpp | 12 ++++++------ 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ee33f67..95f48906 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,6 +108,7 @@ list(APPEND SOURCE_LIST ${SOURCEDIR}/gui/FieldPropertiesDialog.cpp ${SOURCEDIR}/gui/FindDialog.cpp ${SOURCEDIR}/gui/FRLayoutConfig.cpp + ${SOURCEDIR}/gui/FRStyle.cpp ${SOURCEDIR}/gui/GUIURIHandlerHelper.cpp ${SOURCEDIR}/gui/HtmlHeaderMetadataItemVisitor.cpp ${SOURCEDIR}/gui/HtmlTemplateProcessor.cpp @@ -219,6 +220,7 @@ list(APPEND HEADER_LIST ${SOURCEDIR}/gui/FieldPropertiesDialog.h ${SOURCEDIR}/gui/FindDialog.h ${SOURCEDIR}/gui/FRLayoutConfig.h + ${SOURCEDIR}/gui/FRStyle.h ${SOURCEDIR}/gui/HtmlHeaderMetadataItemVisitor.h ${SOURCEDIR}/gui/HtmlTemplateProcessor.h ${SOURCEDIR}/gui/GUIURIHandlerHelper.h diff --git a/flamerobin.bkl b/flamerobin.bkl index f4a88a08..6975e593 100644 --- a/flamerobin.bkl +++ b/flamerobin.bkl @@ -277,6 +277,7 @@ Accepted values: AMD64, IA64. $(SOURCEDIR)/gui/FieldPropertiesDialog.h $(SOURCEDIR)/gui/FindDialog.h $(SOURCEDIR)/gui/FRLayoutConfig.h + ${SOURCEDIR}/gui/FRStyle.h $(SOURCEDIR)/gui/HtmlHeaderMetadataItemVisitor.h $(SOURCEDIR)/gui/HtmlTemplateProcessor.h $(SOURCEDIR)/gui/GUIURIHandlerHelper.h @@ -400,6 +401,7 @@ Accepted values: AMD64, IA64. $(SOURCEDIR)/gui/FieldPropertiesDialog.cpp $(SOURCEDIR)/gui/FindDialog.cpp $(SOURCEDIR)/gui/FRLayoutConfig.cpp + ${SOURCEDIR}/gui/FRStyle.cpp $(SOURCEDIR)/gui/GUIURIHandlerHelper.cpp $(SOURCEDIR)/gui/HtmlHeaderMetadataItemVisitor.cpp $(SOURCEDIR)/gui/HtmlTemplateProcessor.cpp diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp index 4c4bf5ad..253e5c17 100644 --- a/src/gui/FRStyle.cpp +++ b/src/gui/FRStyle.cpp @@ -112,7 +112,7 @@ FRStyles& FRStyles::operator=(const FRStyles& sa) return *this; } -int FRStyles::getStylerIndexByID(int id) +int FRStyles::getStyleIndexByID(int id) { std::vector::iterator it; it = std::find_if(styleVectorM.begin(), styleVectorM.end(), [id](FRStyle* style)->bool {return style->getStyleID() == id; }); @@ -239,7 +239,7 @@ void FRStyles::addStyler(int styleID, const wxString styleName) } -int FRStyles::getStylerIndexByName(wxString styleName) +int FRStyles::getStyleIndexByName(wxString styleName) { if (styleName.IsEmpty()) return -1; @@ -259,6 +259,15 @@ FRStyle* FRStyles::getStyle(size_t index) return styleVectorM[index]; } +FRStyle* FRStyles::getStyleByName(wxString styleName) +{ + int i = getStyleIndexByName(styleName); + if (i != -1) + return getStyle(i); + else + return nullptr; +} + FRLexerStyler::FRLexerStyler() :FRStyles() @@ -446,6 +455,12 @@ FRStyleManager::FRStyleManager(wxFileName style) } + +FRStyle* FRStyleManager::getStyleByName(wxString styleName) +{ + return globalStylesM.getStyleByName(styleName); +} + void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) { //text->StyleClearAll(); diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h index 99a3523b..54a702df 100644 --- a/src/gui/FRStyle.h +++ b/src/gui/FRStyle.h @@ -34,6 +34,8 @@ #include "config/Config.h" +typedef DWORD COLORREF; + const int FONTSTYLE_NONE = 0; const int FONTSTYLE_BOLD = 1; const int FONTSTYLE_ITALIC = 2; @@ -134,14 +136,15 @@ class FRStyles //void setNbStyler(int nb) { nbStylerM = nb; }; FRStyle* getStyle(size_t index); + FRStyle* getStyleByName(wxString styleName); bool hasEnoughSpace() { return (getNbStyler() < wxSTC_STYLE_MAX); }; void addStyler(int styleID, wxXmlNode* styleNode); void addStyler(int styleID, const wxString styleName); - int getStylerIndexByID(int id); + int getStyleIndexByID(int id); - int getStylerIndexByName(wxString styleName); + int getStyleIndexByName(wxString styleName); void clear() { styleVectorM.clear(); }; }; @@ -218,6 +221,7 @@ class FRStyleManager { FRStyle* getGlobalStyle() { return globalStyleM; }; FRStyle* getDefaultStyle() { return defaultStyleM; }; + FRStyle* getStyleByName(wxString styleName); void assignGlobal(wxStyledTextCtrl* text); diff --git a/src/gui/controls/DataGrid.cpp b/src/gui/controls/DataGrid.cpp index a0831ea1..706376cd 100644 --- a/src/gui/controls/DataGrid.cpp +++ b/src/gui/controls/DataGrid.cpp @@ -68,19 +68,19 @@ DataGrid::DataGrid(wxWindow* parent, wxWindowID id) SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); SetForegroundColour(stylerManager().getDefaultStyle()->getfgColor()); - SetSelectionBackground(stylerManager().getDefaultStyle()->getbgColor()); - SetSelectionForeground(stylerManager().getDefaultStyle()->getfgColor()); + SetSelectionBackground(stylerManager().getStyleByName("Selected text colour")->getbgColor()); + //SetSelectionForeground(stylerManager().getDefaultStyle()->getfgColor()); SetDefaultCellBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); SetDefaultCellTextColour(stylerManager().getDefaultStyle()->getfgColor()); - SetCellHighlightColour(stylerManager().getDefaultStyle()->getfgColor()); + SetCellHighlightColour(stylerManager().getDefaultStyle()->getfgColor()); - SetDefaultCellFont(stylerManager().getDefaultStyle()->getFont()); - wxString s; wxFont f; + + SetDefaultCellFont(stylerManager().getDefaultStyle()->getFont()); if (config().getValue("DataGridFont", s) && !s.empty()) { f.SetNativeFontInfo(s); @@ -89,13 +89,13 @@ DataGrid::DataGrid(wxWindow* parent, wxWindowID id) } SetLabelFont(stylerManager().getDefaultStyle()->getFont()); - if (config().getValue("DataGridHeaderFont", s) && !s.empty()) { f.SetNativeFontInfo(s); if (f.Ok()) SetLabelFont(f); } + updateRowHeights(); } From fde5a8bce5bfbc053eb469a6249414776bb05295 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Mon, 19 Jul 2021 13:04:33 -0600 Subject: [PATCH 13/25] Fix COLORREF --- src/gui/FRStyle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h index 54a702df..5350c9b6 100644 --- a/src/gui/FRStyle.h +++ b/src/gui/FRStyle.h @@ -34,7 +34,7 @@ #include "config/Config.h" -typedef DWORD COLORREF; +typedef unsigned long COLORREF; const int FONTSTYLE_NONE = 0; const int FONTSTYLE_BOLD = 1; From eac5cc3f396f334a1f993e6cb40f41a0087b945e Mon Sep 17 00:00:00 2001 From: jdochoa Date: Mon, 19 Jul 2021 14:25:40 -0600 Subject: [PATCH 14/25] Fix COLORREF --- src/gui/FRStyle.cpp | 4 ++-- src/gui/FRStyle.h | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp index 253e5c17..e5fb6b00 100644 --- a/src/gui/FRStyle.cpp +++ b/src/gui/FRStyle.cpp @@ -156,7 +156,7 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) long result; str.ToLong(&result, 16); - newStyle->setfgColor((RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + newStyle->setfgColor((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); } @@ -165,7 +165,7 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) { long result; str.ToLong(&result, 16); - newStyle->setbgColor((RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + newStyle->setbgColor((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); } str = element->GetAttribute("colorStyle"); diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h index 5350c9b6..debaa7dc 100644 --- a/src/gui/FRStyle.h +++ b/src/gui/FRStyle.h @@ -34,7 +34,11 @@ #include "config/Config.h" -typedef unsigned long COLORREF; +typedef unsigned long _DWORD; +typedef unsigned char _BYTE; +#define _RGB(r,g,b) ((COLORREF)(((_BYTE)(r)|((_DWORD)((_BYTE)(g))<<8))|(((_DWORD)(_BYTE)(b))<<16))) +typedef _DWORD COLORREF; + const int FONTSTYLE_NONE = 0; const int FONTSTYLE_BOLD = 1; From a95fa765c83c6f7514c26c3e287daf09e358b2f7 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Tue, 3 Aug 2021 11:48:17 -0600 Subject: [PATCH 15/25] Themes --- GNUmakefile | 4 + Makefile.in | 4 + Makefile.suncc | 621 +++++++++++++++++++ conf-defs/fr_settings.confdef | 11 + flamerobin.bkl | 8 +- flamerobin_flamerobin.dsp | 64 +- flamerobin_flamerobin.vcproj | 50 +- flamerobin_flamerobin.vcxproj | 20 +- flamerobin_flamerobin.vcxproj.filters | 842 ++++++++++++++------------ flamerobin_ibpp.vcproj | 2 +- flamerobin_ibpp.vcxproj | 427 +------------ makefile.bcc | 4 + makefile.dms | 513 ++++++++++++++++ makefile.gcc | 4 + makefile.mgw | 10 +- makefile.vc | 6 +- makefile.wat | 679 +++++++++++++++++++++ src/gui/PreferencesDialogSettings.cpp | 86 +++ 18 files changed, 2501 insertions(+), 854 deletions(-) create mode 100644 Makefile.suncc create mode 100644 makefile.dms create mode 100644 makefile.wat diff --git a/GNUmakefile b/GNUmakefile index 8f91c1d4..ea35c624 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -98,6 +98,7 @@ FLAMEROBIN_OBJECTS = \ flamerobin_FieldPropertiesDialog.o \ flamerobin_FindDialog.o \ flamerobin_FRLayoutConfig.o \ + flamerobin_FRStyle.o \ flamerobin_GUIURIHandlerHelper.o \ flamerobin_HtmlHeaderMetadataItemVisitor.o \ flamerobin_HtmlTemplateProcessor.o \ @@ -373,6 +374,9 @@ flamerobin_FindDialog.o: ./src/gui/FindDialog.cpp flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +flamerobin_FRStyle.o: ./${SOURCEDIR}/gui/FRStyle.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< diff --git a/Makefile.in b/Makefile.in index 17f23fc6..348d5313 100644 --- a/Makefile.in +++ b/Makefile.in @@ -92,6 +92,7 @@ FLAMEROBIN_OBJECTS = \ flamerobin_FieldPropertiesDialog.o \ flamerobin_FindDialog.o \ flamerobin_FRLayoutConfig.o \ + flamerobin_FRStyle.o \ flamerobin_GUIURIHandlerHelper.o \ flamerobin_HtmlHeaderMetadataItemVisitor.o \ flamerobin_HtmlTemplateProcessor.o \ @@ -466,6 +467,9 @@ flamerobin_FindDialog.o: $(srcdir)/src/gui/FindDialog.cpp $(FLAMEROBIN_ODEP) flamerobin_FRLayoutConfig.o: $(srcdir)/src/gui/FRLayoutConfig.cpp $(FLAMEROBIN_ODEP) $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/FRLayoutConfig.cpp +flamerobin_FRStyle.o: $(srcdir)/${SOURCEDIR}/gui/FRStyle.cpp $(FLAMEROBIN_ODEP) + $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/${SOURCEDIR}/gui/FRStyle.cpp + flamerobin_GUIURIHandlerHelper.o: $(srcdir)/src/gui/GUIURIHandlerHelper.cpp $(FLAMEROBIN_ODEP) $(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/GUIURIHandlerHelper.cpp diff --git a/Makefile.suncc b/Makefile.suncc new file mode 100644 index 00000000..db61a29d --- /dev/null +++ b/Makefile.suncc @@ -0,0 +1,621 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.10 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# +AR ?= ar + +# +AROPTIONS ?= rcu + +# +RANLIB ?= ranlib + +# C++ compiler +CXX = sunCC + +# Standard flags for C++ +CXXFLAGS ?= + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS ?= + +# Standard linker flags +LDFLAGS ?= + +# [0,1] +USEDLL ?= 0 + +# [0,1] +FINAL ?= 0 + +# [0,1] +STATICRTL ?= 0 + + + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CPPDEPS = -xMF `echo $@ | sed -e 's,\.o$$,.d,'` -xMMD +FLAMEROBIN_CXXFLAGS = -D_THREAD_SAFE -mt $(__DEBUGINFO) +w2 \ + $(____flamerobin_WXDEBUG_p) $(____flamerobin_DEBUGFLAG_p) -DIBPP_LINUX -I. \ + -I./src -I./src/ibpp -I./res $(CPPFLAGS) $(CXXFLAGS) +FLAMEROBIN_OBJECTS = \ + flamerobin_addconstrainthandler.o \ + flamerobin_Config.o \ + flamerobin_DatabaseConfig.o \ + flamerobin_LocalSettings.o \ + flamerobin_ArtProvider.o \ + flamerobin_CodeTemplateProcessor.o \ + flamerobin_FRError.o \ + flamerobin_Observer.o \ + flamerobin_ProgressIndicator.o \ + flamerobin_StringUtils.o \ + flamerobin_Subject.o \ + flamerobin_TemplateProcessor.o \ + flamerobin_URIProcessor.o \ + flamerobin_Visitor.o \ + flamerobin_databasehandler.o \ + flamerobin_MetadataLoader.o \ + flamerobin_frprec.o \ + flamerobin_frutils.o \ + flamerobin_AboutBox.o \ + flamerobin_AdvancedMessageDialog.o \ + flamerobin_AdvancedSearchFrame.o \ + flamerobin_BackupFrame.o \ + flamerobin_BackupRestoreBaseFrame.o \ + flamerobin_BaseDialog.o \ + flamerobin_BaseFrame.o \ + flamerobin_CommandManager.o \ + flamerobin_ConfdefTemplateProcessor.o \ + flamerobin_ContextMenuMetadataItemVisitor.o \ + flamerobin_ControlUtils.o \ + flamerobin_DataGrid.o \ + flamerobin_DataGridRowBuffer.o \ + flamerobin_DataGridRows.o \ + flamerobin_DataGridTable.o \ + flamerobin_DBHTreeControl.o \ + flamerobin_DndTextControls.o \ + flamerobin_LogTextControl.o \ + flamerobin_PrintableHtmlWindow.o \ + flamerobin_TextControl.o \ + flamerobin_CreateIndexDialog.o \ + flamerobin_DataGeneratorFrame.o \ + flamerobin_DatabaseRegistrationDialog.o \ + flamerobin_EditBlobDialog.o \ + flamerobin_EventWatcherFrame.o \ + flamerobin_ExecuteSqlFrame.o \ + flamerobin_ExecuteSql.o \ + flamerobin_FieldPropertiesDialog.o \ + flamerobin_FindDialog.o \ + flamerobin_FRLayoutConfig.o \ + flamerobin_FRStyle.o \ + flamerobin_GUIURIHandlerHelper.o \ + flamerobin_HtmlHeaderMetadataItemVisitor.o \ + flamerobin_HtmlTemplateProcessor.o \ + flamerobin_InsertDialog.o \ + flamerobin_InsertParametersDialog.o \ + flamerobin_MainFrame.o \ + flamerobin_MetadataItemPropertiesFrame.o \ + flamerobin_MultilineEnterDialog.o \ + flamerobin_PreferencesDialog.o \ + flamerobin_PreferencesDialogSettings.o \ + flamerobin_PrivilegesDialog.o \ + flamerobin_ProgressDialog.o \ + flamerobin_ReorderFieldsDialog.o \ + flamerobin_RestoreFrame.o \ + flamerobin_ServerRegistrationDialog.o \ + flamerobin_SimpleHtmlFrame.o \ + flamerobin_StatementHistoryDialog.o \ + flamerobin_StyleGuide.o \ + flamerobin_UserDialog.o \ + flamerobin_UsernamePasswordDialog.o \ + flamerobin_logger.o \ + flamerobin_main.o \ + flamerobin_MasterPassword.o \ + flamerobin_column.o \ + flamerobin_constraints.o \ + flamerobin_CreateDDLVisitor.o \ + flamerobin_database.o \ + flamerobin_domain.o \ + flamerobin_exception.o \ + flamerobin_function.o \ + flamerobin_generator.o \ + flamerobin_Index.o \ + flamerobin_metadataitem.o \ + flamerobin_MetadataItemCreateStatementVisitor.o \ + flamerobin_MetadataItemDescriptionVisitor.o \ + flamerobin_MetadataItemURIHandlerHelper.o \ + flamerobin_MetadataItemVisitor.o \ + flamerobin_MetadataTemplateCmdHandler.o \ + flamerobin_MetadataTemplateManager.o \ + flamerobin_package.o \ + flamerobin_parameter.o \ + flamerobin_privilege.o \ + flamerobin_procedure.o \ + flamerobin_relation.o \ + flamerobin_role.o \ + flamerobin_root.o \ + flamerobin_server.o \ + flamerobin_table.o \ + flamerobin_trigger.o \ + flamerobin_User.o \ + flamerobin_view.o \ + flamerobin_objectdescriptionhandler.o \ + flamerobin_Identifier.o \ + flamerobin_IncompleteStatement.o \ + flamerobin_MultiStatement.o \ + flamerobin_SelectStatement.o \ + flamerobin_SqlStatement.o \ + flamerobin_SqlTokenizer.o \ + flamerobin_StatementBuilder.o \ + flamerobin_statementHistory.o \ + flamerobin_StyleGuideGTK.o +IBPP_CXXFLAGS = -D_THREAD_SAFE -mt $(__DEBUGINFO) +w2 -DIBPP_LINUX -I./src/ibpp \ + $(CPPFLAGS) $(CXXFLAGS) +IBPP_OBJECTS = \ + ibpp__dpb.o \ + ibpp__ibpp.o \ + ibpp__ibs.o \ + ibpp__rb.o \ + ibpp__spb.o \ + ibpp__tpb.o \ + ibpp_array.o \ + ibpp_blob.o \ + ibpp_database.o \ + ibpp_date.o \ + ibpp_dbkey.o \ + ibpp_events.o \ + ibpp_exception.o \ + ibpp_row.o \ + ibpp_service.o \ + ibpp_statement.o \ + ibpp_time.o \ + ibpp_transaction.o \ + ibpp_user.o + +### Conditionally set variables: ### + +ifeq ($(FINAL),0) +____flamerobin_WXDEBUG_p = -D__WXDEBUG__ +endif +ifeq ($(FINAL),0) +____flamerobin_DEBUGFLAG_p = -D_DEBUG +endif +ifeq ($(FINAL),0) +__DEBUGINFO = -g +endif +ifeq ($(FINAL),1) +__DEBUGINFO = +endif + + +### Targets: ### + +all: revision-info flamerobin libibpp.a + +install: + +uninstall: + +clean: + rm -f ./*.o + rm -f ./*.d + rm -f flamerobin + rm -f libibpp.a + +revision-info: + update-revision-info.cmd + +flamerobin: $(FLAMEROBIN_OBJECTS) libibpp.a libibpp.a + $(CXX) -o $@ $(FLAMEROBIN_OBJECTS) -mt -lpthread $(__DEBUGINFO) $(LDFLAGS) libibpp.a + +libibpp.a: $(IBPP_OBJECTS) + rm -f $@ + $(AR) $(AROPTIONS) $@ $(IBPP_OBJECTS) + $(RANLIB) $@ + +flamerobin_addconstrainthandler.o: ./src/addconstrainthandler.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_Config.o: ./src/config/Config.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DatabaseConfig.o: ./src/config/DatabaseConfig.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_LocalSettings.o: ./src/config/LocalSettings.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ArtProvider.o: ./src/core/ArtProvider.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_CodeTemplateProcessor.o: ./src/core/CodeTemplateProcessor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_FRError.o: ./src/core/FRError.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_Observer.o: ./src/core/Observer.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ProgressIndicator.o: ./src/core/ProgressIndicator.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_StringUtils.o: ./src/core/StringUtils.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_Subject.o: ./src/core/Subject.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_TemplateProcessor.o: ./src/core/TemplateProcessor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_URIProcessor.o: ./src/core/URIProcessor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_Visitor.o: ./src/core/Visitor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_databasehandler.o: ./src/databasehandler.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MetadataLoader.o: ./src/engine/MetadataLoader.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_frprec.o: ./src/frprec.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_frutils.o: ./src/frutils.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_AboutBox.o: ./src/gui/AboutBox.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_AdvancedMessageDialog.o: ./src/gui/AdvancedMessageDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_AdvancedSearchFrame.o: ./src/gui/AdvancedSearchFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_BackupFrame.o: ./src/gui/BackupFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_BackupRestoreBaseFrame.o: ./src/gui/BackupRestoreBaseFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_BaseDialog.o: ./src/gui/BaseDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_BaseFrame.o: ./src/gui/BaseFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_CommandManager.o: ./src/gui/CommandManager.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ConfdefTemplateProcessor.o: ./src/gui/ConfdefTemplateProcessor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ContextMenuMetadataItemVisitor.o: ./src/gui/ContextMenuMetadataItemVisitor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ControlUtils.o: ./src/gui/controls/ControlUtils.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DataGrid.o: ./src/gui/controls/DataGrid.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DataGridRowBuffer.o: ./src/gui/controls/DataGridRowBuffer.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DataGridRows.o: ./src/gui/controls/DataGridRows.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DataGridTable.o: ./src/gui/controls/DataGridTable.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DBHTreeControl.o: ./src/gui/controls/DBHTreeControl.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DndTextControls.o: ./src/gui/controls/DndTextControls.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_LogTextControl.o: ./src/gui/controls/LogTextControl.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_PrintableHtmlWindow.o: ./src/gui/controls/PrintableHtmlWindow.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_TextControl.o: ./src/gui/controls/TextControl.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_CreateIndexDialog.o: ./src/gui/CreateIndexDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DataGeneratorFrame.o: ./src/gui/DataGeneratorFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_DatabaseRegistrationDialog.o: ./src/gui/DatabaseRegistrationDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_EditBlobDialog.o: ./src/gui/EditBlobDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_EventWatcherFrame.o: ./src/gui/EventWatcherFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ExecuteSqlFrame.o: ./src/gui/ExecuteSqlFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ExecuteSql.o: ./src/gui/ExecuteSql.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_FieldPropertiesDialog.o: ./src/gui/FieldPropertiesDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_FindDialog.o: ./src/gui/FindDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_FRStyle.o: ./${SOURCEDIR}/gui/FRStyle.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_HtmlHeaderMetadataItemVisitor.o: ./src/gui/HtmlHeaderMetadataItemVisitor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_HtmlTemplateProcessor.o: ./src/gui/HtmlTemplateProcessor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_InsertDialog.o: ./src/gui/InsertDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_InsertParametersDialog.o: ./${SOURCEDIR}/gui/InsertParametersDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MainFrame.o: ./src/gui/MainFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MetadataItemPropertiesFrame.o: ./src/gui/MetadataItemPropertiesFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MultilineEnterDialog.o: ./src/gui/MultilineEnterDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_PreferencesDialog.o: ./src/gui/PreferencesDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_PreferencesDialogSettings.o: ./src/gui/PreferencesDialogSettings.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_PrivilegesDialog.o: ./src/gui/PrivilegesDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ProgressDialog.o: ./src/gui/ProgressDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ReorderFieldsDialog.o: ./src/gui/ReorderFieldsDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_RestoreFrame.o: ./src/gui/RestoreFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_ServerRegistrationDialog.o: ./src/gui/ServerRegistrationDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_SimpleHtmlFrame.o: ./src/gui/SimpleHtmlFrame.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_StatementHistoryDialog.o: ./src/gui/StatementHistoryDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_StyleGuide.o: ./src/gui/StyleGuide.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_UserDialog.o: ./src/gui/UserDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_UsernamePasswordDialog.o: ./src/gui/UsernamePasswordDialog.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_logger.o: ./src/logger.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_main.o: ./src/main.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MasterPassword.o: ./src/MasterPassword.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_column.o: ./src/metadata/column.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_constraints.o: ./src/metadata/constraints.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_CreateDDLVisitor.o: ./src/metadata/CreateDDLVisitor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_database.o: ./src/metadata/database.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_domain.o: ./src/metadata/domain.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_exception.o: ./src/metadata/exception.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_function.o: ./src/metadata/function.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_generator.o: ./src/metadata/generator.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_Index.o: ./src/metadata/Index.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_metadataitem.o: ./src/metadata/metadataitem.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MetadataItemCreateStatementVisitor.o: ./src/metadata/MetadataItemCreateStatementVisitor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MetadataItemDescriptionVisitor.o: ./src/metadata/MetadataItemDescriptionVisitor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MetadataItemURIHandlerHelper.o: ./src/metadata/MetadataItemURIHandlerHelper.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MetadataItemVisitor.o: ./src/metadata/MetadataItemVisitor.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MetadataTemplateCmdHandler.o: ./src/metadata/MetadataTemplateCmdHandler.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MetadataTemplateManager.o: ./src/metadata/MetadataTemplateManager.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_package.o: ./${SOURCEDIR}/metadata/package.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_parameter.o: ./src/metadata/parameter.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_privilege.o: ./src/metadata/privilege.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_procedure.o: ./src/metadata/procedure.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_relation.o: ./src/metadata/relation.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_role.o: ./src/metadata/role.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_root.o: ./src/metadata/root.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_server.o: ./src/metadata/server.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_table.o: ./src/metadata/table.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_trigger.o: ./src/metadata/trigger.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_User.o: ./src/metadata/User.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_view.o: ./src/metadata/view.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_objectdescriptionhandler.o: ./src/objectdescriptionhandler.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_Identifier.o: ./src/sql/Identifier.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_IncompleteStatement.o: ./src/sql/IncompleteStatement.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_MultiStatement.o: ./src/sql/MultiStatement.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_SelectStatement.o: ./src/sql/SelectStatement.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_SqlStatement.o: ./src/sql/SqlStatement.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_SqlTokenizer.o: ./src/sql/SqlTokenizer.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_StatementBuilder.o: ./src/sql/StatementBuilder.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_statementHistory.o: ./src/statementHistory.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +flamerobin_StyleGuideGTK.o: ./src/gui/gtk/StyleGuideGTK.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + +ibpp__dpb.o: ./src/ibpp/_dpb.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp__ibpp.o: ./src/ibpp/_ibpp.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp__ibs.o: ./src/ibpp/_ibs.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp__rb.o: ./src/ibpp/_rb.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp__spb.o: ./src/ibpp/_spb.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp__tpb.o: ./src/ibpp/_tpb.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_array.o: ./src/ibpp/array.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_blob.o: ./src/ibpp/blob.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_database.o: ./src/ibpp/database.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_date.o: ./src/ibpp/date.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_dbkey.o: ./src/ibpp/dbkey.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_events.o: ./src/ibpp/events.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_exception.o: ./src/ibpp/exception.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_row.o: ./src/ibpp/row.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_service.o: ./src/ibpp/service.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_statement.o: ./src/ibpp/statement.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_time.o: ./src/ibpp/time.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_transaction.o: ./src/ibpp/transaction.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +ibpp_user.o: ./src/ibpp/user.cpp + $(CXX) -c -o $@ $(IBPP_CXXFLAGS) $(CPPDEPS) $< + +.PHONY: all install uninstall clean + + +# Dependencies tracking: +-include ./*.d diff --git a/conf-defs/fr_settings.confdef b/conf-defs/fr_settings.confdef index 4b9305ab..f18ee20e 100644 --- a/conf-defs/fr_settings.confdef +++ b/conf-defs/fr_settings.confdef @@ -362,6 +362,17 @@ + + Style + SQL Style Editor + 0 + + Style file name: + Select the file with the style + StyleFile + + + Data Grid diff --git a/flamerobin.bkl b/flamerobin.bkl index 6975e593..fb5eb918 100644 --- a/flamerobin.bkl +++ b/flamerobin.bkl @@ -177,8 +177,8 @@ Accepted values: AMD64, IA64. WIN32_LEAN_AND_MEAN wxmsw - - 30 + + 31 $(WXDIR)/lib/$(COMPILER)$(DIR_SUFFIX_CPU)_dll @@ -188,10 +188,8 @@ Accepted values: AMD64, IA64. $(WX_LIB_DIR)/msw$(U_OPT)$(D_OPT) $(WXDIR)/contrib/include $(WXDIR)/include - $(DOLLAR)(BOOST_ROOT) $(WX_LIB_DIR) - $(DOLLAR)(BOOST_LIB_DIR) $(WX_PORT)$(WX_VERSION)$(U_OPT)$(D_OPT)_aui @@ -201,7 +199,7 @@ Accepted values: AMD64, IA64. $(WX_PORT)$(WX_VERSION)$(U_OPT)$(D_OPT)_core wxbase$(WX_VERSION)$(U_OPT)$(D_OPT)_xml wxbase$(WX_VERSION)$(U_OPT)$(D_OPT) - + wxscintilla$(D_OPT) wxexpat$(D_OPT) diff --git a/flamerobin_flamerobin.dsp b/flamerobin_flamerobin.dsp index aab7fe88..eb899304 100644 --- a/flamerobin_flamerobin.dsp +++ b/flamerobin_flamerobin.dsp @@ -57,8 +57,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Release Dynamic" @@ -82,8 +82,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Debug Static" @@ -107,8 +107,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Debug Dynamic" @@ -132,8 +132,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Release Static" @@ -157,8 +157,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Release Dynamic" @@ -182,8 +182,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Debug Static" @@ -207,8 +207,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Debug Dynamic" @@ -232,8 +232,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ENDIF @@ -376,6 +376,10 @@ SOURCE=.\src\gui\FRLayoutConfig.cpp # End Source File # Begin Source File +SOURCE=.\${SOURCEDIR}\gui\FRStyle.cpp +# End Source File +# Begin Source File + SOURCE=.\src\gui\FieldPropertiesDialog.cpp # End Source File # Begin Source File @@ -412,6 +416,14 @@ SOURCE=.\src\gui\InsertDialog.cpp # End Source File # Begin Source File +SOURCE=.\${SOURCEDIR}\gui\InsertParametersDialog.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\config\LocalSettings.cpp +# End Source File +# Begin Source File + SOURCE=.\src\gui\controls\LogTextControl.cpp # End Source File # Begin Source File @@ -638,6 +650,10 @@ SOURCE=.\src\objectdescriptionhandler.cpp # End Source File # Begin Source File +SOURCE=.\${SOURCEDIR}\metadata\package.cpp +# End Source File +# Begin Source File + SOURCE=.\src\metadata\parameter.cpp # End Source File # Begin Source File @@ -814,6 +830,10 @@ SOURCE=.\src\gui\FRLayoutConfig.h # End Source File # Begin Source File +SOURCE=.\${SOURCEDIR}\gui\FRStyle.h +# End Source File +# Begin Source File + SOURCE=.\src\gui\FieldPropertiesDialog.h # End Source File # Begin Source File @@ -850,10 +870,18 @@ SOURCE=.\src\gui\InsertDialog.h # End Source File # Begin Source File +SOURCE=.\${SOURCEDIR}\gui\InsertParametersDialog.h +# End Source File +# Begin Source File + SOURCE=.\src\Isaac.h # End Source File # Begin Source File +SOURCE=.\src\config\LocalSettings.h +# End Source File +# Begin Source File + SOURCE=.\src\gui\controls\LogTextControl.h # End Source File # Begin Source File @@ -1066,6 +1094,10 @@ SOURCE=.\src\metadata\metadataitem.h # End Source File # Begin Source File +SOURCE=.\${SOURCEDIR}\metadata\package.h +# End Source File +# Begin Source File + SOURCE=.\src\metadata\parameter.h # End Source File # Begin Source File diff --git a/flamerobin_flamerobin.vcproj b/flamerobin_flamerobin.vcproj index 8a108d5e..9d4fb928 100644 --- a/flamerobin_flamerobin.vcproj +++ b/flamerobin_flamerobin.vcproj @@ -2,7 +2,7 @@ @@ -81,7 +81,7 @@ + + @@ -939,6 +943,14 @@ RelativePath=".\src\gui\InsertDialog.cpp" > + + + + @@ -1223,6 +1235,10 @@ RelativePath=".\src\objectdescriptionhandler.cpp" > + + @@ -1401,6 +1417,10 @@ RelativePath=".\src\gui\FRLayoutConfig.h" > + + @@ -1437,10 +1457,18 @@ RelativePath=".\src\gui\InsertDialog.h" > + + + + @@ -1653,6 +1681,10 @@ RelativePath=".\src\metadata\metadataitem.h" > + + diff --git a/flamerobin_flamerobin.vcxproj b/flamerobin_flamerobin.vcxproj index 42c9bd7b..61ec75e5 100644 --- a/flamerobin_flamerobin.vcxproj +++ b/flamerobin_flamerobin.vcxproj @@ -208,7 +208,7 @@ <_ProjectFileVersion>12.0.30501.0 - vcud\ + .\ vcud\flamerobin\ true true @@ -218,7 +218,7 @@ true - .\ + ..\ vcusd\flamerobin\ true true @@ -310,6 +310,7 @@ Level4 true ProgramDatabase + stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -355,6 +356,7 @@ Level4 true ProgramDatabase + stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -398,6 +400,7 @@ Level4 true ProgramDatabase + stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -443,6 +446,7 @@ Level4 true ProgramDatabase + stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -485,6 +489,7 @@ Level4 true + stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -528,6 +533,7 @@ true + stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -569,6 +575,7 @@ Level4 true + stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -612,6 +619,7 @@ true + stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -655,6 +663,7 @@ Level4 true ProgramDatabase + stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -700,6 +709,7 @@ Level4 true ProgramDatabase + stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -744,6 +754,7 @@ Level4 true ProgramDatabase + stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -789,6 +800,7 @@ Level4 true ProgramDatabase + stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -831,6 +843,7 @@ Level4 true + stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -874,6 +887,7 @@ true + stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -915,6 +929,7 @@ Level4 true + stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -958,6 +973,7 @@ true + stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) diff --git a/flamerobin_flamerobin.vcxproj.filters b/flamerobin_flamerobin.vcxproj.filters index b6f1f031..cb71888a 100644 --- a/flamerobin_flamerobin.vcxproj.filters +++ b/flamerobin_flamerobin.vcxproj.filters @@ -13,672 +13,708 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + {d6f80b3a-b71a-407e-bea1-3d13a7d631b6} + + + {2cc7bffc-54b6-4c9c-a927-ce4c2f3d7588} + + + {4949ad6b-94ac-4053-b417-c72a7f56eaa0} + + + {1de77b96-7886-4f36-8054-b44ba9ef3f21} + + + {14063b73-27df-4236-b206-03e22a385e3d} + + + {6b23ca03-4d72-401d-804d-568edcc12ce1} + + + {59ff061b-908e-4a7e-84aa-ea688b768dc7} + + + {38ffb02b-7615-48c3-8c64-fb4adb36d79f} + + + {5ba1eabe-593d-4753-bea2-dd4f188a908c} + + + {7f898553-6f0f-43f4-b4ed-a95f9a4b4cbd} + + + {050fa05f-2aa4-4c70-8921-b0e7ff23f2e3} + + + {d0b43b09-68a1-4559-9565-f9680978777e} + - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - - Source Files + + Source Files\config - - Source Files + + Source Files\config - - Source Files + + Source Files\config - - Source Files + + Source Files\core - - Source Files + + Source Files\core - - Source Files + + Source Files\core - - Source Files + + Source Files\core - - Source Files + + Source Files\core - - Source Files + + Source Files\core + + + Source Files\core + + + Source Files\core + + + Source Files\core + + + Source Files\core + + + Source Files\engine + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files + Source Files\gui - - Source Files + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui - Source Files + Source Files\gui - - Source Files + + Source Files\gui - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files - - - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files + Source Files\gui + + + Source Files\gui - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files - - - Source Files - - - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\gui - - Source Files + + Source Files\gui - Source Files - - - Source Files - - - Source Files - - - Source Files + Source Files\gui - Source Files - - - Source Files - - - Source Files + Source Files\gui - - Source Files - - - Source Files - - - Source Files - - - Source Files + + Source Files\gui - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files - - - Source Files - - - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\gui - - Source Files + + Source Files\gui - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\gui - Source Files - - - Source Files - - - Source Files + Source Files\gui - Source Files + Source Files\metadata - Source Files + Source Files\metadata - - Source Files + + Source Files\metadata - - Source Files + + Source Files\metadata - Source Files + Source Files\metadata - Source Files - - - Source Files - - - Source Files + Source Files\metadata - Source Files + Source Files\metadata - Source Files - - - Source Files + Source Files\metadata - - Source Files + + Source Files\metadata - Source Files + Source Files\metadata - - Source Files + + Source Files\metadata + + + Source Files\metadata + + + Source Files\metadata + + + Source Files\metadata + + + Source Files\metadata + + + Source Files\metadata + + + Source Files\metadata - Source Files + Source Files\metadata - Source Files + Source Files\metadata - Source Files + Source Files\metadata - Source Files + Source Files\metadata - Source Files + Source Files\metadata - Source Files + Source Files\metadata - Source Files - - - Source Files + Source Files\metadata - Source Files + Source Files\metadata - Source Files + Source Files\metadata + + + Source Files\metadata - Source Files + Source Files\metadata - - Source Files + + Source Files\sql - - Source Files + + Source Files\sql - - Source Files + + Source Files\sql - - Source Files + + Source Files\sql + + + Source Files\sql + + + Source Files\sql + + + Source Files\sql - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - Header Files + Header Files\gui - - Header Files - - - Header Files - - - Header Files - - - Header Files + + Header Files\gui - Header Files + Header Files\gui - Header Files + Header Files\gui - Header Files + Header Files\gui - Header Files + Header Files\gui - - Header Files + + Header Files\gui - + Header Files - - Header Files + + Header Files\gui - + Header Files - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui + + + Header Files\gui - Header Files + Header Files\gui - Header Files - - - Header Files + Header Files\gui - Header Files + Header Files\gui - Header Files + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\gui - - Header Files + + Header Files\core - - Header Files + + Header Files\core - - Header Files + + Header Files\core - - Header Files + + Header Files\core - - Header Files + + Header Files\core - - Header Files + + Header Files\core - - Header Files + + Header Files\core - - Header Files + + Header Files\core - - Header Files + + Header Files\core + + + Header Files\core + + + Header Files\core - Header Files + Header Files\core + + + Header Files\engine - Header Files + Header Files\metadata - Header Files + Header Files\metadata + + + Header Files\metadata - Header Files + Header Files\metadata + + + Header Files\metadata - Header Files + Header Files\metadata - Header Files + Header Files\metadata - Header Files - - - Header Files - - - Header Files + Header Files\metadata - Header Files + Header Files\metadata - Header Files + Header Files\metadata - - Header Files + + Header Files\metadata - - Header Files + + Header Files\metadata - Header Files + Header Files\metadata + + + Header Files\metadata + + + Header Files\metadata + + + Header Files\metadata + + + Header Files\metadata + + + Header Files\metadata + + + Header Files\metadata - Header Files + Header Files\metadata - Header Files + Header Files\metadata - Header Files + Header Files\metadata - Header Files + Header Files\metadata - Header Files + Header Files\metadata - Header Files + Header Files\metadata - Header Files - - - Header Files + Header Files\metadata - Header Files + Header Files\metadata - Header Files + Header Files\metadata + + + Header Files\metadata - Header Files + Header Files\metadata - - Header Files + + Header Files\sql - - Header Files + + Header Files\sql - - Header Files + + Header Files\sql - - Header Files + + Header Files\sql - - Header Files + + Header Files\sql + + + Header Files\sql + + + Header Files\sql + + + Header Files\config + + + Header Files\config + + + Header Files\config diff --git a/flamerobin_ibpp.vcproj b/flamerobin_ibpp.vcproj index 1546c858..d886875f 100644 --- a/flamerobin_ibpp.vcproj +++ b/flamerobin_ibpp.vcproj @@ -2,7 +2,7 @@ diff --git a/flamerobin_ibpp.vcxproj b/flamerobin_ibpp.vcxproj index 5aeb69a9..045c1932 100644 --- a/flamerobin_ibpp.vcxproj +++ b/flamerobin_ibpp.vcxproj @@ -1,75 +1,42 @@ - - + + Debug Dynamic Win32 - - Debug Dynamic - x64 - Debug Static Win32 - - Debug Static - x64 - DLL Debug Dynamic Win32 - - DLL Debug Dynamic - x64 - DLL Debug Static Win32 - - DLL Debug Static - x64 - DLL Release Dynamic Win32 - - DLL Release Dynamic - x64 - DLL Release Static Win32 - - DLL Release Static - x64 - Release Dynamic Win32 - - Release Dynamic - x64 - Release Static Win32 - - Release Static - x64 - ibpp {F98A5270-7698-516C-9430-13EBB667AEA5} - 10.0.18362.0 @@ -77,175 +44,111 @@ v142 false - - StaticLibrary - v142 - false - StaticLibrary v142 false - - StaticLibrary - v142 - false - StaticLibrary v142 false - - StaticLibrary - v142 - false - StaticLibrary v142 false - - StaticLibrary - v142 - false - StaticLibrary v142 false - - StaticLibrary - v142 - false - StaticLibrary v142 false - - StaticLibrary - v142 - false - StaticLibrary v142 false - - StaticLibrary - v142 - false - StaticLibrary v142 false - - StaticLibrary - v142 - false - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>16.0.30804.86 vcud\ vcud\ibpp\ - - - vcud\ - vcud\ibpp\ + MinimumRecommendedRules.ruleset vcusd\ vcusd\ibpp\ + MinimumRecommendedRules.ruleset vcu\ vcu\ibpp\ - - - vcu\ - vcu\ibpp\ + MinimumRecommendedRules.ruleset vcus\ vcus\ibpp\ + MinimumRecommendedRules.ruleset vcud\ vcud\ibpp\ + MinimumRecommendedRules.ruleset vcusd\ vcusd\ibpp\ + MinimumRecommendedRules.ruleset vcu\ vcu\ibpp\ + MinimumRecommendedRules.ruleset vcus\ vcus\ibpp\ + MinimumRecommendedRules.ruleset @@ -285,44 +188,6 @@ true - - - WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - .\src\ibpp;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - .\src\ibpp;%(AdditionalIncludeDirectories) - WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - _ibpp.h - vcud\ibpp.pch - vcud\ibpp\ - vcud\ibpp.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - 0x0409 - .\src\ibpp;%(AdditionalIncludeDirectories) - - - vcud\ibpp.lib - true - - - vcud\flamerobin_ibpp.bsc - true - - WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -335,44 +200,6 @@ WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - _ibpp.h - vcusd\ibpp.pch - vcusd\ibpp\ - vcusd\ibpp.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - 0x0409 - .\src\ibpp;%(AdditionalIncludeDirectories) - - - vcusd\ibpp.lib - true - - - vcusd\flamerobin_ibpp.bsc - true - - - - - WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - .\src\ibpp;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - .\src\ibpp;%(AdditionalIncludeDirectories) - WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - Sync - EnableFastChecks MultiThreadedDebug true true @@ -435,43 +262,6 @@ true - - - WIN64;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) - .\src\ibpp;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MinSpace - .\src\ibpp;%(AdditionalIncludeDirectories) - WIN64;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - _ibpp.h - vcu\ibpp.pch - vcu\ibpp\ - vcu\ibpp.pdb - Level4 - true - - - - - IBPP_WINDOWS;%(PreprocessorDefinitions) - 0x0409 - .\src\ibpp;%(AdditionalIncludeDirectories) - - - vcu\ibpp.lib - true - - - vcu\flamerobin_ibpp.bsc - true - - WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -508,43 +298,6 @@ true - - - WIN64;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) - .\src\ibpp;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MinSpace - .\src\ibpp;%(AdditionalIncludeDirectories) - WIN64;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) - Sync - MultiThreaded - true - Use - _ibpp.h - vcus\ibpp.pch - vcus\ibpp\ - vcus\ibpp.pdb - Level4 - true - - - - - IBPP_WINDOWS;%(PreprocessorDefinitions) - 0x0409 - .\src\ibpp;%(AdditionalIncludeDirectories) - - - vcus\ibpp.lib - true - - - vcus\flamerobin_ibpp.bsc - true - - WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -583,44 +336,6 @@ true - - - WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - .\src\ibpp;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - .\src\ibpp;%(AdditionalIncludeDirectories) - WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - _ibpp.h - vcud\ibpp.pch - vcud\ibpp\ - vcud\ibpp.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - 0x0409 - .\src\ibpp;%(AdditionalIncludeDirectories) - - - vcud\ibpp.lib - true - - - vcud\flamerobin_ibpp.bsc - true - - WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -659,44 +374,6 @@ true - - - WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - .\src\ibpp;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - .\src\ibpp;%(AdditionalIncludeDirectories) - WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebug - true - true - Use - _ibpp.h - vcusd\ibpp.pch - vcusd\ibpp\ - vcusd\ibpp.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) - 0x0409 - .\src\ibpp;%(AdditionalIncludeDirectories) - - - vcusd\ibpp.lib - true - - - vcusd\flamerobin_ibpp.bsc - true - - WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -733,43 +410,6 @@ true - - - WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) - .\src\ibpp;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MinSpace - .\src\ibpp;%(AdditionalIncludeDirectories) - WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - _ibpp.h - vcu\ibpp.pch - vcu\ibpp\ - vcu\ibpp.pdb - Level4 - true - - - - - IBPP_WINDOWS;%(PreprocessorDefinitions) - 0x0409 - .\src\ibpp;%(AdditionalIncludeDirectories) - - - vcu\ibpp.lib - true - - - vcu\flamerobin_ibpp.bsc - true - - WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -806,43 +446,6 @@ true - - - WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) - .\src\ibpp;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MinSpace - .\src\ibpp;%(AdditionalIncludeDirectories) - WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) - Sync - MultiThreaded - true - Use - _ibpp.h - vcus\ibpp.pch - vcus\ibpp\ - vcus\ibpp.pdb - Level4 - true - - - - - IBPP_WINDOWS;%(PreprocessorDefinitions) - 0x0409 - .\src\ibpp;%(AdditionalIncludeDirectories) - - - vcus\ibpp.lib - true - - - vcus\flamerobin_ibpp.bsc - true - - @@ -860,21 +463,13 @@ Create - Create Create - Create Create - Create Create - Create Create - Create Create - Create Create - Create Create - Create diff --git a/makefile.bcc b/makefile.bcc index 2bd2f133..9b44baff 100644 --- a/makefile.bcc +++ b/makefile.bcc @@ -115,6 +115,7 @@ FLAMEROBIN_OBJECTS = \ bccu$(R_OPT)$(D_OPT)\flamerobin_FieldPropertiesDialog.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.obj \ + bccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.obj \ bccu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.obj \ @@ -424,6 +425,9 @@ bccu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.obj: .\src\gui\FindDialog.cpp bccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.obj: .\src\gui\FRLayoutConfig.cpp $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\FRLayoutConfig.cpp +bccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.obj: .\${SOURCEDIR}\gui\FRStyle.cpp + $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\${SOURCEDIR}\gui\FRStyle.cpp + bccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.obj: .\src\gui\GUIURIHandlerHelper.cpp $(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\GUIURIHandlerHelper.cpp diff --git a/makefile.dms b/makefile.dms new file mode 100644 index 00000000..6827ef83 --- /dev/null +++ b/makefile.dms @@ -0,0 +1,513 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.10 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.LONGCOMMANDLINE: dmc link lib smake + + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C++ compiler +CXX = dmc + +# Standard flags for C++ +CXXFLAGS = -HP99 + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS = + +# Standard linker flags +LDFLAGS = + +# [0,1] +USEDLL = 0 + +# [0,1] +FINAL = 0 + +# [0,1] +STATICRTL = 0 + + + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Conditionally set variables: ### + +!if "$(FINAL)" == "0" +D_OPT = d +!endif +!if "$(STATICRTL)" == "1" +R_OPT = s +!endif +!if "$(FINAL)" == "0" +__DEBUGINFO_4 = /DEBUG /CODEVIEW +!endif +!if "$(FINAL)" == "1" +__DEBUGINFO_4 = +!endif +!if "$(STATICRTL)" == "0" +__RTL_TYPE = -ND +!endif +!if "$(STATICRTL)" == "1" +__RTL_TYPE = +!endif +!if "$(FINAL)" == "0" +__DEBUGINFO = -g +!endif +!if "$(FINAL)" == "1" +__DEBUGINFO = +!endif +!if "$(FINAL)" == "0" +__OPTIMIZE = -o+none +!endif +!if "$(FINAL)" == "1" +__OPTIMIZE = -o+space +!endif +!if "$(FINAL)" == "0" +____flamerobin_WXDEBUG_p = -D__WXDEBUG__ +!endif +!if "$(FINAL)" == "0" +____flamerobin_DEBUGFLAG_p = -D_DEBUG +!endif + +### Variables: ### + +FLAMEROBIN_CXXFLAGS = $(__RTL_TYPE) $(__DEBUGINFO) $(__OPTIMIZE) -w- $(____flamerobin_WXDEBUG_p) $(____flamerobin_DEBUGFLAG_p) -WA -DIBPP_WINDOWS -I. -I.\src -I.\src\ibpp -I.\res -Ar -Ae -H -HO- -HHdmcu$(R_OPT)$(D_OPT)\pch_flamerobin.sym $(CPPFLAGS) $(CXXFLAGS) +FLAMEROBIN_OBJECTS = dmcu$(R_OPT)$(D_OPT)\flamerobin_addconstrainthandler.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_Config.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DatabaseConfig.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_LocalSettings.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ArtProvider.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_CodeTemplateProcessor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_FRError.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_Observer.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ProgressIndicator.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_StringUtils.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_Subject.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_TemplateProcessor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_URIProcessor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_Visitor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_databasehandler.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataLoader.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_frprec.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_frutils.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_AboutBox.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_AdvancedMessageDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_AdvancedSearchFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_BackupFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_BackupRestoreBaseFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_BaseDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_BaseFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_CommandManager.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ConfdefTemplateProcessor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ContextMenuMetadataItemVisitor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ControlUtils.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGrid.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGridRowBuffer.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGridRows.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGridTable.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DBHTreeControl.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DndTextControls.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_LogTextControl.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_PrintableHtmlWindow.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_TextControl.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_CreateIndexDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGeneratorFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_DatabaseRegistrationDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_EditBlobDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_EventWatcherFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ExecuteSqlFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ExecuteSql.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_FieldPropertiesDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_InsertDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_InsertParametersDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MainFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemPropertiesFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MultilineEnterDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogSettings.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_PrivilegesDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ProgressDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ReorderFieldsDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_RestoreFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_ServerRegistrationDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_SimpleHtmlFrame.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_StatementHistoryDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_StyleGuide.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_UserDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_UsernamePasswordDialog.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_logger.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_main.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MasterPassword.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_column.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_constraints.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_CreateDDLVisitor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_database.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_domain.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_exception.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_function.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_generator.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_Index.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_metadataitem.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemCreateStatementVisitor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemDescriptionVisitor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemURIHandlerHelper.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemVisitor.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataTemplateCmdHandler.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataTemplateManager.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_package.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_parameter.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_privilege.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_procedure.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_relation.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_role.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_root.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_server.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_table.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_trigger.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_User.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_view.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_objectdescriptionhandler.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_Identifier.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_IncompleteStatement.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_MultiStatement.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_SelectStatement.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_SqlStatement.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_SqlTokenizer.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_StatementBuilder.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_statementHistory.obj dmcu$(R_OPT)$(D_OPT)\flamerobin_StyleGuideMSW.obj +FLAMEROBIN_ODEP = dmcu$(R_OPT)$(D_OPT)\pch_flamerobin.sym +IBPP_CXXFLAGS = $(__RTL_TYPE) $(__DEBUGINFO) $(__OPTIMIZE) -w- -DIBPP_WINDOWS -I.\src\ibpp -Ar -Ae -H -HO- -HHdmcu$(R_OPT)$(D_OPT)\pch_ibpp.sym $(CPPFLAGS) $(CXXFLAGS) +IBPP_OBJECTS = dmcu$(R_OPT)$(D_OPT)\ibpp__dpb.obj dmcu$(R_OPT)$(D_OPT)\ibpp__ibpp.obj dmcu$(R_OPT)$(D_OPT)\ibpp__ibs.obj dmcu$(R_OPT)$(D_OPT)\ibpp__rb.obj dmcu$(R_OPT)$(D_OPT)\ibpp__spb.obj dmcu$(R_OPT)$(D_OPT)\ibpp__tpb.obj dmcu$(R_OPT)$(D_OPT)\ibpp_array.obj dmcu$(R_OPT)$(D_OPT)\ibpp_blob.obj dmcu$(R_OPT)$(D_OPT)\ibpp_database.obj dmcu$(R_OPT)$(D_OPT)\ibpp_date.obj dmcu$(R_OPT)$(D_OPT)\ibpp_dbkey.obj dmcu$(R_OPT)$(D_OPT)\ibpp_events.obj dmcu$(R_OPT)$(D_OPT)\ibpp_exception.obj dmcu$(R_OPT)$(D_OPT)\ibpp_row.obj dmcu$(R_OPT)$(D_OPT)\ibpp_service.obj dmcu$(R_OPT)$(D_OPT)\ibpp_statement.obj dmcu$(R_OPT)$(D_OPT)\ibpp_time.obj dmcu$(R_OPT)$(D_OPT)\ibpp_transaction.obj dmcu$(R_OPT)$(D_OPT)\ibpp_user.obj +IBPP_ODEP = dmcu$(R_OPT)$(D_OPT)\pch_ibpp.sym + + +all : dmcu$(R_OPT)$(D_OPT) +dmcu$(R_OPT)$(D_OPT) : + -if not exist dmcu$(R_OPT)$(D_OPT) mkdir dmcu$(R_OPT)$(D_OPT) + +### Targets: ### + + +all : revision-info dmcu$(R_OPT)$(D_OPT)\flamerobin.exe dmcu$(R_OPT)$(D_OPT)\ibpp.lib + +clean : + -if exist dmcu$(R_OPT)$(D_OPT)\*.obj del dmcu$(R_OPT)$(D_OPT)\*.obj + -if exist dmcu$(R_OPT)$(D_OPT)\*.res del dmcu$(R_OPT)$(D_OPT)\*.res + -if exist dmcu$(R_OPT)$(D_OPT)\*.sym del dmcu$(R_OPT)$(D_OPT)\*.sym + -if exist dmcu$(R_OPT)$(D_OPT)\flamerobin.exe del dmcu$(R_OPT)$(D_OPT)\flamerobin.exe + -if exist dmcu$(R_OPT)$(D_OPT)\flamerobin.map del dmcu$(R_OPT)$(D_OPT)\flamerobin.map + -if exist dmcu$(R_OPT)$(D_OPT)\ibpp.lib del dmcu$(R_OPT)$(D_OPT)\ibpp.lib + +revision-info : + update-revision-info.cmd + +dmcu$(R_OPT)$(D_OPT)\flamerobin.exe : $(FLAMEROBIN_OBJECTS) dmcu$(R_OPT)$(D_OPT)\ibpp.lib dmcu$(R_OPT)$(D_OPT)\flamerobin_flamerobin.res dmcu$(R_OPT)$(D_OPT)\ibpp.lib + link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(__DEBUGINFO_4) /su:windows:4.0 $(LDFLAGS) $(FLAMEROBIN_OBJECTS),$@,dmcu$(R_OPT)$(D_OPT)\flamerobin.map, dmcu$(R_OPT)$(D_OPT)\ibpp.lib,, dmcu$(R_OPT)$(D_OPT)\flamerobin_flamerobin.res + +dmcu$(R_OPT)$(D_OPT)\pch_flamerobin.sym : .\wx\wxprec.h + if not exist dmcu$(R_OPT)$(D_OPT) mkdir dmcu$(R_OPT)$(D_OPT) + $(CXX) $(FLAMEROBIN_CXXFLAGS) -mn -cpp -HFdmcu$(R_OPT)$(D_OPT)\pch_flamerobin.sym .\wx\wxprec.h + +dmcu$(R_OPT)$(D_OPT)\ibpp.lib : $(IBPP_OBJECTS) + lib -p512 -c -n $@ $(IBPP_OBJECTS) + +dmcu$(R_OPT)$(D_OPT)\pch_ibpp.sym : .\_ibpp.h + if not exist dmcu$(R_OPT)$(D_OPT) mkdir dmcu$(R_OPT)$(D_OPT) + $(CXX) $(IBPP_CXXFLAGS) -mn -cpp -HFdmcu$(R_OPT)$(D_OPT)\pch_ibpp.sym .\_ibpp.h + +dmcu$(R_OPT)$(D_OPT)\flamerobin_addconstrainthandler.obj : .\src\addconstrainthandler.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\addconstrainthandler.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_Config.obj : .\src\config\Config.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\config\Config.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DatabaseConfig.obj : .\src\config\DatabaseConfig.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\config\DatabaseConfig.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_LocalSettings.obj : .\src\config\LocalSettings.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\config\LocalSettings.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ArtProvider.obj : .\src\core\ArtProvider.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\ArtProvider.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_CodeTemplateProcessor.obj : .\src\core\CodeTemplateProcessor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\CodeTemplateProcessor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_FRError.obj : .\src\core\FRError.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\FRError.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_Observer.obj : .\src\core\Observer.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\Observer.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ProgressIndicator.obj : .\src\core\ProgressIndicator.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\ProgressIndicator.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_StringUtils.obj : .\src\core\StringUtils.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\StringUtils.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_Subject.obj : .\src\core\Subject.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\Subject.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_TemplateProcessor.obj : .\src\core\TemplateProcessor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\TemplateProcessor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_URIProcessor.obj : .\src\core\URIProcessor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\URIProcessor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_Visitor.obj : .\src\core\Visitor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\core\Visitor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_databasehandler.obj : .\src\databasehandler.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\databasehandler.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataLoader.obj : .\src\engine\MetadataLoader.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\engine\MetadataLoader.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_frprec.obj : .\src\frprec.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\frprec.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_frutils.obj : .\src\frutils.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\frutils.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_AboutBox.obj : .\src\gui\AboutBox.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\AboutBox.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_AdvancedMessageDialog.obj : .\src\gui\AdvancedMessageDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\AdvancedMessageDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_AdvancedSearchFrame.obj : .\src\gui\AdvancedSearchFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\AdvancedSearchFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_BackupFrame.obj : .\src\gui\BackupFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\BackupFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_BackupRestoreBaseFrame.obj : .\src\gui\BackupRestoreBaseFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\BackupRestoreBaseFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_BaseDialog.obj : .\src\gui\BaseDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\BaseDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_BaseFrame.obj : .\src\gui\BaseFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\BaseFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_CommandManager.obj : .\src\gui\CommandManager.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\CommandManager.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ConfdefTemplateProcessor.obj : .\src\gui\ConfdefTemplateProcessor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\ConfdefTemplateProcessor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ContextMenuMetadataItemVisitor.obj : .\src\gui\ContextMenuMetadataItemVisitor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\ContextMenuMetadataItemVisitor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ControlUtils.obj : .\src\gui\controls\ControlUtils.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\ControlUtils.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGrid.obj : .\src\gui\controls\DataGrid.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\DataGrid.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGridRowBuffer.obj : .\src\gui\controls\DataGridRowBuffer.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\DataGridRowBuffer.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGridRows.obj : .\src\gui\controls\DataGridRows.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\DataGridRows.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGridTable.obj : .\src\gui\controls\DataGridTable.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\DataGridTable.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DBHTreeControl.obj : .\src\gui\controls\DBHTreeControl.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\DBHTreeControl.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DndTextControls.obj : .\src\gui\controls\DndTextControls.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\DndTextControls.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_LogTextControl.obj : .\src\gui\controls\LogTextControl.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\LogTextControl.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_PrintableHtmlWindow.obj : .\src\gui\controls\PrintableHtmlWindow.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\PrintableHtmlWindow.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_TextControl.obj : .\src\gui\controls\TextControl.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\controls\TextControl.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_CreateIndexDialog.obj : .\src\gui\CreateIndexDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\CreateIndexDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DataGeneratorFrame.obj : .\src\gui\DataGeneratorFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\DataGeneratorFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_DatabaseRegistrationDialog.obj : .\src\gui\DatabaseRegistrationDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\DatabaseRegistrationDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_EditBlobDialog.obj : .\src\gui\EditBlobDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\EditBlobDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_EventWatcherFrame.obj : .\src\gui\EventWatcherFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\EventWatcherFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ExecuteSqlFrame.obj : .\src\gui\ExecuteSqlFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\ExecuteSqlFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ExecuteSql.obj : .\src\gui\ExecuteSql.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\ExecuteSql.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_FieldPropertiesDialog.obj : .\src\gui\FieldPropertiesDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\FieldPropertiesDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.obj : .\src\gui\FindDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\FindDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.obj : .\src\gui\FRLayoutConfig.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\FRLayoutConfig.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.obj : .\${SOURCEDIR}\gui\FRStyle.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\${SOURCEDIR}\gui\FRStyle.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.obj : .\src\gui\GUIURIHandlerHelper.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\GUIURIHandlerHelper.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.obj : .\src\gui\HtmlHeaderMetadataItemVisitor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\HtmlHeaderMetadataItemVisitor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.obj : .\src\gui\HtmlTemplateProcessor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\HtmlTemplateProcessor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_InsertDialog.obj : .\src\gui\InsertDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\InsertDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_InsertParametersDialog.obj : .\${SOURCEDIR}\gui\InsertParametersDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\${SOURCEDIR}\gui\InsertParametersDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MainFrame.obj : .\src\gui\MainFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\MainFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemPropertiesFrame.obj : .\src\gui\MetadataItemPropertiesFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\MetadataItemPropertiesFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MultilineEnterDialog.obj : .\src\gui\MultilineEnterDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\MultilineEnterDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialog.obj : .\src\gui\PreferencesDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\PreferencesDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogSettings.obj : .\src\gui\PreferencesDialogSettings.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\PreferencesDialogSettings.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_PrivilegesDialog.obj : .\src\gui\PrivilegesDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\PrivilegesDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ProgressDialog.obj : .\src\gui\ProgressDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\ProgressDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ReorderFieldsDialog.obj : .\src\gui\ReorderFieldsDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\ReorderFieldsDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_RestoreFrame.obj : .\src\gui\RestoreFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\RestoreFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_ServerRegistrationDialog.obj : .\src\gui\ServerRegistrationDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\ServerRegistrationDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_SimpleHtmlFrame.obj : .\src\gui\SimpleHtmlFrame.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\SimpleHtmlFrame.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_StatementHistoryDialog.obj : .\src\gui\StatementHistoryDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\StatementHistoryDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_StyleGuide.obj : .\src\gui\StyleGuide.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\StyleGuide.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_UserDialog.obj : .\src\gui\UserDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\UserDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_UsernamePasswordDialog.obj : .\src\gui\UsernamePasswordDialog.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\UsernamePasswordDialog.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_logger.obj : .\src\logger.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\logger.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_main.obj : .\src\main.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\main.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MasterPassword.obj : .\src\MasterPassword.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\MasterPassword.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_column.obj : .\src\metadata\column.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\column.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_constraints.obj : .\src\metadata\constraints.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\constraints.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_CreateDDLVisitor.obj : .\src\metadata\CreateDDLVisitor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\CreateDDLVisitor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_database.obj : .\src\metadata\database.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\database.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_domain.obj : .\src\metadata\domain.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\domain.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_exception.obj : .\src\metadata\exception.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\exception.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_function.obj : .\src\metadata\function.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\function.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_generator.obj : .\src\metadata\generator.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\generator.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_Index.obj : .\src\metadata\Index.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\Index.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_metadataitem.obj : .\src\metadata\metadataitem.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\metadataitem.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemCreateStatementVisitor.obj : .\src\metadata\MetadataItemCreateStatementVisitor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\MetadataItemCreateStatementVisitor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemDescriptionVisitor.obj : .\src\metadata\MetadataItemDescriptionVisitor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\MetadataItemDescriptionVisitor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemURIHandlerHelper.obj : .\src\metadata\MetadataItemURIHandlerHelper.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\MetadataItemURIHandlerHelper.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemVisitor.obj : .\src\metadata\MetadataItemVisitor.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\MetadataItemVisitor.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataTemplateCmdHandler.obj : .\src\metadata\MetadataTemplateCmdHandler.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\MetadataTemplateCmdHandler.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MetadataTemplateManager.obj : .\src\metadata\MetadataTemplateManager.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\MetadataTemplateManager.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_package.obj : .\${SOURCEDIR}\metadata\package.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\${SOURCEDIR}\metadata\package.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_parameter.obj : .\src\metadata\parameter.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\parameter.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_privilege.obj : .\src\metadata\privilege.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\privilege.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_procedure.obj : .\src\metadata\procedure.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\procedure.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_relation.obj : .\src\metadata\relation.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\relation.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_role.obj : .\src\metadata\role.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\role.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_root.obj : .\src\metadata\root.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\root.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_server.obj : .\src\metadata\server.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\server.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_table.obj : .\src\metadata\table.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\table.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_trigger.obj : .\src\metadata\trigger.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\trigger.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_User.obj : .\src\metadata\User.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\User.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_view.obj : .\src\metadata\view.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\metadata\view.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_objectdescriptionhandler.obj : .\src\objectdescriptionhandler.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\objectdescriptionhandler.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_Identifier.obj : .\src\sql\Identifier.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\sql\Identifier.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_IncompleteStatement.obj : .\src\sql\IncompleteStatement.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\sql\IncompleteStatement.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_MultiStatement.obj : .\src\sql\MultiStatement.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\sql\MultiStatement.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_SelectStatement.obj : .\src\sql\SelectStatement.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\sql\SelectStatement.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_SqlStatement.obj : .\src\sql\SqlStatement.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\sql\SqlStatement.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_SqlTokenizer.obj : .\src\sql\SqlTokenizer.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\sql\SqlTokenizer.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_StatementBuilder.obj : .\src\sql\StatementBuilder.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\sql\StatementBuilder.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_statementHistory.obj : .\src\statementHistory.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\statementHistory.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_StyleGuideMSW.obj : .\src\gui\msw\StyleGuideMSW.cpp $(FLAMEROBIN_ODEP) + $(CXX) -mn -c -cpp -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\msw\StyleGuideMSW.cpp + +dmcu$(R_OPT)$(D_OPT)\flamerobin_flamerobin.res : .\res\flamerobin.rc $(FLAMEROBIN_ODEP) + rcc .\res\flamerobin.rc -o$@ $(____flamerobin_WXDEBUG_p) $(____flamerobin_DEBUGFLAG_p) -DIBPP_WINDOWS -I. -I.\src -I.\src\ibpp -I.\res -32 -v- + +dmcu$(R_OPT)$(D_OPT)\ibpp__dpb.obj : .\src\ibpp\_dpb.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\_dpb.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp__ibpp.obj : .\src\ibpp\_ibpp.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\_ibpp.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp__ibs.obj : .\src\ibpp\_ibs.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\_ibs.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp__rb.obj : .\src\ibpp\_rb.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\_rb.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp__spb.obj : .\src\ibpp\_spb.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\_spb.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp__tpb.obj : .\src\ibpp\_tpb.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\_tpb.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_array.obj : .\src\ibpp\array.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\array.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_blob.obj : .\src\ibpp\blob.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\blob.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_database.obj : .\src\ibpp\database.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\database.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_date.obj : .\src\ibpp\date.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\date.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_dbkey.obj : .\src\ibpp\dbkey.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\dbkey.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_events.obj : .\src\ibpp\events.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\events.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_exception.obj : .\src\ibpp\exception.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\exception.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_row.obj : .\src\ibpp\row.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\row.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_service.obj : .\src\ibpp\service.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\service.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_statement.obj : .\src\ibpp\statement.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\statement.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_time.obj : .\src\ibpp\time.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\time.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_transaction.obj : .\src\ibpp\transaction.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\transaction.cpp + +dmcu$(R_OPT)$(D_OPT)\ibpp_user.obj : .\src\ibpp\user.cpp $(IBPP_ODEP) + $(CXX) -mn -c -cpp -o$@ $(IBPP_CXXFLAGS) .\src\ibpp\user.cpp diff --git a/makefile.gcc b/makefile.gcc index e3d52b55..d097edd8 100644 --- a/makefile.gcc +++ b/makefile.gcc @@ -97,6 +97,7 @@ FLAMEROBIN_OBJECTS = \ gccu$(R_OPT)$(D_OPT)\flamerobin_FieldPropertiesDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.o \ + gccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.o \ @@ -403,6 +404,9 @@ gccu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.o: ./src/gui/FindDialog.cpp gccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +gccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.o: ./${SOURCEDIR}/gui/FRStyle.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + gccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< diff --git a/makefile.mgw b/makefile.mgw index 29b3782a..adb87799 100644 --- a/makefile.mgw +++ b/makefile.mgw @@ -52,6 +52,7 @@ FLAMEROBIN_OBJECTS = \ gccu$(R_OPT)$(D_OPT)\flamerobin_addconstrainthandler.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_Config.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_DatabaseConfig.o \ + gccu$(R_OPT)$(D_OPT)\flamerobin_LocalSettings.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_ArtProvider.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_CodeTemplateProcessor.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_FRError.o \ @@ -96,6 +97,7 @@ FLAMEROBIN_OBJECTS = \ gccu$(R_OPT)$(D_OPT)\flamerobin_FieldPropertiesDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.o \ + gccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.o \ gccu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.o \ @@ -251,7 +253,7 @@ revision-info: update-revision-info.cmd gccu$(R_OPT)$(D_OPT)\flamerobin.exe: $(FLAMEROBIN_OBJECTS) gccu$(R_OPT)$(D_OPT)\libibpp.a gccu$(R_OPT)$(D_OPT)\flamerobin_flamerobin_rc.o gccu$(R_OPT)$(D_OPT)\libibpp.a - $(CXX) -o $@ $(FLAMEROBIN_OBJECTS) -mthreads $(__DEBUGINFO) $(______flamerobin_WX_LIB_DIR_FILENAMES_1_p) -L$(BOOST_LIB_DIR) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwxmsw30u$(D_OPT)_aui -lwxmsw30u$(D_OPT)_stc -lwxmsw30u$(D_OPT)_html -lwxmsw30u$(D_OPT)_adv -lwxmsw30u$(D_OPT)_core -lwxbase30u$(D_OPT)_xml -lwxbase30u$(D_OPT) -lwxscintilla$(D_OPT) -lwxexpat$(D_OPT) -lwxtiff$(D_OPT) -lwxjpeg$(D_OPT) -lwxpng$(D_OPT) -lwxzlib$(D_OPT) -lwxregexu$(D_OPT) -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lcomctl32 -lrpcrt4 -lwsock32 gccu$(R_OPT)$(D_OPT)\libibpp.a + $(CXX) -o $@ $(FLAMEROBIN_OBJECTS) -mthreads $(__DEBUGINFO) $(______flamerobin_WX_LIB_DIR_FILENAMES_1_p) -L$(BOOST_LIB_DIR) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwxmsw31u$(D_OPT)_aui -lwxmsw31u$(D_OPT)_stc -lwxmsw31u$(D_OPT)_html -lwxmsw31u$(D_OPT)_adv -lwxmsw31u$(D_OPT)_core -lwxbase31u$(D_OPT)_xml -lwxbase31u$(D_OPT) -lwxscintilla$(D_OPT) -lwxexpat$(D_OPT) -lwxtiff$(D_OPT) -lwxjpeg$(D_OPT) -lwxpng$(D_OPT) -lwxzlib$(D_OPT) -lwxregexu$(D_OPT) -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lcomctl32 -lrpcrt4 -lwsock32 gccu$(R_OPT)$(D_OPT)\libibpp.a gccu$(R_OPT)$(D_OPT)\libibpp.a: $(IBPP_OBJECTS) if exist $@ del $@ @@ -267,6 +269,9 @@ gccu$(R_OPT)$(D_OPT)\flamerobin_Config.o: ./src/config/Config.cpp gccu$(R_OPT)$(D_OPT)\flamerobin_DatabaseConfig.o: ./src/config/DatabaseConfig.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +gccu$(R_OPT)$(D_OPT)\flamerobin_LocalSettings.o: ./src/config/LocalSettings.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + gccu$(R_OPT)$(D_OPT)\flamerobin_ArtProvider.o: ./src/core/ArtProvider.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< @@ -399,6 +404,9 @@ gccu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.o: ./src/gui/FindDialog.cpp gccu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< +gccu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.o: ./${SOURCEDIR}/gui/FRStyle.cpp + $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< + gccu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp $(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $< diff --git a/makefile.vc b/makefile.vc index 06843d2c..768ee3c6 100644 --- a/makefile.vc +++ b/makefile.vc @@ -113,6 +113,7 @@ FLAMEROBIN_OBJECTS = \ vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_FieldPropertiesDialog.obj \ vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_FindDialog.obj \ vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_FRLayoutConfig.obj \ + vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_FRStyle.obj \ vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_GUIURIHandlerHelper.obj \ vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_HtmlHeaderMetadataItemVisitor.obj \ vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_HtmlTemplateProcessor.obj \ @@ -343,7 +344,7 @@ revision-info: vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin.exe: vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_frprec.obj $(FLAMEROBIN_OBJECTS) vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\ibpp.lib vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_flamerobin.res vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\ibpp.lib link /NOLOGO /OUT:$@ $(__DEBUGINFO_5) /pdb:"vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin.pdb" $(__DEBUGINFO_9) /nologo /subsystem:windows $(LINK_TARGET_CPU) $(______flamerobin_WX_LIB_DIR_FILENAMES_2_p) /LIBPATH:$(BOOST_LIB_DIR) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(FLAMEROBIN_OBJECTS) $(FLAMEROBIN_RESOURCES) wxmsw30u$(D_OPT)_aui.lib wxmsw30u$(D_OPT)_stc.lib wxmsw30u$(D_OPT)_html.lib wxmsw30u$(D_OPT)_adv.lib wxmsw30u$(D_OPT)_core.lib wxbase30u$(D_OPT)_xml.lib wxbase30u$(D_OPT).lib wxscintilla$(D_OPT).lib wxexpat$(D_OPT).lib wxtiff$(D_OPT).lib wxjpeg$(D_OPT).lib wxpng$(D_OPT).lib wxzlib$(D_OPT).lib wxregexu$(D_OPT).lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\ibpp.lib + $(FLAMEROBIN_OBJECTS) $(FLAMEROBIN_RESOURCES) wxmsw31u$(D_OPT)_aui.lib wxmsw31u$(D_OPT)_stc.lib wxmsw31u$(D_OPT)_html.lib wxmsw31u$(D_OPT)_adv.lib wxmsw31u$(D_OPT)_core.lib wxbase31u$(D_OPT)_xml.lib wxbase31u$(D_OPT).lib wxscintilla$(D_OPT).lib wxexpat$(D_OPT).lib wxtiff$(D_OPT).lib wxjpeg$(D_OPT).lib wxpng$(D_OPT).lib wxzlib$(D_OPT).lib wxregexu$(D_OPT).lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\ibpp.lib << vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\ibpp.lib: vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\ibpp__ibpp.obj $(IBPP_OBJECTS) @@ -496,6 +497,9 @@ vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_FindDialog.obj: .\src\gui\FindDi vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_FRLayoutConfig.obj: .\src\gui\FRLayoutConfig.cpp $(CXX) /c /nologo /TP /Fo$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\FRLayoutConfig.cpp +vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_FRStyle.obj: .\${SOURCEDIR}\gui\FRStyle.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLAMEROBIN_CXXFLAGS) .\${SOURCEDIR}\gui\FRStyle.cpp + vcu$(R_OPT)$(D_OPT)$(DIR_SUFFIX_CPU)\flamerobin_GUIURIHandlerHelper.obj: .\src\gui\GUIURIHandlerHelper.cpp $(CXX) /c /nologo /TP /Fo$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\GUIURIHandlerHelper.cpp diff --git a/makefile.wat b/makefile.wat new file mode 100644 index 00000000..38a21f93 --- /dev/null +++ b/makefile.wat @@ -0,0 +1,679 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.10 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C++ compiler +CXX = wpp386 + +# Standard flags for C++ +CXXFLAGS = + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS = + +# Standard linker flags +LDFLAGS = + +# [0,1] +# 1 - DLL +USEDLL = 0 + +# [0,1] +# 0 - Debug +# 1 - Release +FINAL = 0 + +# [0,1] +# 0 - Dynamic +# 1 - Static +STATICRTL = 0 + + + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +D_OPT = +!ifeq FINAL 0 +D_OPT = d +!endif +R_OPT = +!ifeq STATICRTL 1 +R_OPT = s +!endif +__DEBUGINFO_5 = +!ifeq FINAL 0 +__DEBUGINFO_5 = debug all +!endif +!ifeq FINAL 1 +__DEBUGINFO_5 = +!endif +__RTL_TYPE = +!ifeq STATICRTL 0 +__RTL_TYPE = -br +!endif +!ifeq STATICRTL 1 +__RTL_TYPE = +!endif +__DEBUGINFO = +!ifeq FINAL 0 +__DEBUGINFO = -d2 +!endif +!ifeq FINAL 1 +__DEBUGINFO = -d0 +!endif +__OPTIMIZE = +!ifeq FINAL 0 +__OPTIMIZE = -od +!endif +!ifeq FINAL 1 +__OPTIMIZE = -os +!endif +____flamerobin_WXDEBUG_p = +!ifeq FINAL 0 +____flamerobin_WXDEBUG_p = -d__WXDEBUG__ +!endif +____flamerobin_DEBUGFLAG_p = +!ifeq FINAL 0 +____flamerobin_DEBUGFLAG_p = -d_DEBUG +!endif + +### Variables: ### + +FLAMEROBIN_CXXFLAGS = $(__RTL_TYPE) -bm $(__DEBUGINFO) $(__OPTIMIZE) -wx & + $(____flamerobin_WXDEBUG_p) $(____flamerobin_DEBUGFLAG_p) -dIBPP_WINDOWS & + -i=. -i=.\src -i=.\src\ibpp -i=.\res /fh=watu$(R_OPT)$(D_OPT)\flamerobin.pch & + -xr -xs $(CPPFLAGS) $(CXXFLAGS) +FLAMEROBIN_OBJECTS = & + watu$(R_OPT)$(D_OPT)\flamerobin_addconstrainthandler.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_Config.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DatabaseConfig.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_LocalSettings.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ArtProvider.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_CodeTemplateProcessor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_FRError.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_Observer.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ProgressIndicator.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_StringUtils.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_Subject.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_TemplateProcessor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_URIProcessor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_Visitor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_databasehandler.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MetadataLoader.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_frprec.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_frutils.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_AboutBox.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_AdvancedMessageDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_AdvancedSearchFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_BackupFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_BackupRestoreBaseFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_BaseDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_BaseFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_CommandManager.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ConfdefTemplateProcessor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ContextMenuMetadataItemVisitor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ControlUtils.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DataGrid.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DataGridRowBuffer.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DataGridRows.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DataGridTable.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DBHTreeControl.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DndTextControls.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_LogTextControl.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_PrintableHtmlWindow.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_TextControl.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_CreateIndexDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DataGeneratorFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_DatabaseRegistrationDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_EditBlobDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_EventWatcherFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ExecuteSqlFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ExecuteSql.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_FieldPropertiesDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_InsertDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_InsertParametersDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MainFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemPropertiesFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MultilineEnterDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogSettings.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_PrivilegesDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ProgressDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ReorderFieldsDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_RestoreFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_ServerRegistrationDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_SimpleHtmlFrame.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_StatementHistoryDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_StyleGuide.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_UserDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_UsernamePasswordDialog.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_logger.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_main.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MasterPassword.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_column.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_constraints.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_CreateDDLVisitor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_database.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_domain.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_exception.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_function.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_generator.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_Index.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_metadataitem.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemCreateStatementVisitor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemDescriptionVisitor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemURIHandlerHelper.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemVisitor.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MetadataTemplateCmdHandler.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MetadataTemplateManager.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_package.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_parameter.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_privilege.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_procedure.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_relation.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_role.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_root.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_server.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_table.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_trigger.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_User.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_view.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_objectdescriptionhandler.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_Identifier.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_IncompleteStatement.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_MultiStatement.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_SelectStatement.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_SqlStatement.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_SqlTokenizer.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_StatementBuilder.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_statementHistory.obj & + watu$(R_OPT)$(D_OPT)\flamerobin_StyleGuideMSW.obj +IBPP_CXXFLAGS = $(__RTL_TYPE) -bm $(__DEBUGINFO) $(__OPTIMIZE) -wx -dIBPP_WINDOWS & + -i=.\src\ibpp /fh=watu$(R_OPT)$(D_OPT)\ibpp.pch -xr -xs $(CPPFLAGS) & + $(CXXFLAGS) +IBPP_OBJECTS = & + watu$(R_OPT)$(D_OPT)\ibpp__dpb.obj & + watu$(R_OPT)$(D_OPT)\ibpp__ibpp.obj & + watu$(R_OPT)$(D_OPT)\ibpp__ibs.obj & + watu$(R_OPT)$(D_OPT)\ibpp__rb.obj & + watu$(R_OPT)$(D_OPT)\ibpp__spb.obj & + watu$(R_OPT)$(D_OPT)\ibpp__tpb.obj & + watu$(R_OPT)$(D_OPT)\ibpp_array.obj & + watu$(R_OPT)$(D_OPT)\ibpp_blob.obj & + watu$(R_OPT)$(D_OPT)\ibpp_database.obj & + watu$(R_OPT)$(D_OPT)\ibpp_date.obj & + watu$(R_OPT)$(D_OPT)\ibpp_dbkey.obj & + watu$(R_OPT)$(D_OPT)\ibpp_events.obj & + watu$(R_OPT)$(D_OPT)\ibpp_exception.obj & + watu$(R_OPT)$(D_OPT)\ibpp_row.obj & + watu$(R_OPT)$(D_OPT)\ibpp_service.obj & + watu$(R_OPT)$(D_OPT)\ibpp_statement.obj & + watu$(R_OPT)$(D_OPT)\ibpp_time.obj & + watu$(R_OPT)$(D_OPT)\ibpp_transaction.obj & + watu$(R_OPT)$(D_OPT)\ibpp_user.obj + + +all : watu$(R_OPT)$(D_OPT) +watu$(R_OPT)$(D_OPT) : + -if not exist watu$(R_OPT)$(D_OPT) mkdir watu$(R_OPT)$(D_OPT) + +### Targets: ### + +all : .SYMBOLIC revision-info watu$(R_OPT)$(D_OPT)\flamerobin.exe watu$(R_OPT)$(D_OPT)\ibpp.lib + +clean : .SYMBOLIC + -if exist watu$(R_OPT)$(D_OPT)\*.obj del watu$(R_OPT)$(D_OPT)\*.obj + -if exist watu$(R_OPT)$(D_OPT)\*.res del watu$(R_OPT)$(D_OPT)\*.res + -if exist watu$(R_OPT)$(D_OPT)\*.lbc del watu$(R_OPT)$(D_OPT)\*.lbc + -if exist watu$(R_OPT)$(D_OPT)\*.ilk del watu$(R_OPT)$(D_OPT)\*.ilk + -if exist watu$(R_OPT)$(D_OPT)\*.pch del watu$(R_OPT)$(D_OPT)\*.pch + -if exist watu$(R_OPT)$(D_OPT)\flamerobin.exe del watu$(R_OPT)$(D_OPT)\flamerobin.exe + -if exist watu$(R_OPT)$(D_OPT)\ibpp.lib del watu$(R_OPT)$(D_OPT)\ibpp.lib + +revision-info : + update-revision-info.cmd + +watu$(R_OPT)$(D_OPT)\flamerobin.exe : $(FLAMEROBIN_OBJECTS) watu$(R_OPT)$(D_OPT)\ibpp.lib watu$(R_OPT)$(D_OPT)\flamerobin_flamerobin.res watu$(R_OPT)$(D_OPT)\ibpp.lib + @%create watu$(R_OPT)$(D_OPT)\flamerobin.lbc + @%append watu$(R_OPT)$(D_OPT)\flamerobin.lbc option quiet + @%append watu$(R_OPT)$(D_OPT)\flamerobin.lbc name $^@ + @%append watu$(R_OPT)$(D_OPT)\flamerobin.lbc option caseexact + @%append watu$(R_OPT)$(D_OPT)\flamerobin.lbc $(__DEBUGINFO_5) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(FLAMEROBIN_OBJECTS)) do @%append watu$(R_OPT)$(D_OPT)\flamerobin.lbc file %i + @for %i in ( watu$(R_OPT)$(D_OPT)\ibpp.lib) do @%append watu$(R_OPT)$(D_OPT)\flamerobin.lbc library %i + @%append watu$(R_OPT)$(D_OPT)\flamerobin.lbc option resource=watu$(R_OPT)$(D_OPT)\flamerobin_flamerobin.res + @for %i in () do @%append watu$(R_OPT)$(D_OPT)\flamerobin.lbc option stack=%i + wlink @watu$(R_OPT)$(D_OPT)\flamerobin.lbc + +watu$(R_OPT)$(D_OPT)\ibpp.lib : $(IBPP_OBJECTS) + @%create watu$(R_OPT)$(D_OPT)\ibpp.lbc + @for %i in ($(IBPP_OBJECTS)) do @%append watu$(R_OPT)$(D_OPT)\ibpp.lbc +%i + wlib -q -p4096 -n -b $^@ @watu$(R_OPT)$(D_OPT)\ibpp.lbc + +watu$(R_OPT)$(D_OPT)\flamerobin_addconstrainthandler.obj : .AUTODEPEND .\src\addconstrainthandler.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_Config.obj : .AUTODEPEND .\src\config\Config.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DatabaseConfig.obj : .AUTODEPEND .\src\config\DatabaseConfig.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_LocalSettings.obj : .AUTODEPEND .\src\config\LocalSettings.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ArtProvider.obj : .AUTODEPEND .\src\core\ArtProvider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_CodeTemplateProcessor.obj : .AUTODEPEND .\src\core\CodeTemplateProcessor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_FRError.obj : .AUTODEPEND .\src\core\FRError.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_Observer.obj : .AUTODEPEND .\src\core\Observer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ProgressIndicator.obj : .AUTODEPEND .\src\core\ProgressIndicator.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_StringUtils.obj : .AUTODEPEND .\src\core\StringUtils.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_Subject.obj : .AUTODEPEND .\src\core\Subject.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_TemplateProcessor.obj : .AUTODEPEND .\src\core\TemplateProcessor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_URIProcessor.obj : .AUTODEPEND .\src\core\URIProcessor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_Visitor.obj : .AUTODEPEND .\src\core\Visitor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_databasehandler.obj : .AUTODEPEND .\src\databasehandler.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MetadataLoader.obj : .AUTODEPEND .\src\engine\MetadataLoader.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_frprec.obj : .AUTODEPEND .\src\frprec.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_frutils.obj : .AUTODEPEND .\src\frutils.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_AboutBox.obj : .AUTODEPEND .\src\gui\AboutBox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_AdvancedMessageDialog.obj : .AUTODEPEND .\src\gui\AdvancedMessageDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_AdvancedSearchFrame.obj : .AUTODEPEND .\src\gui\AdvancedSearchFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_BackupFrame.obj : .AUTODEPEND .\src\gui\BackupFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_BackupRestoreBaseFrame.obj : .AUTODEPEND .\src\gui\BackupRestoreBaseFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_BaseDialog.obj : .AUTODEPEND .\src\gui\BaseDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_BaseFrame.obj : .AUTODEPEND .\src\gui\BaseFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_CommandManager.obj : .AUTODEPEND .\src\gui\CommandManager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ConfdefTemplateProcessor.obj : .AUTODEPEND .\src\gui\ConfdefTemplateProcessor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ContextMenuMetadataItemVisitor.obj : .AUTODEPEND .\src\gui\ContextMenuMetadataItemVisitor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ControlUtils.obj : .AUTODEPEND .\src\gui\controls\ControlUtils.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DataGrid.obj : .AUTODEPEND .\src\gui\controls\DataGrid.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DataGridRowBuffer.obj : .AUTODEPEND .\src\gui\controls\DataGridRowBuffer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DataGridRows.obj : .AUTODEPEND .\src\gui\controls\DataGridRows.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DataGridTable.obj : .AUTODEPEND .\src\gui\controls\DataGridTable.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DBHTreeControl.obj : .AUTODEPEND .\src\gui\controls\DBHTreeControl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DndTextControls.obj : .AUTODEPEND .\src\gui\controls\DndTextControls.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_LogTextControl.obj : .AUTODEPEND .\src\gui\controls\LogTextControl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_PrintableHtmlWindow.obj : .AUTODEPEND .\src\gui\controls\PrintableHtmlWindow.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_TextControl.obj : .AUTODEPEND .\src\gui\controls\TextControl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_CreateIndexDialog.obj : .AUTODEPEND .\src\gui\CreateIndexDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DataGeneratorFrame.obj : .AUTODEPEND .\src\gui\DataGeneratorFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_DatabaseRegistrationDialog.obj : .AUTODEPEND .\src\gui\DatabaseRegistrationDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_EditBlobDialog.obj : .AUTODEPEND .\src\gui\EditBlobDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_EventWatcherFrame.obj : .AUTODEPEND .\src\gui\EventWatcherFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ExecuteSqlFrame.obj : .AUTODEPEND .\src\gui\ExecuteSqlFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ExecuteSql.obj : .AUTODEPEND .\src\gui\ExecuteSql.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_FieldPropertiesDialog.obj : .AUTODEPEND .\src\gui\FieldPropertiesDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_FindDialog.obj : .AUTODEPEND .\src\gui\FindDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_FRLayoutConfig.obj : .AUTODEPEND .\src\gui\FRLayoutConfig.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_FRStyle.obj : .AUTODEPEND .\${SOURCEDIR}\gui\FRStyle.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_GUIURIHandlerHelper.obj : .AUTODEPEND .\src\gui\GUIURIHandlerHelper.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_HtmlHeaderMetadataItemVisitor.obj : .AUTODEPEND .\src\gui\HtmlHeaderMetadataItemVisitor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_HtmlTemplateProcessor.obj : .AUTODEPEND .\src\gui\HtmlTemplateProcessor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_InsertDialog.obj : .AUTODEPEND .\src\gui\InsertDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_InsertParametersDialog.obj : .AUTODEPEND .\${SOURCEDIR}\gui\InsertParametersDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MainFrame.obj : .AUTODEPEND .\src\gui\MainFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemPropertiesFrame.obj : .AUTODEPEND .\src\gui\MetadataItemPropertiesFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MultilineEnterDialog.obj : .AUTODEPEND .\src\gui\MultilineEnterDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialog.obj : .AUTODEPEND .\src\gui\PreferencesDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_PreferencesDialogSettings.obj : .AUTODEPEND .\src\gui\PreferencesDialogSettings.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_PrivilegesDialog.obj : .AUTODEPEND .\src\gui\PrivilegesDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ProgressDialog.obj : .AUTODEPEND .\src\gui\ProgressDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ReorderFieldsDialog.obj : .AUTODEPEND .\src\gui\ReorderFieldsDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_RestoreFrame.obj : .AUTODEPEND .\src\gui\RestoreFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_ServerRegistrationDialog.obj : .AUTODEPEND .\src\gui\ServerRegistrationDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_SimpleHtmlFrame.obj : .AUTODEPEND .\src\gui\SimpleHtmlFrame.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_StatementHistoryDialog.obj : .AUTODEPEND .\src\gui\StatementHistoryDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_StyleGuide.obj : .AUTODEPEND .\src\gui\StyleGuide.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_UserDialog.obj : .AUTODEPEND .\src\gui\UserDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_UsernamePasswordDialog.obj : .AUTODEPEND .\src\gui\UsernamePasswordDialog.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_logger.obj : .AUTODEPEND .\src\logger.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_main.obj : .AUTODEPEND .\src\main.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MasterPassword.obj : .AUTODEPEND .\src\MasterPassword.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_column.obj : .AUTODEPEND .\src\metadata\column.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_constraints.obj : .AUTODEPEND .\src\metadata\constraints.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_CreateDDLVisitor.obj : .AUTODEPEND .\src\metadata\CreateDDLVisitor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_database.obj : .AUTODEPEND .\src\metadata\database.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_domain.obj : .AUTODEPEND .\src\metadata\domain.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_exception.obj : .AUTODEPEND .\src\metadata\exception.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_function.obj : .AUTODEPEND .\src\metadata\function.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_generator.obj : .AUTODEPEND .\src\metadata\generator.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_Index.obj : .AUTODEPEND .\src\metadata\Index.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_metadataitem.obj : .AUTODEPEND .\src\metadata\metadataitem.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemCreateStatementVisitor.obj : .AUTODEPEND .\src\metadata\MetadataItemCreateStatementVisitor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemDescriptionVisitor.obj : .AUTODEPEND .\src\metadata\MetadataItemDescriptionVisitor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemURIHandlerHelper.obj : .AUTODEPEND .\src\metadata\MetadataItemURIHandlerHelper.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MetadataItemVisitor.obj : .AUTODEPEND .\src\metadata\MetadataItemVisitor.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MetadataTemplateCmdHandler.obj : .AUTODEPEND .\src\metadata\MetadataTemplateCmdHandler.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MetadataTemplateManager.obj : .AUTODEPEND .\src\metadata\MetadataTemplateManager.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_package.obj : .AUTODEPEND .\${SOURCEDIR}\metadata\package.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_parameter.obj : .AUTODEPEND .\src\metadata\parameter.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_privilege.obj : .AUTODEPEND .\src\metadata\privilege.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_procedure.obj : .AUTODEPEND .\src\metadata\procedure.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_relation.obj : .AUTODEPEND .\src\metadata\relation.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_role.obj : .AUTODEPEND .\src\metadata\role.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_root.obj : .AUTODEPEND .\src\metadata\root.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_server.obj : .AUTODEPEND .\src\metadata\server.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_table.obj : .AUTODEPEND .\src\metadata\table.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_trigger.obj : .AUTODEPEND .\src\metadata\trigger.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_User.obj : .AUTODEPEND .\src\metadata\User.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_view.obj : .AUTODEPEND .\src\metadata\view.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_objectdescriptionhandler.obj : .AUTODEPEND .\src\objectdescriptionhandler.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_Identifier.obj : .AUTODEPEND .\src\sql\Identifier.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_IncompleteStatement.obj : .AUTODEPEND .\src\sql\IncompleteStatement.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_MultiStatement.obj : .AUTODEPEND .\src\sql\MultiStatement.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_SelectStatement.obj : .AUTODEPEND .\src\sql\SelectStatement.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_SqlStatement.obj : .AUTODEPEND .\src\sql\SqlStatement.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_SqlTokenizer.obj : .AUTODEPEND .\src\sql\SqlTokenizer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_StatementBuilder.obj : .AUTODEPEND .\src\sql\StatementBuilder.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_statementHistory.obj : .AUTODEPEND .\src\statementHistory.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_StyleGuideMSW.obj : .AUTODEPEND .\src\gui\msw\StyleGuideMSW.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FLAMEROBIN_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\flamerobin_flamerobin.res : .AUTODEPEND .\res\flamerobin.rc + wrc -q -ad -bt=nt -r -fo=$^@ $(____flamerobin_WXDEBUG_p) $(____flamerobin_DEBUGFLAG_p) -dIBPP_WINDOWS -i=. -i=.\src -i=.\src\ibpp -i=.\res $< + +watu$(R_OPT)$(D_OPT)\ibpp__dpb.obj : .AUTODEPEND .\src\ibpp\_dpb.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp__ibpp.obj : .AUTODEPEND .\src\ibpp\_ibpp.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp__ibs.obj : .AUTODEPEND .\src\ibpp\_ibs.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp__rb.obj : .AUTODEPEND .\src\ibpp\_rb.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp__spb.obj : .AUTODEPEND .\src\ibpp\_spb.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp__tpb.obj : .AUTODEPEND .\src\ibpp\_tpb.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_array.obj : .AUTODEPEND .\src\ibpp\array.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_blob.obj : .AUTODEPEND .\src\ibpp\blob.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_database.obj : .AUTODEPEND .\src\ibpp\database.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_date.obj : .AUTODEPEND .\src\ibpp\date.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_dbkey.obj : .AUTODEPEND .\src\ibpp\dbkey.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_events.obj : .AUTODEPEND .\src\ibpp\events.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_exception.obj : .AUTODEPEND .\src\ibpp\exception.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_row.obj : .AUTODEPEND .\src\ibpp\row.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_service.obj : .AUTODEPEND .\src\ibpp\service.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_statement.obj : .AUTODEPEND .\src\ibpp\statement.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_time.obj : .AUTODEPEND .\src\ibpp\time.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_transaction.obj : .AUTODEPEND .\src\ibpp\transaction.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + +watu$(R_OPT)$(D_OPT)\ibpp_user.obj : .AUTODEPEND .\src\ibpp\user.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IBPP_CXXFLAGS) $< + diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index ef1b4692..3f392760 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -1337,6 +1337,90 @@ bool PrefDlgRelationColumnsListSetting::parseProperty(wxXmlNode* xmln) return PrefDlgCheckListBoxSetting::parseProperty(xmln); } + +class PrefDlgStyleEditSetting : public PrefDlgSetting +{ +public: + PrefDlgStyleEditSetting(wxPanel* page, PrefDlgSetting* parent); + + virtual bool createControl(bool ignoreerrors); + virtual bool loadFromTargetConfig(Config& config); + virtual bool parseProperty(wxXmlNode* xmln); + virtual bool saveToTargetConfig(Config& config); +protected: + virtual void addControlsToSizer(wxSizer* sizer); + virtual void enableControls(bool enabled); + virtual wxStaticText* getLabel(); + virtual bool hasControls() const; + virtual void setDefault(const wxString& defValue); +private: + void OnComboBoxClick(wxCommandEvent& e) { + stylesComboBoxM->SetSelection(static_cast(e.GetEventObject())->GetSelection()); + } + wxComboBox* stylesComboBoxM; + wxString defaultM; + +}; + +PrefDlgStyleEditSetting::PrefDlgStyleEditSetting( + wxPanel* page, PrefDlgSetting* parent) + : PrefDlgSetting(page, parent), stylesComboBoxM(0)//, defaultM(0) +{ +} + +bool PrefDlgStyleEditSetting::createControl(bool WXUNUSED(ignoreerrors)) +{ + stylesComboBoxM = new wxComboBox(getPage(), wxID_ANY); + + return true; +} + +bool PrefDlgStyleEditSetting::loadFromTargetConfig(Config& config) +{ + if (!checkTargetConfigProperties()) + return false; + if (stylesComboBoxM) + { + wxString value = defaultM; + config.getValue(keyM, value); + stylesComboBoxM->SetValue(value); + } + enableControls(true); + return true; +} + +bool PrefDlgStyleEditSetting::parseProperty(wxXmlNode* xmln) +{ + return false; +} + +bool PrefDlgStyleEditSetting::saveToTargetConfig(Config& config) +{ + return false; +} + +void PrefDlgStyleEditSetting::addControlsToSizer(wxSizer* sizer) +{ +} + +void PrefDlgStyleEditSetting::enableControls(bool enabled) +{ +} + +wxStaticText* PrefDlgStyleEditSetting::getLabel() +{ + return nullptr; +} + +bool PrefDlgStyleEditSetting::hasControls() const +{ + return false; +} + +void PrefDlgStyleEditSetting::setDefault(const wxString& defValue) +{ +} + // PrefDlgSetting factory /* static */ PrefDlgSetting* PrefDlgSetting::createPrefDlgSetting(wxPanel* page, @@ -1362,6 +1446,8 @@ PrefDlgSetting* PrefDlgSetting::createPrefDlgSetting(wxPanel* page, return new PrefDlgRelationColumnsListSetting(page, parent); return new PrefDlgRelationColumnsChooserSetting(page, parent); } + if (type == "style") + return new PrefDlgStyleEditSetting(page, parent); return 0; } From 6361c6a37bd116e1ed9e6a4c69af9a6685087ee2 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Tue, 14 Dec 2021 02:59:25 -0600 Subject: [PATCH 16/25] Styles --- conf-defs/fr_settings.confdef | 28 +- flamerobin_flamerobin.dsp | 64 +- flamerobin_flamerobin.vcproj | 50 +- flamerobin_flamerobin.vcxproj | 164 ++- flamerobin_flamerobin.vcxproj.filters | 840 ++++++++-------- flamerobin_ibpp.vcproj | 2 +- flamerobin_ibpp.vcxproj | 427 +++++++- src/gui/ExecuteSqlFrame.cpp | 27 +- src/gui/FRLayoutConfig.cpp | 2 +- src/gui/FRStyle.cpp | 163 +-- src/gui/FRStyle.h | 40 +- src/gui/PreferencesDialog.h | 1 + src/gui/PreferencesDialogSettings.cpp | 526 +++++++++- src/gui/controls/DataGrid.cpp | 12 +- src/gui/controls/DataGridTable.cpp | 4 +- xml-styles/Bespin.xml | 705 +------------ xml-styles/Black board.xml | 701 +------------ xml-styles/Choco.xml | 709 +------------ xml-styles/DansLeRuSH-Dark.xml | 849 +--------------- xml-styles/DarkModeDefault.xml | 23 +- xml-styles/Deep Black.xml | 716 +------------ xml-styles/Hello Kitty.xml | 4 +- xml-styles/HotFudgeSundae.xml | 4 +- xml-styles/Mono Industrial.xml | 4 +- xml-styles/Monokai.xml | 4 +- xml-styles/MossyLawn.xml | 4 +- xml-styles/Navajo.xml | 4 +- xml-styles/Obsidian.xml | 4 +- xml-styles/Plastic Code Wrap.xml | 4 +- xml-styles/Ruby Blue.xml | 565 +---------- xml-styles/Solarized-light.xml | 849 +--------------- xml-styles/Solarized.xml | 849 +--------------- xml-styles/Twilight.xml | 709 +------------ xml-styles/Vibrant Ink.xml | 705 +------------ xml-styles/Zenburn.xml | 1335 +------------------------ xml-styles/khaki.xml | 4 +- xml-styles/stylers.xml | 6 +- xml-styles/vim Dark Blue.xml | 716 +------------ 38 files changed, 1697 insertions(+), 10126 deletions(-) diff --git a/conf-defs/fr_settings.confdef b/conf-defs/fr_settings.confdef index f18ee20e..b082abad 100644 --- a/conf-defs/fr_settings.confdef +++ b/conf-defs/fr_settings.confdef @@ -363,15 +363,33 @@ - Style + Style Configurator SQL Style Editor 0 - - Style file name: + + Select theme: Select the file with the style - StyleFile + StyleTheme + Default + 1 + StyleTheme - + diff --git a/flamerobin_flamerobin.dsp b/flamerobin_flamerobin.dsp index eb899304..aab7fe88 100644 --- a/flamerobin_flamerobin.dsp +++ b/flamerobin_flamerobin.dsp @@ -57,8 +57,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Release Dynamic" @@ -82,8 +82,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Debug Static" @@ -107,8 +107,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 DLL Debug Dynamic" @@ -132,8 +132,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_dll" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Release Static" @@ -157,8 +157,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcus\ibpp.lib /nologo /machine:i386 /out:"vcus\flamerobin.exe" /pdb:"vcus\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Release Dynamic" @@ -182,8 +182,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw31u_aui.lib wxmsw31u_stc.lib wxmsw31u_html.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u_xml.lib wxbase31u.lib wxscintilla.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw30u_aui.lib wxmsw30u_stc.lib wxmsw30u_html.lib wxmsw30u_adv.lib wxmsw30u_core.lib wxbase30u_xml.lib wxbase30u.lib wxexpat.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcu\ibpp.lib /nologo /machine:i386 /out:"vcu\flamerobin.exe" /pdb:"vcu\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Debug Static" @@ -207,8 +207,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcusd\ibpp.lib /nologo /machine:i386 /out:"vcusd\flamerobin.exe" /debug /pdb:"vcusd\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ELSEIF "$(CFG)" == "flamerobin - Win32 Debug Dynamic" @@ -232,8 +232,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows -# ADD LINK32 wxmsw31ud_aui.lib wxmsw31ud_stc.lib wxmsw31ud_html.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud_xml.lib wxbase31ud.lib wxscintillad.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD BASE LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows +# ADD LINK32 wxmsw30ud_aui.lib wxmsw30ud_stc.lib wxmsw30ud_html.lib wxmsw30ud_adv.lib wxmsw30ud_core.lib wxbase30ud_xml.lib wxbase30ud.lib wxexpatd.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comctl32.lib rpcrt4.lib wsock32.lib vcud\ibpp.lib /nologo /machine:i386 /out:"vcud\flamerobin.exe" /debug /pdb:"vcud\flamerobin.pdb" /nologo /subsystem:windows /libpath:"$(WXDIR)\lib\vc_lib" /libpath:"$(BOOST_LIB_DIR)" /subsystem:windows !ENDIF @@ -376,10 +376,6 @@ SOURCE=.\src\gui\FRLayoutConfig.cpp # End Source File # Begin Source File -SOURCE=.\${SOURCEDIR}\gui\FRStyle.cpp -# End Source File -# Begin Source File - SOURCE=.\src\gui\FieldPropertiesDialog.cpp # End Source File # Begin Source File @@ -416,14 +412,6 @@ SOURCE=.\src\gui\InsertDialog.cpp # End Source File # Begin Source File -SOURCE=.\${SOURCEDIR}\gui\InsertParametersDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\config\LocalSettings.cpp -# End Source File -# Begin Source File - SOURCE=.\src\gui\controls\LogTextControl.cpp # End Source File # Begin Source File @@ -650,10 +638,6 @@ SOURCE=.\src\objectdescriptionhandler.cpp # End Source File # Begin Source File -SOURCE=.\${SOURCEDIR}\metadata\package.cpp -# End Source File -# Begin Source File - SOURCE=.\src\metadata\parameter.cpp # End Source File # Begin Source File @@ -830,10 +814,6 @@ SOURCE=.\src\gui\FRLayoutConfig.h # End Source File # Begin Source File -SOURCE=.\${SOURCEDIR}\gui\FRStyle.h -# End Source File -# Begin Source File - SOURCE=.\src\gui\FieldPropertiesDialog.h # End Source File # Begin Source File @@ -870,18 +850,10 @@ SOURCE=.\src\gui\InsertDialog.h # End Source File # Begin Source File -SOURCE=.\${SOURCEDIR}\gui\InsertParametersDialog.h -# End Source File -# Begin Source File - SOURCE=.\src\Isaac.h # End Source File # Begin Source File -SOURCE=.\src\config\LocalSettings.h -# End Source File -# Begin Source File - SOURCE=.\src\gui\controls\LogTextControl.h # End Source File # Begin Source File @@ -1094,10 +1066,6 @@ SOURCE=.\src\metadata\metadataitem.h # End Source File # Begin Source File -SOURCE=.\${SOURCEDIR}\metadata\package.h -# End Source File -# Begin Source File - SOURCE=.\src\metadata\parameter.h # End Source File # Begin Source File diff --git a/flamerobin_flamerobin.vcproj b/flamerobin_flamerobin.vcproj index 9d4fb928..8a108d5e 100644 --- a/flamerobin_flamerobin.vcproj +++ b/flamerobin_flamerobin.vcproj @@ -2,7 +2,7 @@ @@ -81,7 +81,7 @@ - - @@ -943,14 +939,6 @@ RelativePath=".\src\gui\InsertDialog.cpp" > - - - - @@ -1235,10 +1223,6 @@ RelativePath=".\src\objectdescriptionhandler.cpp" > - - @@ -1417,10 +1401,6 @@ RelativePath=".\src\gui\FRLayoutConfig.h" > - - @@ -1457,18 +1437,10 @@ RelativePath=".\src\gui\InsertDialog.h" > - - - - @@ -1681,10 +1653,6 @@ RelativePath=".\src\metadata\metadataitem.h" > - - diff --git a/flamerobin_flamerobin.vcxproj b/flamerobin_flamerobin.vcxproj index 61ec75e5..08976080 100644 --- a/flamerobin_flamerobin.vcxproj +++ b/flamerobin_flamerobin.vcxproj @@ -208,7 +208,7 @@ <_ProjectFileVersion>12.0.30501.0 - .\ + vcud\ vcud\flamerobin\ true true @@ -218,7 +218,7 @@ true - ..\ + .\ vcusd\flamerobin\ true true @@ -290,12 +290,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -310,19 +310,18 @@ Level4 true ProgramDatabase - stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) vcud\flamerobin.exe true - $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true vcud\flamerobin.pdb Windows @@ -336,12 +335,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_x64_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_x64_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN64;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -356,18 +355,17 @@ Level4 true ProgramDatabase - stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x0A00;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) true - $(WXDIR)\lib\vc_x64_lib;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_x64_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true vcud\flamerobin.pdb Windows @@ -380,7 +378,7 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) @@ -400,19 +398,18 @@ Level4 true ProgramDatabase - stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) flamerobin.exe true - $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true vcusd\flamerobin.pdb Windows @@ -426,7 +423,7 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) @@ -446,19 +443,18 @@ Level4 true ProgramDatabase - stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) + wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) vcusd\flamerobin.exe true - $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true vcusd\flamerobin.pdb Windows @@ -471,7 +467,7 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) @@ -489,19 +485,18 @@ Level4 true - stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) vcu\flamerobin.exe true - $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcu\flamerobin.pdb Windows MachineX86 @@ -514,12 +509,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_x64_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_x64_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) _WIN64;_WINDOWS;__WINDOWS__;WINVER=0x500;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -533,19 +528,18 @@ true - stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) vcu\flamerobin.exe true - $(WXDIR)\lib\vc_x64_lib;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_x64_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcu\flamerobin.pdb Windows @@ -557,12 +551,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x500;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreaded @@ -575,19 +569,18 @@ Level4 true - stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) vcus\flamerobin.exe true - $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcus\flamerobin.pdb Windows MachineX86 @@ -600,12 +593,12 @@ WIN64;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_x64_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_x64_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN64;_WINDOWS;__WINDOWS__;WINVER=0x500;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreaded @@ -619,19 +612,18 @@ true - stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_lib\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) vcus\flamerobin.exe true - $(WXDIR)\lib\vc_lib;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcus\flamerobin.pdb Windows @@ -643,12 +635,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -663,19 +655,18 @@ Level4 true ProgramDatabase - stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) + wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) vcud\flamerobin.exe true - $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true vcud\flamerobin.pdb Windows @@ -689,12 +680,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -709,19 +700,18 @@ Level4 true ProgramDatabase - stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) + wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcud\ibpp.lib;%(AdditionalDependencies) vcud\flamerobin.exe true - $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true vcud\flamerobin.pdb Windows @@ -734,12 +724,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_WINDOWS;__WINDOWS__;WINVER=0X0400;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -754,19 +744,18 @@ Level4 true ProgramDatabase - stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) + wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) vcusd\flamerobin.exe true - $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true vcusd\flamerobin.pdb Windows @@ -780,12 +769,12 @@ WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) Disabled - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks @@ -800,19 +789,18 @@ Level4 true ProgramDatabase - stdcpp17 _DEBUG;__WXDEBUG__;_DEBUG;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswud;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) + wxmsw30ud_aui.lib;wxmsw30ud_stc.lib;wxmsw30ud_html.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxbase30ud_xml.lib;wxbase30ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies) vcusd\flamerobin.exe true - $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) true vcusd\flamerobin.pdb Windows @@ -825,12 +813,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -843,19 +831,18 @@ Level4 true - stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) + wxmsw30u_aui.lib;wxmsw30u_stc.lib;wxmsw30u_html.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxbase30u_xml.lib;wxbase30u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) vcu\flamerobin.exe true - $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcu\flamerobin.pdb Windows MachineX86 @@ -868,12 +855,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreadedDLL @@ -887,19 +874,18 @@ true - stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) + wxmsw30u_aui.lib;wxmsw30u_stc.lib;wxmsw30u_html.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxbase30u_xml.lib;wxbase30u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcu\ibpp.lib;%(AdditionalDependencies) vcu\flamerobin.exe true - $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcu\flamerobin.pdb Windows @@ -911,12 +897,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreaded @@ -929,19 +915,18 @@ Level4 true - stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) + wxmsw30u_aui.lib;wxmsw30u_stc.lib;wxmsw30u_html.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxbase30u_xml.lib;wxbase30u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) vcus\flamerobin.exe true - $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcus\flamerobin.pdb Windows MachineX86 @@ -954,12 +939,12 @@ WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) MinSpace - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync MultiThreaded @@ -973,19 +958,18 @@ true - stdcpp17 _WINDOWS;__WINDOWS__;WINVER=0x400;WIN32;__WIN32__;__WIN95__;STRICT;__WXMSW__;wxUSE_GUI=1;wxUSE_REGEX=1;wxUSE_UNICODE=1;WIN32_LEAN_AND_MEAN;_WINDOWS;IBPP_WINDOWS;%(PreprocessorDefinitions) 0x0409 - $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) + $(WXDIR)\lib\vc_dll\mswu;$(WXDIR)\contrib\include;$(WXDIR)\include;$(BOOST_ROOT);.;.\src;.\src\ibpp;.\res;%(AdditionalIncludeDirectories) /nologo /subsystem:windows %(AdditionalOptions) - wxmsw31u_aui.lib;wxmsw31u_stc.lib;wxmsw31u_html.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxbase31u_xml.lib;wxbase31u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) + wxmsw30u_aui.lib;wxmsw30u_stc.lib;wxmsw30u_html.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxbase30u_xml.lib;wxbase30u.lib;wxscintilla.lib;wxexpat.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcus\ibpp.lib;%(AdditionalDependencies) vcus\flamerobin.exe true - $(WXDIR)\lib\vc_dll;%(AdditionalLibraryDirectories) + $(WXDIR)\lib\vc_dll;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories) vcus\flamerobin.pdb Windows @@ -1060,6 +1044,7 @@ + @@ -1078,7 +1063,6 @@ - @@ -1173,6 +1157,7 @@ + @@ -1189,7 +1174,6 @@ - diff --git a/flamerobin_flamerobin.vcxproj.filters b/flamerobin_flamerobin.vcxproj.filters index cb71888a..b6f1f031 100644 --- a/flamerobin_flamerobin.vcxproj.filters +++ b/flamerobin_flamerobin.vcxproj.filters @@ -13,708 +13,672 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - {d6f80b3a-b71a-407e-bea1-3d13a7d631b6} - - - {2cc7bffc-54b6-4c9c-a927-ce4c2f3d7588} - - - {4949ad6b-94ac-4053-b417-c72a7f56eaa0} - - - {1de77b96-7886-4f36-8054-b44ba9ef3f21} - - - {14063b73-27df-4236-b206-03e22a385e3d} - - - {6b23ca03-4d72-401d-804d-568edcc12ce1} - - - {59ff061b-908e-4a7e-84aa-ea688b768dc7} - - - {38ffb02b-7615-48c3-8c64-fb4adb36d79f} - - - {5ba1eabe-593d-4753-bea2-dd4f188a908c} - - - {7f898553-6f0f-43f4-b4ed-a95f9a4b4cbd} - - - {050fa05f-2aa4-4c70-8921-b0e7ff23f2e3} - - - {d0b43b09-68a1-4559-9565-f9680978777e} - - - Source Files - - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - - Source Files\config - - - Source Files\config - - - Source Files\config - - - Source Files\core - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\core - - - Source Files\engine - - - Source Files\gui - - - Source Files\gui + Source Files - - Source Files\gui + + Source Files - - Source Files\gui + + Source Files - - Source Files\gui + + Source Files - - Source Files\gui + + Source Files - - Source Files\gui + + Source Files - - Source Files\gui + + Source Files - - Source Files\gui + + Source Files - - Source Files\gui + + Source Files - - Source Files\gui + + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui + Source Files - - Source Files\gui + + Source Files - Source Files\gui + Source Files - - Source Files\gui + + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files + + + Source Files + + + Source Files - Source Files\gui + Source Files - Source Files\gui - - - Source Files\gui + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files + + + Source Files + + + Source Files + + + Source Files - Source Files\gui + Source Files - - Source Files\gui + + Source Files - Source Files\gui + Source Files + + + Source Files + + + Source Files + + + Source Files - Source Files\gui + Source Files - - Source Files\gui + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files - Source Files\gui + Source Files + + + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files + + + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files + + + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files + + + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files + + + Source Files + + + Source Files + + + Source Files - Source Files\gui + Source Files - - Source Files\gui + + Source Files - Source Files\gui + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files - Source Files\gui + Source Files - Source Files\gui + Source Files + + + Source Files + + + Source Files - Source Files\metadata + Source Files - Source Files\metadata - - - Source Files\metadata + Source Files - Source Files\metadata + Source Files + + + Source Files - Source Files\metadata + Source Files - Source Files\metadata - - - Source Files\metadata - - - Source Files\metadata - - - Source Files\metadata + Source Files - - Source Files\metadata + + Source Files - - Source Files\metadata + + Source Files - - Source Files\metadata + + Source Files - - Source Files\metadata + + Source Files - - Source Files\metadata + + Source Files - - Source Files\metadata + + Source Files - - Source Files\metadata + + Source Files - - Source Files\metadata + + Source Files - Source Files\metadata + Source Files - Source Files\metadata + Source Files - Source Files\metadata + Source Files - Source Files\metadata + Source Files - Source Files\metadata + Source Files - Source Files\metadata + Source Files - Source Files\metadata + Source Files + + + Source Files - Source Files\metadata + Source Files - Source Files\metadata - - - Source Files\metadata + Source Files - Source Files\metadata - - - Source Files\sql - - - Source Files\sql - - - Source Files\sql + Source Files - - Source Files\sql + + Source Files - - Source Files\sql + + Source Files - - Source Files\sql + + Source Files - - Source Files\sql + + Source Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + - Header Files\gui + Header Files + + + Header Files + + + Header Files - Header Files\gui + Header Files + + + Header Files - Header Files\gui + Header Files - Header Files\gui + Header Files - Header Files\gui + Header Files - Header Files\gui - - - Header Files\gui - - Header Files - - Header Files\gui - - + Header Files - - Header Files\gui - - - Header Files\gui - - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - - Header Files\gui - - - Header Files\gui - - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - Header Files\gui + Header Files + + + Header Files - Header Files\gui + Header Files + + + Header Files - Header Files\gui + Header Files + + + Header Files - Header Files\gui + Header Files - Header Files\gui + Header Files + + + Header Files - Header Files\gui + Header Files - Header Files\gui - - - Header Files\gui - - - Header Files\gui + Header Files - - Header Files\gui + + Header Files - - Header Files\gui + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - - Header Files\core + + Header Files - Header Files\core - - - Header Files\engine + Header Files - Header Files\metadata + Header Files - Header Files\metadata - - - Header Files\metadata + Header Files - Header Files\metadata - - - Header Files\metadata + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files + + + Header Files + + + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files - - Header Files\metadata + + Header Files - - Header Files\metadata + + Header Files - Header Files\metadata - - - Header Files\metadata - - - Header Files\metadata - - - Header Files\metadata - - - Header Files\metadata - - - Header Files\metadata - - - Header Files\metadata + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files - Header Files\metadata + Header Files + + + Header Files - Header Files\metadata + Header Files - Header Files\metadata - - - Header Files\metadata + Header Files - Header Files\metadata - - - Header Files\sql - - - Header Files\sql - - - Header Files\sql - - - Header Files\sql - - - Header Files\sql - - - Header Files\sql + Header Files - - Header Files\sql + + Header Files - - Header Files\config + + Header Files - - Header Files\config + + Header Files - Header Files\config + Header Files + + + Header Files diff --git a/flamerobin_ibpp.vcproj b/flamerobin_ibpp.vcproj index d886875f..1546c858 100644 --- a/flamerobin_ibpp.vcproj +++ b/flamerobin_ibpp.vcproj @@ -2,7 +2,7 @@ diff --git a/flamerobin_ibpp.vcxproj b/flamerobin_ibpp.vcxproj index 045c1932..5aeb69a9 100644 --- a/flamerobin_ibpp.vcxproj +++ b/flamerobin_ibpp.vcxproj @@ -1,42 +1,75 @@ - - + + Debug Dynamic Win32 + + Debug Dynamic + x64 + Debug Static Win32 + + Debug Static + x64 + DLL Debug Dynamic Win32 + + DLL Debug Dynamic + x64 + DLL Debug Static Win32 + + DLL Debug Static + x64 + DLL Release Dynamic Win32 + + DLL Release Dynamic + x64 + DLL Release Static Win32 + + DLL Release Static + x64 + Release Dynamic Win32 + + Release Dynamic + x64 + Release Static Win32 + + Release Static + x64 + ibpp {F98A5270-7698-516C-9430-13EBB667AEA5} + 10.0.18362.0 @@ -44,111 +77,175 @@ v142 false + + StaticLibrary + v142 + false + StaticLibrary v142 false + + StaticLibrary + v142 + false + StaticLibrary v142 false + + StaticLibrary + v142 + false + StaticLibrary v142 false + + StaticLibrary + v142 + false + StaticLibrary v142 false + + StaticLibrary + v142 + false + StaticLibrary v142 false + + StaticLibrary + v142 + false + StaticLibrary v142 false + + StaticLibrary + v142 + false + StaticLibrary v142 false + + StaticLibrary + v142 + false + + + + + + + + + + + + + + + + + + + + + + + + + - <_ProjectFileVersion>16.0.30804.86 + <_ProjectFileVersion>12.0.30501.0 vcud\ vcud\ibpp\ - MinimumRecommendedRules.ruleset + + + vcud\ + vcud\ibpp\ vcusd\ vcusd\ibpp\ - MinimumRecommendedRules.ruleset vcu\ vcu\ibpp\ - MinimumRecommendedRules.ruleset + + + vcu\ + vcu\ibpp\ vcus\ vcus\ibpp\ - MinimumRecommendedRules.ruleset vcud\ vcud\ibpp\ - MinimumRecommendedRules.ruleset vcusd\ vcusd\ibpp\ - MinimumRecommendedRules.ruleset vcu\ vcu\ibpp\ - MinimumRecommendedRules.ruleset vcus\ vcus\ibpp\ - MinimumRecommendedRules.ruleset @@ -188,6 +285,44 @@ true + + + WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + .\src\ibpp;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + .\src\ibpp;%(AdditionalIncludeDirectories) + WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + _ibpp.h + vcud\ibpp.pch + vcud\ibpp\ + vcud\ibpp.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + 0x0409 + .\src\ibpp;%(AdditionalIncludeDirectories) + + + vcud\ibpp.lib + true + + + vcud\flamerobin_ibpp.bsc + true + + WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -200,6 +335,44 @@ WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) Sync EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + _ibpp.h + vcusd\ibpp.pch + vcusd\ibpp\ + vcusd\ibpp.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + 0x0409 + .\src\ibpp;%(AdditionalIncludeDirectories) + + + vcusd\ibpp.lib + true + + + vcusd\flamerobin_ibpp.bsc + true + + + + + WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + .\src\ibpp;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + .\src\ibpp;%(AdditionalIncludeDirectories) + WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + Sync + EnableFastChecks MultiThreadedDebug true true @@ -262,6 +435,43 @@ true + + + WIN64;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) + .\src\ibpp;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MinSpace + .\src\ibpp;%(AdditionalIncludeDirectories) + WIN64;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + _ibpp.h + vcu\ibpp.pch + vcu\ibpp\ + vcu\ibpp.pdb + Level4 + true + + + + + IBPP_WINDOWS;%(PreprocessorDefinitions) + 0x0409 + .\src\ibpp;%(AdditionalIncludeDirectories) + + + vcu\ibpp.lib + true + + + vcu\flamerobin_ibpp.bsc + true + + WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -298,6 +508,43 @@ true + + + WIN64;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) + .\src\ibpp;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MinSpace + .\src\ibpp;%(AdditionalIncludeDirectories) + WIN64;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) + Sync + MultiThreaded + true + Use + _ibpp.h + vcus\ibpp.pch + vcus\ibpp\ + vcus\ibpp.pdb + Level4 + true + + + + + IBPP_WINDOWS;%(PreprocessorDefinitions) + 0x0409 + .\src\ibpp;%(AdditionalIncludeDirectories) + + + vcus\ibpp.lib + true + + + vcus\flamerobin_ibpp.bsc + true + + WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -336,6 +583,44 @@ true + + + WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + .\src\ibpp;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + .\src\ibpp;%(AdditionalIncludeDirectories) + WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + _ibpp.h + vcud\ibpp.pch + vcud\ibpp\ + vcud\ibpp.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + 0x0409 + .\src\ibpp;%(AdditionalIncludeDirectories) + + + vcud\ibpp.lib + true + + + vcud\flamerobin_ibpp.bsc + true + + WIN32;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -374,6 +659,44 @@ true + + + WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + .\src\ibpp;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + .\src\ibpp;%(AdditionalIncludeDirectories) + WIN64;_LIB;_DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebug + true + true + Use + _ibpp.h + vcusd\ibpp.pch + vcusd\ibpp\ + vcusd\ibpp.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;IBPP_WINDOWS;%(PreprocessorDefinitions) + 0x0409 + .\src\ibpp;%(AdditionalIncludeDirectories) + + + vcusd\ibpp.lib + true + + + vcusd\flamerobin_ibpp.bsc + true + + WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -410,6 +733,43 @@ true + + + WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) + .\src\ibpp;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MinSpace + .\src\ibpp;%(AdditionalIncludeDirectories) + WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + _ibpp.h + vcu\ibpp.pch + vcu\ibpp\ + vcu\ibpp.pdb + Level4 + true + + + + + IBPP_WINDOWS;%(PreprocessorDefinitions) + 0x0409 + .\src\ibpp;%(AdditionalIncludeDirectories) + + + vcu\ibpp.lib + true + + + vcu\flamerobin_ibpp.bsc + true + + WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) @@ -446,6 +806,43 @@ true + + + WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) + .\src\ibpp;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MinSpace + .\src\ibpp;%(AdditionalIncludeDirectories) + WIN32;_LIB;IBPP_WINDOWS;%(PreprocessorDefinitions) + Sync + MultiThreaded + true + Use + _ibpp.h + vcus\ibpp.pch + vcus\ibpp\ + vcus\ibpp.pdb + Level4 + true + + + + + IBPP_WINDOWS;%(PreprocessorDefinitions) + 0x0409 + .\src\ibpp;%(AdditionalIncludeDirectories) + + + vcus\ibpp.lib + true + + + vcus\flamerobin_ibpp.bsc + true + + @@ -463,13 +860,21 @@ Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp index 42b0550f..cbd9a5df 100644 --- a/src/gui/ExecuteSqlFrame.cpp +++ b/src/gui/ExecuteSqlFrame.cpp @@ -310,24 +310,28 @@ void SqlEditor::setChars(bool firebirdIdentifierOnly) //! This code has to be called each time the font has changed, so that the control updates void SqlEditor::setup() { - stylerManager().assignGlobal(this); - StyleClearAll(); - stylerManager().assignLexer(this); - SetLexer(wxSTC_LEX_SQL); - setChars(false); int tabSize = config().get("sqlEditorTabSize", 4); + SetTabWidth(tabSize); SetIndent(tabSize); SetUseTabs(false); SetTabIndents(true); + SetBackSpaceUnIndents(true); AutoCompSetIgnoreCase(true); AutoCompSetAutoHide(true); // info in ScintillaDoc.html file (in scintilla source package) - SetMarginWidth(0, 40); // turn on the linenumbers margin, set width to 40pixels + + /*SetMarginWidth(0, 40); // turn on the linenumbers margin, set width to 40pixels SetMarginWidth(1, 0); // turn off the folding margin SetMarginType(0, 1); // set margin type to linenumbers - //SetCaretLineVisible(true); + */ + SetCaretLineVisible(true); + + SetMargins(0, 0); + SetMarginWidth(MARGE_LINENUMBER, 40); + SetMarginType(MARGE_LINENUMBER, wxSTC_MARGIN_NUMBER); + if (config().get("sqlEditorShowEdge", false)) { SetEdgeMode(wxSTC_EDGE_LINE); @@ -337,6 +341,13 @@ void SqlEditor::setup() if (!config().get("sqlEditorSmartHomeKey", true)) CmdKeyAssign(wxSTC_KEY_HOME, wxSTC_KEYMOD_NORM, wxSTC_CMD_HOMEDISPLAY); + stylerManager().assignGlobal(this); + StyleClearAll(); + stylerManager().assignLexer(this); + SetLexer(wxSTC_LEX_SQL); + setChars(false); + + centerCaret(false); } @@ -788,7 +799,7 @@ void ExecuteSqlFrame::set_properties() statusbar_1->SetStatusText("Transaction status", 3); grid_data->SetTable(new DataGridTable(statementM, databaseM), true); - grid_data->SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); + grid_data->SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColour()); splitter_window_1->Initialize(styled_text_ctrl_sql); viewModeM = vmEditor; diff --git a/src/gui/FRLayoutConfig.cpp b/src/gui/FRLayoutConfig.cpp index 07d18a77..2afa28c0 100644 --- a/src/gui/FRLayoutConfig.cpp +++ b/src/gui/FRLayoutConfig.cpp @@ -196,7 +196,7 @@ wxColour FRLayoutConfig::getReadonlyColour() // first try to compute a colour that is between "white" and "gray" // (but use the actual system colours instead of hard-coded values) //wxColour clWnd(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - wxColour clWnd(stylerManager().getDefaultStyle()->getbgColor()); + wxColour clWnd(stylerManager().getDefaultStyle()->getbgColour()); int r1 = clWnd.Red(), g1 = clWnd.Green(), b1 = clWnd.Blue(); wxColour clBtn = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); int r2 = clBtn.Red(), g2 = clBtn.Green(), b2 = clBtn.Blue(); diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp index e5fb6b00..433bb3c9 100644 --- a/src/gui/FRStyle.cpp +++ b/src/gui/FRStyle.cpp @@ -40,7 +40,7 @@ FRStyle::FRStyle() - :styleIDM(-1), styleDescM(""), fgColorM(STYLE_NOT_USED), bgColorM(STYLE_NOT_USED), colorStyleM(COLORSTYLE_ALL), + :styleIDM(-1), styleDescM(""), fgColourM(STYLE_NOT_USED), bgColourM(STYLE_NOT_USED), colourStyleM(COLORSTYLE_ALL), fontNameM(""), fontStyleM(FONTSTYLE_NONE), fontSizeM(STYLE_NOT_USED), nestingM(FONTSTYLE_NONE), keywordClassM(STYLE_NOT_USED), keywordsM("") { @@ -50,9 +50,9 @@ FRStyle::FRStyle(const FRStyle& style) { styleIDM = style.styleIDM; styleDescM = style.styleDescM; - fgColorM = style.fgColorM; - bgColorM = style.bgColorM; - colorStyleM = style.colorStyleM; + fgColourM = style.fgColourM; + bgColourM = style.bgColourM; + colourStyleM = style.colourStyleM; fontNameM = style.fontNameM; fontSizeM = style.fontSizeM; fontStyleM = style.fontStyleM; @@ -69,9 +69,9 @@ FRStyle& FRStyle::operator=(const FRStyle& style) { styleIDM = style.styleIDM; styleDescM = style.styleDescM; - fgColorM = style.fgColorM; - bgColorM = style.bgColorM; - colorStyleM = style.colorStyleM; + fgColourM = style.fgColourM; + bgColourM = style.bgColourM; + colourStyleM = style.colourStyleM; fontNameM = style.fontNameM; fontSizeM = style.fontSizeM; fontStyleM = style.fontStyleM; @@ -156,7 +156,7 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) long result; str.ToLong(&result, 16); - newStyle->setfgColor((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + newStyle->setfgColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); } @@ -165,7 +165,7 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) { long result; str.ToLong(&result, 16); - newStyle->setbgColor((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + newStyle->setbgColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); } str = element->GetAttribute("colorStyle"); @@ -173,7 +173,7 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) { long temp; str.ToLong(&temp, 10); - newStyle->setColorStyle(temp); + newStyle->setColourStyle(temp); } str = element->GetAttribute("fontName"); @@ -232,8 +232,8 @@ void FRStyles::addStyler(int styleID, const wxString styleName) FRStyle* newStyle = new FRStyle(); newStyle->setStyleID(styleID); newStyle->setStyleDesc(styleName); - newStyle->setfgColor(wxBLACK->GetRGB()); - newStyle->setbgColor(wxWHITE->GetRGB()); + newStyle->setfgColour(wxBLACK->GetRGB()); + newStyle->setbgColour(wxWHITE->GetRGB()); styleVectorM.push_back(newStyle); @@ -343,7 +343,7 @@ void FRLexerStylers::addLexerStyler(wxString lexerName, wxString lexerDesc, wxSt wxXmlNode* child = lexerNode->GetChildren(); while (child) { - if (child->GetName() == "WordsStyle") { + if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "WordsStyle") { long styleID = -1; if (child->GetAttribute("styleID").ToLong(&styleID)) { ls->addStyler(styleID, child); @@ -355,29 +355,32 @@ void FRLexerStylers::addLexerStyler(wxString lexerName, wxString lexerDesc, wxSt lexerStylerVectorM.push_back(ls); } -void FRLexerStylers::eraseAll() +void FRLexerStylers::clear() { - //std::for_each(lexerStylerVectorM.begin(), lexerStylerVectorM.end(), [] {lexerStylerVectorM[].clear();}); lexerStylerVectorM.clear(); } FRStyleManager& stylerManager() { - const wxString STYLE = "Style"; - const wxString def = "stylers.xml"; + const wxString STYLE = "StyleTheme"; + const wxString def = "stylers"; - wxFileName file = wxFileName(config().getXmlStylesPath(), config().get(STYLE, def)); + wxFileName file = wxFileName(config().getXmlStylesPath(), config().get(STYLE, def) + ".xml"); static FRStyleManager s(file); return s; } void FRStyleManager::loadLexerStyles(wxXmlNode* node) { - wxXmlNode* child = node->GetChildren(); + lexerStylesM.clear(); + wxXmlNode* child = node->GetChildren(); + while (child) { - if (child->GetName() == "LexerType" /*&& child->GetAttribute("name")=="sql"*/) { - lexerStylesM.addLexerStyler(child->GetAttribute("name"), child->GetAttribute("desc"), child->GetAttribute("ext"), child); + if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "LexerType" && + child->GetAttribute("name")=="sql") { + lexerStylesM.addLexerStyler(child->GetAttribute("name"), + child->GetAttribute("desc"), child->GetAttribute("ext"), child); } child = child->GetNext(); }; @@ -386,10 +389,11 @@ void FRStyleManager::loadLexerStyles(wxXmlNode* node) void FRStyleManager::loadGlobalStyles(wxXmlNode* node) { + globalStylesM.clear(); wxXmlNode* child = node->GetChildren(); while (child) { - if (child->GetName() == "WidgetStyle") { + if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "WidgetStyle") { long styleID = -1; if (child->GetAttribute("styleID").ToLong(&styleID)) { globalStylesM.addStyler(styleID, child); @@ -402,13 +406,13 @@ void FRStyleManager::loadGlobalStyles(wxXmlNode* node) void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) { - if (style->getbgColor() != 0){ - text->StyleSetBackground(style->getStyleID(), style->getbgColor()); - } + //if (style->getbgColour() & COLORSTYLE_BACKGROUND){ + text->StyleSetBackground(style->getStyleID(), style->getbgColour()); + //} - if (style->getfgColor() != 0) { - text->StyleSetForeground(style->getStyleID(), style->getfgColor()); - } + //if (style->getfgColour() & COLORSTYLE_FOREGROUND) { + text->StyleSetForeground(style->getStyleID(), style->getfgColour()); + //} double size = style->getFontSize() == 0 ? globalStyleM->getFontSize() : style->getFontSize(); wxFontInfo fontInfo(size); @@ -416,9 +420,11 @@ void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) wxString fontName = style->getFontName().IsEmpty() ? globalStyleM->getFontName() : style->getFontName(); fontInfo.FaceName(fontName); - fontInfo.Bold(style->getFontStyle() & FONTSTYLE_BOLD); - fontInfo.Italic(style->getFontStyle() & FONTSTYLE_ITALIC); - fontInfo.Underlined(style->getFontStyle() & FONTSTYLE_UNDERLINE); + if (style->getFontStyle() != STYLE_NOT_USED) { + fontInfo.Bold(style->getFontStyle() & FONTSTYLE_BOLD); + fontInfo.Italic(style->getFontStyle() & FONTSTYLE_ITALIC); + fontInfo.Underlined(style->getFontStyle() & FONTSTYLE_UNDERLINE); + } wxFont font(fontInfo); @@ -432,27 +438,9 @@ void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) FRStyleManager::FRStyleManager(wxFileName style) { - wxXmlDocument xmlDoc; - xmlDoc.Load(style.GetFullPath()); - if (xmlDoc.IsOk()) { - wxXmlNode* xmlNode = xmlDoc.GetRoot(); - if (xmlNode->GetName() == "Flamerobin") { - - wxXmlNode* child = xmlNode->GetChildren(); - while (child) { - if (!child) - break; - if (child->GetName() == "LexerStyles") { - loadLexerStyles(child); - } - if (child->GetName() == "GlobalStyles") { - loadGlobalStyles(child); - } - child = child->GetNext(); - } - } - } - + fileNameM = style; + + loadStyle(); } @@ -473,8 +461,8 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) if (style->getStyleDesc() == "Global override") { globalStyleM = style; text->StyleResetDefault(); - text->SetBackgroundColour(style->getbgColor()); - text->SetForegroundColour(style->getfgColor()); + text->SetBackgroundColour(style->getbgColour()); + text->SetForegroundColour(style->getfgColour()); assignWordStyle(text, style); } if (style->getStyleDesc() == "Default Style") { @@ -482,26 +470,22 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) } if (style->getStyleDesc() == "Mark colour") {} if (style->getStyleDesc() == "Selected text colour") { - text->SetSelBackground(true, style->getbgColor()); + text->SetSelBackground(true, style->getbgColour()); //text->SetSelForeground(true, style->getfgColor()); } if (style->getStyleDesc() == "Edge colour") { - text->SetEdgeColour(style->getfgColor()); - } - if (style->getStyleDesc() == "Bookmark margin") { - //text->SetMarginBackground(wxSTC_MARGIN_SYMBOL,style->getbgColor()); - //text->SetMarginBackground(wxSTC_MARGIN_NUMBER, style->getbgColor()); - + text->SetEdgeColour(style->getfgColour()); } + if (style->getStyleDesc() == "Bookmark margin" ) {} if (style->getStyleDesc() == "Fold") {} if (style->getStyleDesc() == "Fold active") {} if (style->getStyleDesc() == "Fold margin") { - text->SetFoldMarginColour(true, style->getbgColor()); - text->SetFoldMarginHiColour(true, style->getfgColor()); + text->SetFoldMarginColour(true, style->getbgColour()); + text->SetFoldMarginHiColour(true, style->getfgColour()); } if (style->getStyleDesc() == "White space symbol") { - text->SetWhitespaceForeground(true, style->getfgColor()); - text->SetWhitespaceBackground(true, style->getbgColor()); + text->SetWhitespaceForeground(true, style->getfgColour()); + text->SetWhitespaceBackground(true, style->getbgColour()); } if (style->getStyleDesc() == "Active tab focused indicator") {} if (style->getStyleDesc() == "Active tab unfocused indicator") {} @@ -509,8 +493,8 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) if (style->getStyleDesc() == "Inactive tabs") {} if (style->getStyleDesc() == "URL hovered") {} if (style->getStyleDesc() == "Current line background colour") { - text->SetCaretLineBackground(style->getbgColor()); - text->SetCaretForeground(style->getfgColor()); + text->SetCaretLineBackground(style->getbgColour()); + text->SetCaretForeground(style->getfgColour()); } } @@ -529,4 +513,49 @@ void FRStyleManager::assignLexer(wxStyledTextCtrl* text) } } } + FRStyle* style = globalStylesM.getStyleByName("Line number margin"); + if (style) { + assignWordStyle(text, style); + } +} + +void FRStyleManager::loadConfig() +{ + const wxString STYLE = "StyleTheme"; + const wxString def = "stylers"; + + wxFileName file = wxFileName(config().getXmlStylesPath(), config().get(STYLE, def) + ".xml"); + setfileName(file); + + loadStyle(); +} + +void FRStyleManager::loadStyle() +{ + wxXmlDocument xmlDoc; + xmlDoc.Load(fileNameM.GetFullPath()); + if (xmlDoc.IsOk()) { + wxXmlNode* xmlNode = xmlDoc.GetRoot(); + if (xmlNode->GetType() == wxXML_ELEMENT_NODE && xmlNode->GetName() == "Flamerobin") { + + wxXmlNode* child = xmlNode->GetChildren(); + while (child) { + if (!child) + break; + if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "LexerStyles") { + loadLexerStyles(child); + } + if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "GlobalStyles") { + loadGlobalStyles(child); + } + child = child->GetNext(); + } + } + } + +} + +void FRStyleManager::saveStyle() +{ + //TODO: Implemented } diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h index debaa7dc..09d5e83d 100644 --- a/src/gui/FRStyle.h +++ b/src/gui/FRStyle.h @@ -34,10 +34,12 @@ #include "config/Config.h" +typedef unsigned short _WORD; typedef unsigned long _DWORD; typedef unsigned char _BYTE; -#define _RGB(r,g,b) ((COLORREF)(((_BYTE)(r)|((_DWORD)((_BYTE)(g))<<8))|(((_DWORD)(_BYTE)(b))<<16))) -typedef _DWORD COLORREF; +typedef _DWORD _COLOURREF; + +#define _RGB(r,g,b) ((_COLOURREF)(((_BYTE)(r)|((_WORD)((_BYTE)(g))<<8))|(((_DWORD)(_BYTE)(b))<<16))) const int FONTSTYLE_NONE = 0; @@ -53,6 +55,8 @@ const int COLORSTYLE_ALL = COLORSTYLE_FOREGROUND | COLORSTYLE_BACKGROUND; const int MAX_LEXER_STYLE = 100; +const int MARGE_LINENUMBER = 0; +const int MARGE_SYMBOLE = 1; class FRStyle @@ -61,9 +65,9 @@ class FRStyle int styleIDM; wxString styleDescM; - COLORREF fgColorM; - COLORREF bgColorM; - int colorStyleM; + _COLOURREF fgColourM; + _COLOURREF bgColourM; + int colourStyleM; wxString fontNameM; int fontStyleM; @@ -88,15 +92,14 @@ class FRStyle void setStyleDesc(wxString name) { styleDescM = name; }; - COLORREF getfgColor() { return fgColorM; }; - void setfgColor(COLORREF color) { fgColorM = color; }; + _COLOURREF getfgColour() { return fgColourM; }; + void setfgColour(_COLOURREF color) { fgColourM = color; }; - COLORREF getbgColor() { return bgColorM; }; - void setbgColor(COLORREF color) { bgColorM = color; }; + _COLOURREF getbgColour() { return bgColourM; }; + void setbgColour(_COLOURREF color) { bgColourM = color; }; - int getColorStyle() { return colorStyleM; }; - void setColorStyle(int color) { colorStyleM = color; }; - + int getColourStyle() { return colourStyleM; }; + void setColourStyle(int color) { colourStyleM = color; }; wxString getFontName() { return fontNameM; }; @@ -204,11 +207,12 @@ class FRLexerStylers void addLexerStyler(wxString lexerName, wxString lexerDesc, wxString lexerUserExt, wxXmlNode* lexerNode); - void eraseAll(); + void clear(); }; class FRStyleManager { private: + wxFileName fileNameM; FRStyles globalStylesM; FRLexerStylers lexerStylesM; FRStyle* globalStyleM; @@ -226,11 +230,21 @@ class FRStyleManager { FRStyle* getGlobalStyle() { return globalStyleM; }; FRStyle* getDefaultStyle() { return defaultStyleM; }; FRStyle* getStyleByName(wxString styleName); + + wxFileName getfileName() { return fileNameM; }; + void setfileName(wxFileName fileName) { fileNameM = fileName; }; + void assignGlobal(wxStyledTextCtrl* text); void assignLexer(wxStyledTextCtrl* text); + void loadConfig(); + void loadStyle(); + void saveStyle(); + + + }; FRStyleManager& stylerManager(); diff --git a/src/gui/PreferencesDialog.h b/src/gui/PreferencesDialog.h index 63a6d59f..394cc620 100644 --- a/src/gui/PreferencesDialog.h +++ b/src/gui/PreferencesDialog.h @@ -62,6 +62,7 @@ class PrefDlgSetting int getControlLeft(); // parent for created controls wxPanel* getPage() const; + PrefDlgSetting* getParent() const; virtual bool loadFromTargetConfig(Config& targetConfig) = 0; virtual bool parseProperty(wxXmlNode* xmln); virtual bool saveToTargetConfig(Config& targetConfig) = 0; diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index 3f392760..70b7c8b9 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -31,9 +31,12 @@ #endif #include +#include +#include #include #include #include +#include #include #include #include @@ -46,6 +49,7 @@ #include "frutils.h" #include "gui/PreferencesDialog.h" #include "gui/StyleGuide.h" +#include "gui/FRStyle.h" #include "metadata/column.h" #include "metadata/relation.h" @@ -179,6 +183,11 @@ wxPanel* PrefDlgSetting::getPage() const return pageM; } +PrefDlgSetting* PrefDlgSetting::getParent() const +{ + return parentM; +} + int PrefDlgSetting::getSizerProportion() const { return sizerProportionM; @@ -1123,6 +1132,7 @@ bool PrefDlgCheckListBoxSetting::createControl(bool WXUNUSED(ignoreerrors)) checkListBoxHandlerM->Connect(checkListBoxM->GetId(), wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + checkBoxHandlerM.reset(new PrefDlgEventHandler( std::bind(&PrefDlgCheckListBoxSetting::OnCheckBox, this, std::placeholders::_1))); checkBoxM->PushEventHandler(checkBoxHandlerM.get()); @@ -1338,89 +1348,554 @@ bool PrefDlgRelationColumnsListSetting::parseProperty(wxXmlNode* xmln) } -class PrefDlgStyleEditSetting : public PrefDlgSetting +class PrefDlgComboBoxSetting : public PrefDlgSetting { public: - PrefDlgStyleEditSetting(wxPanel* page, PrefDlgSetting* parent); + PrefDlgComboBoxSetting(wxPanel* page, PrefDlgSetting* parent); + ~PrefDlgComboBoxSetting(); virtual bool createControl(bool ignoreerrors); virtual bool loadFromTargetConfig(Config& config); virtual bool parseProperty(wxXmlNode* xmln); virtual bool saveToTargetConfig(Config& config); protected: + wxString defaultM; + wxArrayString itemsM; + virtual void addControlsToSizer(wxSizer* sizer); virtual void enableControls(bool enabled); virtual wxStaticText* getLabel(); + virtual wxArrayString getComboBoxItems(); virtual bool hasControls() const; virtual void setDefault(const wxString& defValue); private: void OnComboBoxClick(wxCommandEvent& e) { - stylesComboBoxM->SetSelection(static_cast(e.GetEventObject())->GetSelection()); + comboBoxM->SetSelection(static_cast(e.GetEventObject())->GetSelection()); + } + wxStaticText* captionBeforeM; + wxComboBox* comboBoxM; + + std::unique_ptr comboBoxHandlerM; + +}; + +PrefDlgComboBoxSetting::PrefDlgComboBoxSetting( + wxPanel* page, PrefDlgSetting* parent) + : PrefDlgSetting(page, parent), comboBoxM(0), captionBeforeM(0) +{ +} + +PrefDlgComboBoxSetting::~PrefDlgComboBoxSetting() +{ + /* + if (comboBoxM && comboBoxHandlerM.get()) + comboBoxM->PopEventHandler(); + + */ +} + +bool PrefDlgComboBoxSetting::createControl(bool WXUNUSED(ignoreerrors)) +{ + + if (!captionM.empty()) + captionBeforeM = new wxStaticText(getPage(), wxID_ANY, captionM); + + comboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, + wxDefaultSize, getComboBoxItems()); + + if (!descriptionM.empty()) + { + if (captionBeforeM) + captionBeforeM->SetToolTip(descriptionM); + comboBoxM->SetToolTip(descriptionM); + } + + return true; +} + +bool PrefDlgComboBoxSetting::loadFromTargetConfig(Config& config) +{ + if (!checkTargetConfigProperties()) + return false; + + if (comboBoxM) + { + wxString value = defaultM; + config.getValue(keyM, value); + comboBoxM->SetValue(value); + } + + enableControls(true); + return true; +} + +bool PrefDlgComboBoxSetting::parseProperty(wxXmlNode* xmln) +{ + + if (xmln->GetType() == wxXML_ELEMENT_NODE + && xmln->GetName() == "option") + { + wxString optcaption; + for (wxXmlNode* xmlc = xmln->GetChildren(); xmlc != 0; + xmlc = xmlc->GetNext()) + { + if (xmlc->GetType() != wxXML_ELEMENT_NODE) + continue; + wxString value(getNodeContent(xmlc, wxEmptyString)); + if (xmlc->GetName() == "caption") + optcaption = value; + } + // for the time being values are the index of the caption in the array + if (!optcaption.empty()) + itemsM.Add(optcaption); + } + + return PrefDlgSetting::parseProperty(xmln); +} + +bool PrefDlgComboBoxSetting::saveToTargetConfig(Config& config) +{ + if (!checkTargetConfigProperties()) + return false; + + wxString value = comboBoxM->GetStringSelection(); + + if (!value.IsEmpty()) { + config.setValue(keyM, value); + } + + return true; +} + +void PrefDlgComboBoxSetting::addControlsToSizer(wxSizer* sizer) +{ + if (comboBoxM) + { + if (captionBeforeM) + { + sizer->Add(captionBeforeM, 0, wxFIXED_MINSIZE | wxALIGN_TOP); + sizer->Add(styleguide().getControlLabelMargin(), 0); + } + + wxSizer* sizerVert = new wxBoxSizer(wxVERTICAL); + sizerVert->Add(comboBoxM, 1, wxEXPAND); + sizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + + sizer->Add(sizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); + } + +} + +void PrefDlgComboBoxSetting::enableControls(bool enabled) +{ + if (comboBoxM) + comboBoxM->Enable(enabled); +} + +wxStaticText* PrefDlgComboBoxSetting::getLabel() +{ + return captionBeforeM; +} + +wxArrayString PrefDlgComboBoxSetting::getComboBoxItems() +{ + return itemsM; +} + +bool PrefDlgComboBoxSetting::hasControls() const +{ + return captionBeforeM != 0 || comboBoxM != 0; +} + +void PrefDlgComboBoxSetting::setDefault(const wxString& defValue) +{ + defaultM = defValue; +} + + + +class PrefDlgThemeComboBoxSetting : public PrefDlgComboBoxSetting +{ +public: + PrefDlgThemeComboBoxSetting(wxPanel* page, PrefDlgSetting* parent); + +protected: + virtual bool parseProperty(wxXmlNode* xmln); + virtual bool saveToTargetConfig(Config& config); + +private: +}; + +PrefDlgThemeComboBoxSetting::PrefDlgThemeComboBoxSetting(wxPanel* page, PrefDlgSetting* parent) + :PrefDlgComboBoxSetting(page, parent) +{ +} + +bool PrefDlgThemeComboBoxSetting::parseProperty(wxXmlNode* xmln) +{ + if (xmln->GetType() == wxXML_ELEMENT_NODE + && xmln->GetName() == "file") + { + wxString dirName = config().getXmlStylesPath(); + wxString fileSpec = _T("*.xml"); + wxArrayString files; + itemsM.clear(); + + if (wxDir::GetAllFiles(dirName, &files, fileSpec, wxDIR_FILES) > 0) { + wxString name, ext; + wxString allFileNames; + for (size_t i = 0; i < files.GetCount(); i++) { + wxFileName::SplitPath(files[i], NULL, &name, &ext); + itemsM.Add(name); + } + } } - wxComboBox* stylesComboBoxM; + + return PrefDlgComboBoxSetting::parseProperty(xmln); +} + +bool PrefDlgThemeComboBoxSetting::saveToTargetConfig(Config& config) +{ + if (!PrefDlgComboBoxSetting::saveToTargetConfig(config)) + return false; + + stylerManager().loadConfig(); + + return true; +} + + +class PrefDlgColourPickerSetting : public PrefDlgSetting +{ +public: + PrefDlgColourPickerSetting(wxPanel* page, PrefDlgSetting* parent); + ~PrefDlgColourPickerSetting(); + + virtual bool createControl(bool ignoreerrors); + virtual bool loadFromTargetConfig(Config& config); + virtual bool parseProperty(wxXmlNode* xmln); + virtual bool saveToTargetConfig(Config& config); +protected: wxString defaultM; + virtual void addControlsToSizer(wxSizer* sizer); + virtual void enableControls(bool enabled); + virtual wxStaticText* getLabel(); + virtual bool hasControls() const; + virtual void setDefault(const wxString& defValue); +private: + wxStaticText* captionBeforeM; + wxColourPickerCtrl* colourPickerM; }; -PrefDlgStyleEditSetting::PrefDlgStyleEditSetting( +PrefDlgColourPickerSetting::PrefDlgColourPickerSetting( wxPanel* page, PrefDlgSetting* parent) - : PrefDlgSetting(page, parent), stylesComboBoxM(0)//, defaultM(0) + : PrefDlgSetting(page, parent), colourPickerM(0), captionBeforeM(0) { } -bool PrefDlgStyleEditSetting::createControl(bool WXUNUSED(ignoreerrors)) +PrefDlgColourPickerSetting::~PrefDlgColourPickerSetting() { - stylesComboBoxM = new wxComboBox(getPage(), wxID_ANY); +} + +bool PrefDlgColourPickerSetting::createControl(bool ignoreerrors) +{ + if (!captionM.empty()) + captionBeforeM = new wxStaticText(getPage(), wxID_ANY, captionM); + + //wxSize size = wxSize(10, 10); + + colourPickerM = new wxColourPickerCtrl(getPage(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxDefaultSize); + + if (!descriptionM.empty()) + { + if (captionBeforeM) + captionBeforeM->SetToolTip(descriptionM); + colourPickerM->SetToolTip(descriptionM); + } return true; } -bool PrefDlgStyleEditSetting::loadFromTargetConfig(Config& config) +bool PrefDlgColourPickerSetting::loadFromTargetConfig(Config& config) { if (!checkTargetConfigProperties()) return false; - if (stylesComboBoxM) + + if (colourPickerM) { wxString value = defaultM; config.getValue(keyM, value); - stylesComboBoxM->SetValue(value); + + long result; + value.ToLong(&result, 16); + _COLOURREF colour = (_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000); + + colourPickerM->SetColour(colour); } + enableControls(true); return true; } -bool PrefDlgStyleEditSetting::parseProperty(wxXmlNode* xmln) +bool PrefDlgColourPickerSetting::parseProperty(wxXmlNode* xmln) { - return false; + if (xmln->GetType() == wxXML_ELEMENT_NODE + && xmln->GetName() == "option") + { + /*wxString optcaption; + for (wxXmlNode* xmlc = xmln->GetChildren(); xmlc != 0; + xmlc = xmlc->GetNext()) + { + if (xmlc->GetType() != wxXML_ELEMENT_NODE) + continue; + wxString value(getNodeContent(xmlc, wxEmptyString)); + if (xmlc->GetName() == "caption") + optcaption = value; + } + // for the time being values are the index of the caption in the array + if (!optcaption.empty()) + itemsM.Add(optcaption); + */ + } + + return PrefDlgSetting::parseProperty(xmln); } -bool PrefDlgStyleEditSetting::saveToTargetConfig(Config& config) +bool PrefDlgColourPickerSetting::saveToTargetConfig(Config& config) +{ + if (!checkTargetConfigProperties()) + return false; + + wxColour value = colourPickerM->GetColour(); + + //if (!value.IsEmpty()) { + config.setValue(keyM, value.GetAsString(wxC2S_CSS_SYNTAX)); + // } + + return true; +} + +void PrefDlgColourPickerSetting::addControlsToSizer(wxSizer* sizer) +{ + if (colourPickerM) + { + if (captionBeforeM) + { + sizer->Add(captionBeforeM, 0, wxFIXED_MINSIZE | wxALIGN_LEFT); + sizer->Add(styleguide().getControlLabelMargin(), 0); + } + + wxSizer* sizerVert = new wxBoxSizer(wxVERTICAL); + sizerVert->Add(colourPickerM, 1, wxEXPAND); + sizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + + sizer->Add(sizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); + } + +} + +void PrefDlgColourPickerSetting::enableControls(bool enabled) +{ + if (colourPickerM) + colourPickerM->Enable(enabled); +} + +wxStaticText* PrefDlgColourPickerSetting::getLabel() +{ + return captionBeforeM; +} + +bool PrefDlgColourPickerSetting::hasControls() const +{ + return captionBeforeM != 0 || colourPickerM != 0; +} + +void PrefDlgColourPickerSetting::setDefault(const wxString& defValue) +{ + defaultM = defValue; +} + +class PrefDlgThemeSetting : public PrefDlgSetting +{ +public: + PrefDlgThemeSetting(wxPanel* page, PrefDlgSetting* parent); + ~PrefDlgThemeSetting(); + + virtual bool createControl(bool ignoreerrors); + virtual bool loadFromTargetConfig(Config& config); + virtual bool parseProperty(wxXmlNode* xmln); + virtual bool saveToTargetConfig(Config& config); +protected: + wxString defaultM; + + virtual void addControlsToSizer(wxSizer* sizer); + virtual void enableControls(bool enabled); + //virtual wxStaticText* getLabel(); + virtual bool hasControls() const; + //virtual void setDefault(const wxString& defValue);*/ + virtual wxArrayString getComboBoxItems(); +private: + wxStaticText* captionBeforeM; + wxComboBox* comboBoxM; + wxListBox* languageListBoxM; + wxListBox* styleListBoxM; +}; + +PrefDlgThemeSetting::PrefDlgThemeSetting(wxPanel* page, PrefDlgSetting* parent) + : PrefDlgSetting(page, parent), comboBoxM(0), captionBeforeM(0), + languageListBoxM(0), styleListBoxM(0) { - return false; } -void PrefDlgStyleEditSetting::addControlsToSizer(wxSizer* sizer) +PrefDlgThemeSetting::~PrefDlgThemeSetting() { } -void PrefDlgStyleEditSetting::enableControls(bool enabled) +bool PrefDlgThemeSetting::createControl(bool WXUNUSED(ignoreerrors)) { + captionBeforeM = new wxStaticText(getPage(), wxID_ANY, "Select theme:"); + + comboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, + wxDefaultSize, getComboBoxItems()); + languageListBoxM = new wxListBox(getPage(), wxID_ANY, wxDefaultPosition, wxDefaultSize); + languageListBoxM->Insert("SQL", 0); + + styleListBoxM = new wxListBox(getPage(), wxID_ANY, wxDefaultPosition, wxDefaultSize); + styleListBoxM->Insert("Global", 0); + + return true; } -wxStaticText* PrefDlgStyleEditSetting::getLabel() +bool PrefDlgThemeSetting::loadFromTargetConfig(Config& config) { - return nullptr; + return true; +} + +bool PrefDlgThemeSetting::parseProperty(wxXmlNode* xmln) +{ + /*if (xmln->GetType() == wxXML_ELEMENT_NODE + && xmln->GetName() == "file") + { + wxString dirName = config().getXmlStylesPath(); + wxString fileSpec = _T("*.xml"); + wxArrayString files; + itemsM.clear(); + + if (wxDir::GetAllFiles(dirName, &files, fileSpec, wxDIR_FILES) > 0) { + wxString name, ext; + wxString allFileNames; + for (size_t i = 0; i < files.GetCount(); i++) { + wxFileName::SplitPath(files[i], NULL, &name, &ext); + itemsM.Add(name); + } + } + }*/ + + return PrefDlgSetting::parseProperty(xmln); } -bool PrefDlgStyleEditSetting::hasControls() const +bool PrefDlgThemeSetting::saveToTargetConfig(Config& config) { return false; } -void PrefDlgStyleEditSetting::setDefault(const wxString& defValue) +void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) { + //if (checkListBoxM) + { + static_cast(sizer)->SetOrientation(wxVERTICAL); + wxSizer* topSizer = new wxBoxSizer(wxHORIZONTAL); + sizer->Add(topSizer, 0, wxEXPAND | wxALIGN_TOP); + if (captionBeforeM) + { + topSizer->Add(captionBeforeM, 0, wxFIXED_MINSIZE | wxALIGN_TOP); + topSizer->Add(styleguide().getControlLabelMargin(), 0); + } + + + wxSizer* sizerVert = new wxBoxSizer(wxVERTICAL); + sizerVert->Add(comboBoxM, 1, wxEXPAND); + topSizer->Add(sizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); + + + wxSizer* buttomSizer = new wxBoxSizer(wxHORIZONTAL); + sizer->Add(buttomSizer, 1, wxEXPAND ); + + + wxSizer* rightSizer = new wxBoxSizer(wxHORIZONTAL); + buttomSizer->Add(rightSizer, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); + + wxPanel* rightPanel = new wxPanel(getPage(), wxID_ANY, wxDefaultPosition, wxSize(100,200)); + //rightPanel->SetBackgroundColour(wxColor(200, 100, 200)); + buttomSizer->Add(rightPanel, 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, 10); + + wxBoxSizer* rightBoxSizer = new wxBoxSizer(wxVERTICAL); /*vbox*/ + wxStaticBox* rightStaticBox = new wxStaticBox(rightPanel, -1, ""); /*nm*/ + wxStaticBoxSizer* rightStaticBoxSizer = new wxStaticBoxSizer(rightStaticBox, wxHORIZONTAL);/*mnSizer*/ + + wxBoxSizer* languageBoxSizer = new wxBoxSizer(wxVERTICAL); /*mnBox*/ + languageBoxSizer->Add(new wxStaticText(rightPanel, -1, "Language:"), 0, wxALL | wxCENTER, 1); + languageBoxSizer->Add(new wxListBox(rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize), 0, wxALL | wxCENTER, 1); + + //wxSizer* sizerlanguageListBox = new wxBoxSizer(wxVERTICAL); + //languageListBoxM->SetParent(rightPanel); + languageBoxSizer->Add(languageListBoxM, 1, wxALL | wxCENTER, 1); + //languageBoxSizer->Add(sizerlanguageListBox, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT, 5); + + rightStaticBoxSizer->Add(languageBoxSizer, 0, wxALL | wxCENTER, 10); + + + wxBoxSizer* styleBoxSizer = new wxBoxSizer(wxVERTICAL); /*mnBox*/ + styleBoxSizer->Add(new wxStaticText(rightPanel, -1, "Style:"), 0, wxALL | wxCENTER, 1); + styleBoxSizer->Add(styleListBoxM, 1, wxALL | wxCENTER, 1); + rightStaticBoxSizer->Add(styleBoxSizer, 0, wxALL | wxCENTER, 10); + + + rightBoxSizer->Add(rightStaticBoxSizer, 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT | wxBOTTOM, 5); + rightPanel->SetSizer(rightBoxSizer); + + //wxStaticBoxSizer* rigthStaticSizer = new wxStaticBoxSizer(rigthStaticBox, wxVERTICAL); + //rigthStaticSizer->SetDimension(1, 1, 198, 198); + //rigthStaticSizer->Add(0, styleguide().getUnrelatedControlMargin(wxVERTICAL)); + //rigthStaticSizer->Add(new wxStaticText(rigthStaticSizer->GetStaticBox(), wxID_ANY, "Language:"), 0, wxCENTER, 10); + + //wxBoxSizer* languageSizer = new wxBoxSizer(wxVERTICAL); + //rigthStaticSizer->Add(languageSizer, 1); + //languageSizer->Add(new wxStaticText(rigthStaticSizer->GetStaticBox(), wxID_ANY, "Language:"), 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, 10); + + + + + + + + wxSizer* leftSizer = new wxBoxSizer(wxHORIZONTAL); + buttomSizer->Add(leftSizer, 1, wxEXPAND ); + + + wxPanel* panel_top = new wxPanel(getPage(), wxID_ANY, wxDefaultPosition, wxDefaultSize); + panel_top->SetBackgroundColour(wxColor(100, 100, 200)); + leftSizer->Add(panel_top, 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, 10); + + } } +void PrefDlgThemeSetting::enableControls(bool enabled) +{ +} + +bool PrefDlgThemeSetting::hasControls() const +{ + return true; +} + +wxArrayString PrefDlgThemeSetting::getComboBoxItems() +{ + return wxArrayString(); +} + + // PrefDlgSetting factory /* static */ PrefDlgSetting* PrefDlgSetting::createPrefDlgSetting(wxPanel* page, @@ -1430,6 +1905,13 @@ PrefDlgSetting* PrefDlgSetting::createPrefDlgSetting(wxPanel* page, return new PrefDlgCheckboxSetting(page, parent); if (type == "checklistbox") return new PrefDlgCheckListBoxSetting(page, parent); + if (type == "colour") + return new PrefDlgColourPickerSetting(page, parent); + if (type == "combobox") + return new PrefDlgComboBoxSetting(page, parent); + if (type == "themecombobox") + return new PrefDlgThemeSetting(page, parent); + //return new PrefDlgThemeComboBoxSetting(page, parent); if (type == "radiobox") return new PrefDlgRadioboxSetting(page, parent); if (type == "int") @@ -1446,8 +1928,6 @@ PrefDlgSetting* PrefDlgSetting::createPrefDlgSetting(wxPanel* page, return new PrefDlgRelationColumnsListSetting(page, parent); return new PrefDlgRelationColumnsChooserSetting(page, parent); } - if (type == "style") - return new PrefDlgStyleEditSetting(page, parent); return 0; } diff --git a/src/gui/controls/DataGrid.cpp b/src/gui/controls/DataGrid.cpp index 706376cd..ccf0d5e4 100644 --- a/src/gui/controls/DataGrid.cpp +++ b/src/gui/controls/DataGrid.cpp @@ -65,17 +65,17 @@ DataGrid::DataGrid(wxWindow* parent, wxWindowID id) SetColLabelAlignment(wxALIGN_LEFT, wxALIGN_CENTRE); SetRowLabelAlignment(wxALIGN_RIGHT, wxALIGN_CENTRE); - SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); - SetForegroundColour(stylerManager().getDefaultStyle()->getfgColor()); + SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColour()); + SetForegroundColour(stylerManager().getDefaultStyle()->getfgColour()); - SetSelectionBackground(stylerManager().getStyleByName("Selected text colour")->getbgColor()); + SetSelectionBackground(stylerManager().getStyleByName("Selected text colour")->getbgColour()); //SetSelectionForeground(stylerManager().getDefaultStyle()->getfgColor()); - SetDefaultCellBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); - SetDefaultCellTextColour(stylerManager().getDefaultStyle()->getfgColor()); + SetDefaultCellBackgroundColour(stylerManager().getDefaultStyle()->getbgColour()); + SetDefaultCellTextColour(stylerManager().getDefaultStyle()->getfgColour()); - SetCellHighlightColour(stylerManager().getDefaultStyle()->getfgColor()); + SetCellHighlightColour(stylerManager().getDefaultStyle()->getfgColour()); wxString s; wxFont f; diff --git a/src/gui/controls/DataGridTable.cpp b/src/gui/controls/DataGridTable.cpp index 49e17353..28e359aa 100644 --- a/src/gui/controls/DataGridTable.cpp +++ b/src/gui/controls/DataGridTable.cpp @@ -210,7 +210,7 @@ wxGridCellAttr* DataGridTable::GetAttr(int row, int col, else if (info.fieldModified) textCol = *wxBLUE; else - textCol = stylerManager().getDefaultStyle()->getfgColor() != 0 ? stylerManager().getDefaultStyle()->getfgColor() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + textCol = stylerManager().getDefaultStyle()->getfgColour() != 0 ? stylerManager().getDefaultStyle()->getfgColour() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); cellAttriM->SetTextColour(textCol); // background colour @@ -222,7 +222,7 @@ wxGridCellAttr* DataGridTable::GetAttr(int row, int col, else if (readOnlyM || info.fieldReadOnly || info.fieldBlob) bgCol = frlayoutconfig().getReadonlyColour(); else - bgCol = stylerManager().getDefaultStyle()->getbgColor() != 0 ? stylerManager().getDefaultStyle()->getbgColor() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); + bgCol = stylerManager().getDefaultStyle()->getbgColour() != 0 ? stylerManager().getDefaultStyle()->getbgColour() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); cellAttriM->SetBackgroundColour(bgCol); // text alignment diff --git a/xml-styles/Bespin.xml b/xml-styles/Bespin.xml index aacb632e..c0fe3594 100644 --- a/xml-styles/Bespin.xml +++ b/xml-styles/Bespin.xml @@ -41,138 +41,10 @@ Credits: //--> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -182,577 +54,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - the_ID the_post have_posts wp_link_pages the_content - - - - $_POST $_GET $_SESSION - - - - - - - - - - - alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window - XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - import - import - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - ContentScroller - - - onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - diff --git a/xml-styles/Black board.xml b/xml-styles/Black board.xml index 01bc13aa..41ac8bf1 100644 --- a/xml-styles/Black board.xml +++ b/xml-styles/Black board.xml @@ -43,138 +43,10 @@ Credits: //--> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -184,573 +56,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - diff --git a/xml-styles/Choco.xml b/xml-styles/Choco.xml index cba2d597..fe7822cc 100644 --- a/xml-styles/Choco.xml +++ b/xml-styles/Choco.xml @@ -41,715 +41,20 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ooooo - - - - - - ooooo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char + @@ -787,4 +92,4 @@ Credits: - + diff --git a/xml-styles/DansLeRuSH-Dark.xml b/xml-styles/DansLeRuSH-Dark.xml index c985d46b..45232fbc 100644 --- a/xml-styles/DansLeRuSH-Dark.xml +++ b/xml-styles/DansLeRuSH-Dark.xml @@ -17,747 +17,10 @@ Requirements : This style is based on Consolas (or other nice monotype) font and Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable installation to "%INSTALL FOLDER%\themes" //--> - + - - - ContentScroller - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - import - import - - - - - - - - - - - - - - - - - - - - - - - - - ContentScroller - - - onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - bool long int char - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window - XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - the_ID the_post have_posts wp_link_pages the_content - - - - $_POST $_GET $_SESSION - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - raise - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - bool long int char - - - - - - - - - - - - + @@ -766,112 +29,6 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - - @@ -907,4 +64,4 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable - + diff --git a/xml-styles/DarkModeDefault.xml b/xml-styles/DarkModeDefault.xml index 9d54812e..5dfd1f3c 100644 --- a/xml-styles/DarkModeDefault.xml +++ b/xml-styles/DarkModeDefault.xml @@ -10,7 +10,7 @@ Created by: Jani Kesänen (jani dot kesanen gmail com) Released: 25.06.2019 License: GPL2 --> - + @@ -1244,6 +1244,25 @@ License: GPL2 + + + + + + + + + + + + + + + + + + + @@ -1382,4 +1401,4 @@ License: GPL2 - + diff --git a/xml-styles/Deep Black.xml b/xml-styles/Deep Black.xml index c35d5476..3178ee10 100644 --- a/xml-styles/Deep Black.xml +++ b/xml-styles/Deep Black.xml @@ -12,140 +12,12 @@ http://sourceforge.net/donate/index.php?group_id=95717 2009.05.28 --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -155,584 +27,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - if else for while - bool long int char - - - @@ -767,4 +61,4 @@ http://sourceforge.net/donate/index.php?group_id=95717 - + diff --git a/xml-styles/Hello Kitty.xml b/xml-styles/Hello Kitty.xml index fbd072ce..1fd13de8 100644 --- a/xml-styles/Hello Kitty.xml +++ b/xml-styles/Hello Kitty.xml @@ -5,7 +5,7 @@ This theme is not complete. If you enhance it, please send it back to me : so your enhanced file can be included in Notepad++ future release. --> - + @@ -762,4 +762,4 @@ so your enhanced file can be included in Notepad++ future release. - + diff --git a/xml-styles/HotFudgeSundae.xml b/xml-styles/HotFudgeSundae.xml index d2574990..e0cf7a9b 100644 --- a/xml-styles/HotFudgeSundae.xml +++ b/xml-styles/HotFudgeSundae.xml @@ -35,7 +35,7 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + @@ -925,4 +925,4 @@ Installation: - + diff --git a/xml-styles/Mono Industrial.xml b/xml-styles/Mono Industrial.xml index 19da3e06..69d25b18 100644 --- a/xml-styles/Mono Industrial.xml +++ b/xml-styles/Mono Industrial.xml @@ -41,7 +41,7 @@ Credits: Thanks for the user for the tmTheme source. //--> - + @@ -791,4 +791,4 @@ Credits: - + diff --git a/xml-styles/Monokai.xml b/xml-styles/Monokai.xml index 3c070f8d..a246cd3b 100644 --- a/xml-styles/Monokai.xml +++ b/xml-styles/Monokai.xml @@ -41,7 +41,7 @@ Credits: Thanks for the user for the tmTheme source. //--> - + @@ -807,4 +807,4 @@ Credits: - + diff --git a/xml-styles/MossyLawn.xml b/xml-styles/MossyLawn.xml index e3b2edf5..06836555 100644 --- a/xml-styles/MossyLawn.xml +++ b/xml-styles/MossyLawn.xml @@ -36,7 +36,7 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + @@ -926,4 +926,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Navajo.xml b/xml-styles/Navajo.xml index ee58a7b9..2bec42dc 100644 --- a/xml-styles/Navajo.xml +++ b/xml-styles/Navajo.xml @@ -33,7 +33,7 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + @@ -923,4 +923,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Obsidian.xml b/xml-styles/Obsidian.xml index 8119e4bf..51f35200 100644 --- a/xml-styles/Obsidian.xml +++ b/xml-styles/Obsidian.xml @@ -9,7 +9,7 @@ Notepad++ Custom Style assembly, bash, batch, lua at least for detail. Everything else more or less... Info: Inspired by Oblivion theme for gedit. --> - + @@ -808,4 +808,4 @@ Notepad++ Custom Style - + diff --git a/xml-styles/Plastic Code Wrap.xml b/xml-styles/Plastic Code Wrap.xml index d9e5b128..6d7eba42 100644 --- a/xml-styles/Plastic Code Wrap.xml +++ b/xml-styles/Plastic Code Wrap.xml @@ -41,7 +41,7 @@ Credits: Thanks for the user for the tmTheme source. //--> - + @@ -803,4 +803,4 @@ Credits: - + diff --git a/xml-styles/Ruby Blue.xml b/xml-styles/Ruby Blue.xml index 9172272c..f18d47ab 100644 --- a/xml-styles/Ruby Blue.xml +++ b/xml-styles/Ruby Blue.xml @@ -35,140 +35,12 @@ http://sourceforge.net/donate/index.php?group_id=95717 2006.03.27. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -178,432 +50,7 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - + @@ -640,4 +87,4 @@ http://sourceforge.net/donate/index.php?group_id=95717 - + diff --git a/xml-styles/Solarized-light.xml b/xml-styles/Solarized-light.xml index 0fa226f2..d17b97c1 100644 --- a/xml-styles/Solarized-light.xml +++ b/xml-styles/Solarized-light.xml @@ -44,756 +44,17 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -801,105 +62,7 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -934,4 +97,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Solarized.xml b/xml-styles/Solarized.xml index e4a0ac95..f9f94670 100644 --- a/xml-styles/Solarized.xml +++ b/xml-styles/Solarized.xml @@ -44,756 +44,17 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -801,105 +62,7 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -934,4 +97,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Twilight.xml b/xml-styles/Twilight.xml index 10dacd60..59bd0724 100644 --- a/xml-styles/Twilight.xml +++ b/xml-styles/Twilight.xml @@ -42,140 +42,12 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -185,577 +57,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - raise - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - @@ -792,4 +93,4 @@ Credits: - + diff --git a/xml-styles/Vibrant Ink.xml b/xml-styles/Vibrant Ink.xml index deea338c..ca25b19d 100644 --- a/xml-styles/Vibrant Ink.xml +++ b/xml-styles/Vibrant Ink.xml @@ -17,140 +17,12 @@ http://sourceforge.net/donate/index.php?group_id=95717 2007.11.16 --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -160,573 +32,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - @@ -763,4 +68,4 @@ http://sourceforge.net/donate/index.php?group_id=95717 - + diff --git a/xml-styles/Zenburn.xml b/xml-styles/Zenburn.xml index 9d54812e..238baf20 100644 --- a/xml-styles/Zenburn.xml +++ b/xml-styles/Zenburn.xml @@ -10,1117 +10,12 @@ Created by: Jani Kesänen (jani dot kesanen gmail com) Released: 25.06.2019 License: GPL2 --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1128,226 +23,6 @@ License: GPL2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1382,4 +57,4 @@ License: GPL2 - + diff --git a/xml-styles/khaki.xml b/xml-styles/khaki.xml index bd91218b..9d44d21a 100644 --- a/xml-styles/khaki.xml +++ b/xml-styles/khaki.xml @@ -33,7 +33,7 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + @@ -923,4 +923,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/stylers.xml b/xml-styles/stylers.xml index b2b4c12d..59de3cf1 100644 --- a/xml-styles/stylers.xml +++ b/xml-styles/stylers.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/xml-styles/vim Dark Blue.xml b/xml-styles/vim Dark Blue.xml index d3927838..8e89574b 100644 --- a/xml-styles/vim Dark Blue.xml +++ b/xml-styles/vim Dark Blue.xml @@ -1,609 +1,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -613,113 +14,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - @@ -757,4 +51,4 @@ - + From a5faaf64879d4087966fb0456d43eaa406fcae42 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Sat, 18 Dec 2021 02:07:10 -0600 Subject: [PATCH 17/25] fix merge --- flamerobin_flamerobin.vcxproj | 2 ++ flamerobin_flamerobin.vcxproj.filters | 6 ++++++ flamerobin_ibpp.vcxproj | 1 + flamerobin_ibpp.vcxproj.filters | 3 +++ src/gui/controls/DataGridRows.cpp | 4 ++-- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/flamerobin_flamerobin.vcxproj b/flamerobin_flamerobin.vcxproj index 08976080..1b030e76 100644 --- a/flamerobin_flamerobin.vcxproj +++ b/flamerobin_flamerobin.vcxproj @@ -986,6 +986,7 @@ + @@ -1114,6 +1115,7 @@ + diff --git a/flamerobin_flamerobin.vcxproj.filters b/flamerobin_flamerobin.vcxproj.filters index b6f1f031..f897efdb 100644 --- a/flamerobin_flamerobin.vcxproj.filters +++ b/flamerobin_flamerobin.vcxproj.filters @@ -345,6 +345,9 @@ Source Files + + Source Files + @@ -680,6 +683,9 @@ Header Files + + Header Files + diff --git a/flamerobin_ibpp.vcxproj b/flamerobin_ibpp.vcxproj index 5aeb69a9..d3e01c7c 100644 --- a/flamerobin_ibpp.vcxproj +++ b/flamerobin_ibpp.vcxproj @@ -851,6 +851,7 @@ + diff --git a/flamerobin_ibpp.vcxproj.filters b/flamerobin_ibpp.vcxproj.filters index a1993022..80096f7f 100644 --- a/flamerobin_ibpp.vcxproj.filters +++ b/flamerobin_ibpp.vcxproj.filters @@ -68,6 +68,9 @@ Source Files + + Source Files + diff --git a/src/gui/controls/DataGridRows.cpp b/src/gui/controls/DataGridRows.cpp index e4c5b652..19d9ff8f 100644 --- a/src/gui/controls/DataGridRows.cpp +++ b/src/gui/controls/DataGridRows.cpp @@ -2276,11 +2276,11 @@ wxString DataGridRows::setFieldValue(unsigned row, unsigned col, LocalSettings localSet; wxString localValue = value; - + double localDouble = 0; + if (IBPP::isRationalNumber(statementM->ColumnType(col + 1)) && localValue.ToDouble(&localDouble) && (value.Contains(",") || value.Contains("."))) { - double localDouble = 0; if (localValue.ToDouble(&localDouble) && localValue.Contains(",")) { localSet.setDataBaseLenguage(); From adc1828b467dbb3bde7eb3a30b9f6212cd23494a Mon Sep 17 00:00:00 2001 From: jdochoa Date: Thu, 3 Mar 2022 00:04:24 -0600 Subject: [PATCH 18/25] Folding --- src/gui/ExecuteSqlFrame.cpp | 233 ++++++++++++++++++- src/gui/ExecuteSqlFrame.h | 10 + src/gui/FRStyle.cpp | 193 ++++++++++++---- src/gui/FRStyle.h | 72 +++--- src/gui/PreferencesDialogSettings.cpp | 313 +++++++++++++++++++++----- xml-styles/stylers.xml | 9 + 6 files changed, 699 insertions(+), 131 deletions(-) diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp index 3fba6982..23c14820 100644 --- a/src/gui/ExecuteSqlFrame.cpp +++ b/src/gui/ExecuteSqlFrame.cpp @@ -331,6 +331,7 @@ void SqlEditor::setup() SetMargins(0, 0); SetMarginWidth(MARGE_LINENUMBER, 40); SetMarginType(MARGE_LINENUMBER, wxSTC_MARGIN_NUMBER); + SetAutomaticFold(wxSTC_AUTOMATICFOLD_SHOW); if (config().get("sqlEditorShowEdge", false)) { @@ -345,12 +346,14 @@ void SqlEditor::setup() StyleClearAll(); stylerManager().assignLexer(this); SetLexer(wxSTC_LEX_SQL); + stylerManager().assignFold(this); setChars(false); centerCaret(false); } + BEGIN_EVENT_TABLE(SqlEditor, wxStyledTextCtrl) EVT_CONTEXT_MENU(SqlEditor::OnContextMenu) EVT_KILL_FOCUS(SqlEditor::OnKillFocus) @@ -539,7 +542,9 @@ ExecuteSqlFrame::ExecuteSqlFrame(wxWindow* WXUNUSED(parent), int id, splitter_window_1 = new wxSplitterWindow(panel_contents, -1); styled_text_ctrl_sql = new SqlEditor(splitter_window_1, ID_stc_sql); - + //Fold + //styled_text_ctrl_sql->Bind(wxEVT_STC_MARGINCLICK, &ExecuteSqlFrame::onMarginClick, this); + //styled_text_ctrl_sql->Bind(wxEVT_STC_STYLENEEDED, &ExecuteSqlFrame::onStyleNeeded, this); notebook_1 = new wxNotebook(splitter_window_1, -1, wxDefaultPosition, wxDefaultSize, 0); @@ -589,6 +594,232 @@ Database* ExecuteSqlFrame::getDatabase() const return databaseM; } +void ExecuteSqlFrame::onMarginClick(wxStyledTextEvent& event) +{ + int margin = event.GetMargin(); + int position = event.GetPosition(); + int line = styled_text_ctrl_sql->LineFromPosition(position); + int foldLevel = styled_text_ctrl_sql->GetFoldLevel(line); + bool headerFlag = (foldLevel & wxSTC_FOLDLEVELHEADERFLAG) != 0; + + if (margin == FR_FOLDMARGIN && headerFlag) { + styled_text_ctrl_sql->ToggleFold(line); + } +} + +void ExecuteSqlFrame::onStyleNeeded(wxStyledTextEvent& event) +{ + /*this is called every time the styler detects a line that needs style, so we style that range. + This will save a lot of performance since we only style text when needed instead of parsing the whole file every time.*/ + size_t line_end = styled_text_ctrl_sql->LineFromPosition(styled_text_ctrl_sql->GetCurrentPos()); + size_t line_start = styled_text_ctrl_sql->LineFromPosition(styled_text_ctrl_sql->GetEndStyled()); + /*fold level: May need to include the two lines in front because of the fold level these lines have- the line above + may be affected*/ + if (line_start > 1) { + line_start -= 2; + } + else { + line_start = 0; + } + //if it is so small that all lines are visible, style the whole document + if (styled_text_ctrl_sql->GetLineCount() == styled_text_ctrl_sql->LinesOnScreen()) { + line_start = 0; + line_end = styled_text_ctrl_sql->GetLineCount() - 1; + } + if (line_end < line_start) { + //that happens when you select parts that are in front of the styled area + size_t temp = line_end; + line_end = line_start; + line_start = temp; + } + //style the line following the style area too (if present) in case fold level decreases in that one + if (line_end < styled_text_ctrl_sql->GetLineCount() - 1) { + line_end++; + } + //get exact start positions + size_t startpos = styled_text_ctrl_sql->PositionFromLine(line_start); + size_t endpos = (styled_text_ctrl_sql->GetLineEndPosition(line_end)); + int startfoldlevel = styled_text_ctrl_sql->GetFoldLevel(line_start); + startfoldlevel &= wxSTC_FOLDFLAG_LEVELNUMBERS; //mask out the flags and only use the fold level + wxString text = styled_text_ctrl_sql->GetTextRange(startpos, endpos).Upper(); + this->highlightSTCsyntax(startpos, endpos, text); + //calculate and apply foldings + this->setfoldlevels(startpos, startfoldlevel, text); +} + +void ExecuteSqlFrame::highlightSTCsyntax(size_t fromPos, size_t toPos, wxString& text) +{ + //this vector will hold the start and end position of each word to highlight + //if you want to highlight more than one, you should pass a whole class or struct containing the offsets + std::vector>GcodeVector; + //the following example is a quick and dirty parser for G-Codes. + //it just iterates through the Text Range and finds "Gxx" where xx is a digit. + //you could also use regex, but one can build a pretty fast routine based on single char evaluation + size_t actual_cursorpos = 0; + size_t startpos = 0; + size_t end_of_text = text.length(); + bool word_boundary = true; //check for word boundary + char actualchar; + while (actual_cursorpos < end_of_text) { + actualchar = text[actual_cursorpos]; + //check if syntax matches "G" followed by a couple of numbers + if ((actualchar == 'G') && (word_boundary == true)) { + //this is a new G-Code, store startposition + startpos = actual_cursorpos; + word_boundary = false; + actual_cursorpos++; + if (actual_cursorpos < end_of_text) { + //refresh actual character + actualchar = text[actual_cursorpos]; + } + //add digits + while ((std::isdigit(actualchar) && (actual_cursorpos < end_of_text))) { + actual_cursorpos++; + actualchar = text[actual_cursorpos]; + } + //check if word boundary occurs at end of digits + if ((actualchar == ' ') || (actualchar == '\n') || (actualchar == '\r') || (actualchar == '\t') || (actual_cursorpos == end_of_text)) { + //success, append this one + if ((actual_cursorpos - startpos) > 1) { + //success, append to vector. DO NOT FORGET THE OFFSET HERE! We start from fromPos, so we need to add this + GcodeVector.push_back(std::make_pair(startpos + fromPos, actual_cursorpos + fromPos)); + } + word_boundary = true; + } + } + if ((actualchar == ' ') || (actualchar == '\n') || (actualchar == '\r') || (actualchar == '\t') || (actual_cursorpos == end_of_text)) { + word_boundary = true; + } + actual_cursorpos++; + } + //remove old styling + styled_text_ctrl_sql->StartStyling(fromPos, m_stylemask); //from here + styled_text_ctrl_sql->SetStyling(toPos - fromPos, 0); //with that length and style -> cleared + //now style the G-Codes + for (int i = 0; i < GcodeVector.size(); i++) { + size_t startpos = GcodeVector[i].first; + size_t endpos = GcodeVector[i].second; + size_t length = (endpos - startpos); + styled_text_ctrl_sql->StartStyling(startpos, m_stylemask); + styled_text_ctrl_sql->SetStyling(length, 19); //must match the style set above + } +} + +void ExecuteSqlFrame::setfoldlevels(size_t fromPos, int startfoldlevel, wxString& text) +{ + /*we'll increase the fold level with "IF" and decrease it with "ENDIF". + First, find all "IF" included in the text. Then we check if this IF is actually an ENDIF. + Keep in mind that you still need to check if this is actually commented out and so on. + This is a pretty simple and not perfect example to demonstrate basic folding*/ + std::vectorif_positions; + size_t actual_cursorpos = 0; + while ((actual_cursorpos < text.size()) && (actual_cursorpos != wxNOT_FOUND)) { + actual_cursorpos = text.find("IF", actual_cursorpos + 1); + if (actual_cursorpos != wxNOT_FOUND) { + if_positions.push_back(actual_cursorpos + fromPos); + } + } + //build a vector to include line and folding level + //also, check if this IF is actually an ENDIF + std::vector>foldingvector; + int actualfoldlevel = startfoldlevel; + for (int i = 0; i < if_positions.size(); i++) { + size_t this_line = styled_text_ctrl_sql->LineFromPosition(if_positions[i]); + //check if that "IF" is an ENDIF + wxString endif_string; + if (if_positions[i] > 3) { + endif_string = text.substr(if_positions[i] - 3 - fromPos, 5); + } + //if it's an IF the fold level increases, if it's an ENDIF the foldlevel decreases + if (endif_string == "ENDIF") { + actualfoldlevel--; + foldingvector.push_back(std::make_pair(this_line, actualfoldlevel)); + } + else { + actualfoldlevel++; + foldingvector.push_back(std::make_pair(this_line, actualfoldlevel)); + } + } + //now that we know which lines shall influence folding, we can apply to folding level to the STC line for line + int foldlevel = startfoldlevel; //this is a temporary marker containing the foldlevel of that position + size_t vectorcount = 0; + //get positions from line from start and end + size_t startline = styled_text_ctrl_sql->LineFromPosition(fromPos); + size_t endline = styled_text_ctrl_sql->LineFromPosition(fromPos + text.size()); + //set folding for these lines + for (size_t i = startline; i <= endline; i++) { + int prevlevel = foldlevel; //previous foldlevel + int foldflag = foldlevel; //this flag will be applied to the line + if ((foldingvector.size() > 0) && (vectorcount < foldingvector.size())) { + if (i == foldingvector[vectorcount].first) { //if the fold level changes in that line + //new foldlevel = foldlevel in that line + foldlevel = foldingvector[vectorcount].second; + vectorcount++; + if (foldlevel > prevlevel) { + //when incremented, this line keeps the previous fold level (!) but is marked as a folder level header + foldflag = foldflag | wxSTC_FOLDLEVELHEADERFLAG; //incremented, set header flag + } + } + } + foldflag = foldflag | wxSTC_FOLDLEVELBASE; //add 1024 to the fold level + if (styled_text_ctrl_sql->GetLineLength(i) == 0) { //if this does not contain any characters, set the white flag + foldflag = foldflag | wxSTC_FOLDLEVELWHITEFLAG; + } + //finally, set fold level to line + styled_text_ctrl_sql->SetFoldLevel(i, foldflag); + } +} + +void ExecuteSqlFrame::fold(size_t line, bool mode) +{ + + auto endStyled = styled_text_ctrl_sql->GetEndStyled(); + auto len = styled_text_ctrl_sql->GetTextLength(); + + if (endStyled < len) + styled_text_ctrl_sql->Colourise(0, -1); + + int headerLine; + auto level = styled_text_ctrl_sql->GetFoldLevel(line); + + if (level & wxSTC_FOLDLEVELHEADERFLAG) + headerLine = static_cast(line); + else + { + headerLine = styled_text_ctrl_sql->GetFoldParent(line); + if (headerLine == -1) + return; + } + + if (styled_text_ctrl_sql->GetFoldExpanded(headerLine) != mode) + { + styled_text_ctrl_sql->ToggleFold(headerLine); + /*SCNotification scnN; + scnN.nmhdr.code = SCN_FOLDINGSTATECHANGED; + scnN.nmhdr.hwndFrom = _hSelf; + scnN.nmhdr.idFrom = 0; + scnN.line = headerLine; + scnN.foldLevelNow = isFolded(headerLine) ? 1 : 0; //folded:1, unfolded:0 + + ::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast(&scnN));*/ + } + +} + +void ExecuteSqlFrame::foldAll(bool mode) +{ + auto maxLine = styled_text_ctrl_sql->GetLineCount(); + + for (int line = 0; line < maxLine; ++line) + { + auto level = styled_text_ctrl_sql->GetFoldLevel(line); + if (level & wxSTC_FOLDLEVELHEADERFLAG) + if (styled_text_ctrl_sql->GetFoldExpanded(line) != mode) + fold(line, mode); + } + +} + void ExecuteSqlFrame::buildToolbar(CommandManager& cm) { //toolBarM = CreateToolBar( wxTB_FLAT|wxTB_HORIZONTAL|wxTB_TEXT, wxID_ANY ); diff --git a/src/gui/ExecuteSqlFrame.h b/src/gui/ExecuteSqlFrame.h index 947bd9a6..e318302e 100644 --- a/src/gui/ExecuteSqlFrame.h +++ b/src/gui/ExecuteSqlFrame.h @@ -83,6 +83,16 @@ class ExecuteSqlFrame: public BaseFrame, public Observer Database* getDatabase() const; private: + // fold + int m_stylemask = 255; + void onMarginClick(wxStyledTextEvent& event); + void onStyleNeeded(wxStyledTextEvent& event); + void highlightSTCsyntax(size_t fromPos, size_t toPos, wxString& text); + void setfoldlevels(size_t fromPos, int startfoldlevel, wxString& text); + void fold(size_t line, bool mode); + void foldAll(bool mode); + + virtual bool doCanClose(); virtual void doBeforeDestroy(); diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp index 433bb3c9..a77bdd1a 100644 --- a/src/gui/FRStyle.cpp +++ b/src/gui/FRStyle.cpp @@ -269,77 +269,103 @@ FRStyle* FRStyles::getStyleByName(wxString styleName) } -FRLexerStyler::FRLexerStyler() +FRStyler::FRStyler() :FRStyles() { } -FRLexerStyler& FRLexerStyler::operator=(const FRLexerStyler& ls) +FRStyler& FRStyler::operator=(const FRStyler& ls) { if (this != &ls) { *(static_cast(this)) = ls; - this->setLexerName(ls.getLexerName()); - this->setLexerDesc(ls.getLexerDesc()); - this->setLexerUserExt(ls.getLexerUserExt()); + this->setStylerName(ls.getStylerName()); + this->setStylerDesc(ls.getStylerDesc()); + this->setStylerUserExt(ls.getStylerUserExt()); } return *this; } -FRLexerStylers::FRLexerStylers() +FRStylers::FRStylers() { - lexerStylerVectorM.clear(); + stylerVectorM.clear(); } -FRLexerStylers& FRLexerStylers::operator=(const FRLexerStylers& lsa) +FRStylers& FRStylers::operator=(const FRStylers& lsa) { if (this != &lsa) { - this->lexerStylerVectorM = lsa.lexerStylerVectorM; + this->stylerVectorM = lsa.stylerVectorM; } return *this; } -FRLexerStyler* FRLexerStylers::getLexerStylerByName(wxString lexerName) +FRStyler* FRStylers::getStylerByName(wxString lexerName) { if (!lexerName) return NULL; - std::vector::iterator it; - it = std::find_if(lexerStylerVectorM.begin(), lexerStylerVectorM.end(), [lexerName](FRLexerStyler* style)->bool {return style->getLexerName() == lexerName; }); + std::vector::iterator it; + it = std::find_if(stylerVectorM.begin(), stylerVectorM.end(), [lexerName](FRStyler* style)->bool {return style->getStylerName() == lexerName; }); - if (it == lexerStylerVectorM.end()) + if (it == stylerVectorM.end()) return NULL; else - return (FRLexerStyler*)&*it; - + return (FRStyler*)*it; } -int FRLexerStylers::getLexerStylerIndexByName(wxString lexerName) +int FRStylers::getStylerIndexByName(wxString lexerName) { if (lexerName.IsEmpty()) return -1; - std::vector::iterator it; - it = std::find_if(lexerStylerVectorM.begin(), lexerStylerVectorM.end(), [lexerName](FRLexerStyler* style)->bool {return style->getLexerName() == lexerName; }); - if (it == lexerStylerVectorM.end()) + std::vector::iterator it; + it = std::find_if(stylerVectorM.begin(), stylerVectorM.end(), [lexerName](FRStyler* style)->bool {return style->getStylerName() == lexerName; }); + if (it == stylerVectorM.end()) + return -1; + else + return std::distance(stylerVectorM.begin(), it); +} + +FRStyler* FRStylers::getStylerByDesc(wxString lexerDesc) +{ + if (!lexerDesc) + return NULL; + + std::vector::iterator it; + it = std::find_if(stylerVectorM.begin(), stylerVectorM.end(), [lexerDesc](FRStyler* style)->bool {return style->getStylerDesc() == lexerDesc; }); + + if (it == stylerVectorM.end()) + return NULL; + else + return (FRStyler*)*it; +} + +int FRStylers::getStylerIndexByDesc(wxString lexerDesc) +{ + if (lexerDesc.IsEmpty()) + return -1; + + std::vector::iterator it; + it = std::find_if(stylerVectorM.begin(), stylerVectorM.end(), [lexerDesc](FRStyler* style)->bool {return style->getStylerDesc() == lexerDesc; }); + if (it == stylerVectorM.end()) return -1; else - return std::distance(lexerStylerVectorM.begin(), it); + return std::distance(stylerVectorM.begin(), it); } -void FRLexerStylers::addLexerStyler(wxString lexerName, wxString lexerDesc, wxString lexerUserExt, wxXmlNode* lexerNode) +void FRStylers::addStyler(wxString lexerName, wxString lexerDesc, wxString lexerUserExt, wxXmlNode* lexerNode) { - FRLexerStyler* ls = new FRLexerStyler(); - ls->setLexerName(lexerName); + FRStyler* ls = new FRStyler(); + ls->setStylerName(lexerName); if (!lexerDesc.IsEmpty()) - ls->setLexerDesc(lexerDesc); + ls->setStylerDesc(lexerDesc); if (!lexerUserExt.IsEmpty()) - ls->setLexerUserExt(lexerUserExt); + ls->setStylerUserExt(lexerUserExt); wxXmlNode* child = lexerNode->GetChildren(); while (child) { @@ -352,12 +378,12 @@ void FRLexerStylers::addLexerStyler(wxString lexerName, wxString lexerDesc, wxSt child = child->GetNext(); } - lexerStylerVectorM.push_back(ls); + stylerVectorM.push_back(ls); } -void FRLexerStylers::clear() +void FRStylers::clear() { - lexerStylerVectorM.clear(); + stylerVectorM.clear(); } FRStyleManager& stylerManager() @@ -372,14 +398,14 @@ FRStyleManager& stylerManager() void FRStyleManager::loadLexerStyles(wxXmlNode* node) { - lexerStylesM.clear(); + stylersM.clear(); wxXmlNode* child = node->GetChildren(); while (child) { if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "LexerType" && child->GetAttribute("name")=="sql") { - lexerStylesM.addLexerStyler(child->GetAttribute("name"), + stylersM.addStyler(child->GetAttribute("name"), child->GetAttribute("desc"), child->GetAttribute("ext"), child); } child = child->GetNext(); @@ -389,19 +415,18 @@ void FRStyleManager::loadLexerStyles(wxXmlNode* node) void FRStyleManager::loadGlobalStyles(wxXmlNode* node) { - globalStylesM.clear(); + globalStylerM->clear(); wxXmlNode* child = node->GetChildren(); while (child) { if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "WidgetStyle") { long styleID = -1; if (child->GetAttribute("styleID").ToLong(&styleID)) { - globalStylesM.addStyler(styleID, child); + globalStylerM->addStyler(styleID, child); } } child = child->GetNext(); }; - } void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) @@ -414,10 +439,10 @@ void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) text->StyleSetForeground(style->getStyleID(), style->getfgColour()); //} - double size = style->getFontSize() == 0 ? globalStyleM->getFontSize() : style->getFontSize(); + double size = style->getFontSize() == 0 ? getGlobalStyle()->getFontSize() : style->getFontSize(); wxFontInfo fontInfo(size); - wxString fontName = style->getFontName().IsEmpty() ? globalStyleM->getFontName() : style->getFontName(); + wxString fontName = style->getFontName().IsEmpty() ? getGlobalStyle()->getFontName() : style->getFontName(); fontInfo.FaceName(fontName); if (style->getFontStyle() != STYLE_NOT_USED) { @@ -439,34 +464,35 @@ void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) FRStyleManager::FRStyleManager(wxFileName style) { fileNameM = style; - + globalStylerM = new FRStyler(); + loadStyle(); } FRStyle* FRStyleManager::getStyleByName(wxString styleName) { - return globalStylesM.getStyleByName(styleName); + return globalStylerM->getStyleByName(styleName); } void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) { //text->StyleClearAll(); - for (int i = 0; i < globalStylesM.getNbStyler(); i++) { - FRStyle* style = globalStylesM.getStyle(i); - if (style->getStyleID() != 0) { + for (int i = 0; i < globalStylerM->getNbStyler(); i++) { + FRStyle* style = globalStylerM->getStyle(i); + //if (style->getStyleID() != 0) { assignWordStyle(text, style); - } + //} if (style->getStyleDesc() == "Global override") { - globalStyleM = style; + //globalStyleM = style; text->StyleResetDefault(); text->SetBackgroundColour(style->getbgColour()); text->SetForegroundColour(style->getfgColour()); assignWordStyle(text, style); } if (style->getStyleDesc() == "Default Style") { - defaultStyleM = style; + //defaultStyleM = style; } if (style->getStyleDesc() == "Mark colour") {} if (style->getStyleDesc() == "Selected text colour") { @@ -476,7 +502,9 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) if (style->getStyleDesc() == "Edge colour") { text->SetEdgeColour(style->getfgColour()); } - if (style->getStyleDesc() == "Bookmark margin" ) {} + if (style->getStyleDesc() == "Bookmark margin" ) { + //text->SetMarginBackground() + } if (style->getStyleDesc() == "Fold") {} if (style->getStyleDesc() == "Fold active") {} if (style->getStyleDesc() == "Fold margin") { @@ -503,9 +531,9 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) void FRStyleManager::assignLexer(wxStyledTextCtrl* text) { //FRLexerStyler* lexer= lexerStylesM.getLexerStylerByName("sql"); lexerStylesM. - if (lexerStylesM.getNbLexerStyler() > 0) { - int index = lexerStylesM.getLexerStylerIndexByName("sql"); - FRLexerStyler* lexer = lexerStylesM.getLexerFromIndex(index); + if (stylersM.getNbLexerStyler() > 0) { + int index = stylersM.getStylerIndexByName("sql"); + FRStyler* lexer = stylersM.getLexerFromIndex(index); if (lexer) { int max = lexer->getNbStyler(); for (int i = 0; i < max; i++) { @@ -513,12 +541,79 @@ void FRStyleManager::assignLexer(wxStyledTextCtrl* text) } } } - FRStyle* style = globalStylesM.getStyleByName("Line number margin"); + FRStyle* style = globalStylerM->getStyleByName("Line number margin"); if (style) { assignWordStyle(text, style); } } +void FRStyleManager::assignFold(wxStyledTextCtrl* text) +{ + FRStyle* styleFoldMargin = getGlobalStyler()->getStyleByName("Fold margin"); + FRStyle* styleFold = getGlobalStyler()->getStyleByName("Fold"); + FRStyle* styleFoldActive = getGlobalStyler()->getStyleByName("Fold active"); + + text->SetProperty(wxT("fold"), wxT("1")); + text->SetProperty(wxT("fold.comment"), wxT("1")); + text->SetFoldFlags(wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED | wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED); + text->SetAutomaticFold(wxSTC_AUTOMATICFOLD_SHOW | wxSTC_AUTOMATICFOLD_CLICK | wxSTC_AUTOMATICFOLD_CHANGE); + + text->SetMarginWidth(FR_FOLDMARGIN, 14); + text->SetMarginMask(FR_FOLDMARGIN, wxSTC_MASK_FOLDERS); + text->SetFoldMarginColour(true, styleFoldMargin->getbgColour()); + text->SetFoldMarginHiColour(true, styleFoldMargin->getfgColour()); + + + text->MarkerDefine(wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_BOXPLUSCONNECTED); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEREND, styleFold->getfgColour()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEREND, styleFold->getbgColour()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEREND, styleFoldActive->getfgColour()); + + text->MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUSCONNECTED); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEROPENMID, styleFold->getfgColour()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEROPENMID, styleFold->getbgColour()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEROPENMID, styleFoldActive->getfgColour()); + + text->MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNER); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFold->getfgColour()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFold->getbgColour()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFoldActive->getfgColour()); + + text->MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_LCORNER); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERTAIL, styleFold->getfgColour()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERTAIL, styleFold->getbgColour()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERTAIL, styleFoldActive->getfgColour()); + + text->MarkerDefine(wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_VLINE); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERSUB, styleFold->getfgColour()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERSUB, styleFold->getbgColour()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERSUB, styleFoldActive->getfgColour()); + + text->MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDER, styleFold->getfgColour()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDER, styleFold->getbgColour()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDER, styleFoldActive->getfgColour()); + + text->MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEROPEN, styleFold->getfgColour()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEROPEN, styleFold->getbgColour()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEROPEN, styleFoldActive->getfgColour()); + + //Turn the fold markers red when the caret is a line in the group (optional) + text->MarkerEnableHighlight(true); + + //The margin will only respond to clicks if it set sensitive. Also, connect + //the event handler that will do the collapsing/restoring + text->SetMarginSensitive(FR_FOLDMARGIN, true); + //m_activeSTC->Bind(wxEVT_STC_MARGINCLICK, &myFrame::onMarginClick, this); + //m_activeSTC->Bind(wxEVT_STC_STYLENEEDED, &myFrame::OnStyleNeeded, this); + + //set color for G-Code highlighting + //text->StyleSetForeground(19, m_GCodecolor); + + +} + void FRStyleManager::loadConfig() { const wxString STYLE = "StyleTheme"; @@ -532,9 +627,11 @@ void FRStyleManager::loadConfig() void FRStyleManager::loadStyle() { + wxXmlDocument xmlDoc; xmlDoc.Load(fileNameM.GetFullPath()); if (xmlDoc.IsOk()) { + wxXmlNode* xmlNode = xmlDoc.GetRoot(); if (xmlNode->GetType() == wxXML_ELEMENT_NODE && xmlNode->GetName() == "Flamerobin") { diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h index 09d5e83d..acb720b2 100644 --- a/src/gui/FRStyle.h +++ b/src/gui/FRStyle.h @@ -58,6 +58,7 @@ const int MAX_LEXER_STYLE = 100; const int MARGE_LINENUMBER = 0; const int MARGE_SYMBOLE = 1; +#define FR_FOLDMARGIN 2 class FRStyle { @@ -144,6 +145,7 @@ class FRStyles FRStyle* getStyle(size_t index); FRStyle* getStyleByName(wxString styleName); + std::vector getStyles() { return styleVectorM; } bool hasEnoughSpace() { return (getNbStyler() < wxSTC_STYLE_MAX); }; void addStyler(int styleID, wxXmlNode* styleNode); @@ -157,55 +159,60 @@ class FRStyles }; -class FRLexerStyler : public FRStyles +class FRStyler : public FRStyles { private: - wxString lexerNameM; - wxString lexerDescM; - wxString lexerUserExtM; + wxString stylerNameM; + wxString stylerDescM; + wxString stylerUserExtM; public: - FRLexerStyler(); - FRLexerStyler& operator=(const FRLexerStyler& ls); + FRStyler(); + FRStyler& operator=(const FRStyler& ls); - wxString getLexerName() const { return lexerNameM; }; - void setLexerName(wxString lexerName) { lexerNameM = lexerName; }; + wxString getStylerName() const { return stylerNameM; }; + void setStylerName(wxString lexerName) { stylerNameM = lexerName; }; - void setLexerDesc(wxString lexerDesc) { lexerDescM = lexerDesc; }; - wxString getLexerDesc() const { return lexerDescM; }; + void setStylerDesc(wxString lexerDesc) { stylerDescM = lexerDesc; }; + wxString getStylerDesc() const { return stylerDescM; }; - void setLexerUserExt(wxString lexerUserExt) { lexerUserExtM = lexerUserExt; }; - wxString getLexerUserExt() const { return lexerUserExtM; }; + void setStylerUserExt(wxString lexerUserExt) { stylerUserExtM = lexerUserExt; }; + wxString getStylerUserExt() const { return stylerUserExtM; }; }; -class FRLexerStylers +class FRStylers { private: - std::vector lexerStylerVectorM; + std::vector stylerVectorM; protected: public: - FRLexerStylers(); + FRStylers(); - FRLexerStylers& operator=(const FRLexerStylers& lsa); + FRStylers& operator=(const FRStylers& lsa); - int getNbLexerStyler() const { return lexerStylerVectorM.size(); }; + int getNbLexerStyler() const { return stylerVectorM.size(); }; //void setNbLexerStyler(int nbLexer) { nbLexerStylerM = nbLexer; }; bool hasEnoughSpace() { return (getNbLexerStyler() < MAX_LEXER_STYLE); }; - FRLexerStyler* getLexerFromIndex(int index) { return lexerStylerVectorM[index]; }; + FRStyler* getLexerFromIndex(int index) { return stylerVectorM[index]; }; + std::vector getStylers() { return stylerVectorM; }; - wxString getLexerNameFromIndex(int index) const { return lexerStylerVectorM[index]->getLexerName(); }; - wxString getLexerDescFromIndex(int index) const { return lexerStylerVectorM[index]->getLexerDesc(); }; + wxString getStylerNameFromIndex(int index) const { return stylerVectorM[index]->getStylerName(); }; + wxString getStylerDescFromIndex(int index) const { return stylerVectorM[index]->getStylerDesc(); }; - FRLexerStyler* getLexerStylerByName(wxString lexerName); - int getLexerStylerIndexByName(wxString lexerName); + FRStyler* getStylerByName(wxString lexerName); + int getStylerIndexByName(wxString lexerName); - void addLexerStyler(wxString lexerName, wxString lexerDesc, wxString lexerUserExt, wxXmlNode* lexerNode); + FRStyler* getStylerByDesc(wxString lexerDesc); + int getStylerIndexByDesc(wxString lexerDesc); + + + void addStyler(wxString lexerName, wxString lexerDesc, wxString lexerUserExt, wxXmlNode* lexerNode); void clear(); }; @@ -213,10 +220,9 @@ class FRLexerStylers class FRStyleManager { private: wxFileName fileNameM; - FRStyles globalStylesM; - FRLexerStylers lexerStylesM; - FRStyle* globalStyleM; - FRStyle* defaultStyleM; + FRStyler* globalStylerM; + FRStylers stylersM; + wxColor m_GCodecolor{ 255,130,0 }; protected: void loadLexerStyles(wxXmlNode* node); void loadGlobalStyles(wxXmlNode* node); @@ -225,20 +231,26 @@ class FRStyleManager { public: FRStyleManager(wxFileName style); - FRStyles getGlobalStyles() { return globalStylesM; }; + FRStyler* getGlobalStyler() { return globalStylerM; }; + FRStylers getLexerStylers() { return stylersM; }; + FRStyler* getStylerByName(wxString stylerName) { return stylerName == "Global Styles" ? getGlobalStyler() : getLexerStylers().getStylerByName(stylerName); }; + FRStyler* getStylerByDesc(wxString stylerDesc) { return stylerDesc == "Global Styles" ? getGlobalStyler() : getLexerStylers().getStylerByDesc(stylerDesc); }; - FRStyle* getGlobalStyle() { return globalStyleM; }; - FRStyle* getDefaultStyle() { return defaultStyleM; }; + FRStyle* getGlobalStyle() { return globalStylerM->getStyleByName("Global override"); }; + FRStyle* getDefaultStyle() { return globalStylerM->getStyleByName("Default Style"); }; FRStyle* getStyleByName(wxString styleName); wxFileName getfileName() { return fileNameM; }; void setfileName(wxFileName fileName) { fileNameM = fileName; }; + void assignGlobal(wxStyledTextCtrl* text); void assignLexer(wxStyledTextCtrl* text); + void assignFold(wxStyledTextCtrl* text); + void loadConfig(); void loadStyle(); void saveStyle(); diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index 70b7c8b9..0eb05164 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -310,11 +311,16 @@ bool PrefDlgCheckboxSetting::createControl(bool WXUNUSED(ignoreerrors)) checkBoxM->SetToolTip(descriptionM); checkBoxHandlerM.reset(new PrefDlgEventHandler( - std::bind(&PrefDlgCheckboxSetting::OnCheckBox, this, std::placeholders::_1))); + std::bind(&PrefDlgCheckboxSetting::OnCheckBox, this, std::placeholders::_1) + ) + ); + checkBoxM->PushEventHandler(checkBoxHandlerM.get()); + checkBoxHandlerM->Connect(checkBoxM->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + return true; } @@ -1735,40 +1741,131 @@ class PrefDlgThemeSetting : public PrefDlgSetting virtual bool hasControls() const; //virtual void setDefault(const wxString& defValue);*/ virtual wxArrayString getComboBoxItems(); + void loadStylers(const wxString& styleFileName); + void loadStyles(const wxString& language); + void loadStyle(const wxString& styleName); private: + FRStyleManager* styleManagerM; + wxStaticText* captionBeforeM; - wxComboBox* comboBoxM; - wxListBox* languageListBoxM; + + wxComboBox* fileComboBoxM; + std::unique_ptr fileComboBoxHandlerM; + void OnSelectFileComboBox(wxCommandEvent& event); + + wxListBox* stylersListBoxM; + std::unique_ptr stylersListBoxHandlerM; + void OnSelectStylersListBox(wxCommandEvent& event); + wxListBox* styleListBoxM; + std::unique_ptr styleListBoxHandlerM; + void OnSelectStyleListBox(wxCommandEvent& event); + + //wxStaticText* lenguageStyleM; + + wxColourPickerCtrl* foregroundPickerM; + wxColourPickerCtrl* backgroundPickerM; + + wxComboBox* fontNameComboBoxM; + wxComboBox* fontSizeComboBoxM; + + wxCheckBox* blodCheckBoxM; + wxCheckBox* italicCheckBoxM; + wxCheckBox* underlineCheckBoxM; + }; PrefDlgThemeSetting::PrefDlgThemeSetting(wxPanel* page, PrefDlgSetting* parent) - : PrefDlgSetting(page, parent), comboBoxM(0), captionBeforeM(0), - languageListBoxM(0), styleListBoxM(0) + : PrefDlgSetting(page, parent), styleManagerM(0), fileComboBoxM(0), captionBeforeM(0), + stylersListBoxM(0), styleListBoxM(0), fontNameComboBoxM(0), fontSizeComboBoxM(0) { + const wxString STYLE = "StyleTheme"; + const wxString def = "stylers"; + + + styleManagerM = new FRStyleManager(wxFileName(config().getXmlStylesPath(), config().get(STYLE, def) + ".xml")); } PrefDlgThemeSetting::~PrefDlgThemeSetting() { + if (fileComboBoxM && fileComboBoxHandlerM.get()) + fileComboBoxM->PopEventHandler(); + + if (stylersListBoxM && stylersListBoxHandlerM.get()) + stylersListBoxM->PopEventHandler(); + + if (styleListBoxM && styleListBoxHandlerM.get()) + styleListBoxM->PopEventHandler(); } bool PrefDlgThemeSetting::createControl(bool WXUNUSED(ignoreerrors)) { captionBeforeM = new wxStaticText(getPage(), wxID_ANY, "Select theme:"); - comboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, + fileComboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, getComboBoxItems()); - languageListBoxM = new wxListBox(getPage(), wxID_ANY, wxDefaultPosition, wxDefaultSize); - languageListBoxM->Insert("SQL", 0); + fileComboBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnSelectFileComboBox, this, std::placeholders::_1))); + fileComboBoxM->PushEventHandler(fileComboBoxHandlerM.get()); + fileComboBoxHandlerM->Connect(fileComboBoxM->GetId(), + wxEVT_COMMAND_COMBOBOX_SELECTED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + + + stylersListBoxM = new wxListBox(getPage(), wxID_ANY, wxDefaultPosition, wxDefaultSize); + stylersListBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnSelectStylersListBox, this, std::placeholders::_1))); + stylersListBoxM->PushEventHandler(stylersListBoxHandlerM.get()); + stylersListBoxHandlerM->Connect(stylersListBoxM->GetId(), + wxEVT_COMMAND_LISTBOX_SELECTED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); styleListBoxM = new wxListBox(getPage(), wxID_ANY, wxDefaultPosition, wxDefaultSize); - styleListBoxM->Insert("Global", 0); + styleListBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnSelectStyleListBox, this, std::placeholders::_1))); + styleListBoxM->PushEventHandler(styleListBoxHandlerM.get()); + styleListBoxHandlerM->Connect(styleListBoxM->GetId(), + wxEVT_COMMAND_LISTBOX_SELECTED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + + + + foregroundPickerM = new wxColourPickerCtrl(getPage(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxDefaultSize); + backgroundPickerM = new wxColourPickerCtrl(getPage(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxDefaultSize); + wxArrayString strArray = wxFontEnumerator::GetFacenames(); + strArray.Sort(); + fontNameComboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, strArray); + + strArray.Clear(); + for (int i = 5; i <= 30; i++) { + if (i <= 12 || i % 2 == 0) { + strArray.Add(wxString::Format("%i", i)); + } + } + fontSizeComboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, strArray); + + blodCheckBoxM = new wxCheckBox(getPage(), wxID_ANY, "Bold", wxDefaultPosition, wxDefaultSize); + italicCheckBoxM = new wxCheckBox(getPage(), wxID_ANY, "Italic", wxDefaultPosition, wxDefaultSize); + underlineCheckBoxM = new wxCheckBox(getPage(), wxID_ANY, "Underline", wxDefaultPosition, wxDefaultSize); + + return true; } bool PrefDlgThemeSetting::loadFromTargetConfig(Config& config) { + if (!checkTargetConfigProperties()) + return false; + + if (fileComboBoxM) + { + wxString value = defaultM; + config.getValue(keyM, value); + fileComboBoxM->SetValue(value); + + loadStylers(fileComboBoxM->GetValue()); + } + + enableControls(true); + return true; } @@ -1790,6 +1887,8 @@ bool PrefDlgThemeSetting::parseProperty(wxXmlNode* xmln) itemsM.Add(name); } } + + }*/ return PrefDlgSetting::parseProperty(xmln); @@ -1802,6 +1901,7 @@ bool PrefDlgThemeSetting::saveToTargetConfig(Config& config) void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) { + //if (checkListBoxM) { static_cast(sizer)->SetOrientation(wxVERTICAL); @@ -1813,72 +1913,91 @@ void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) topSizer->Add(styleguide().getControlLabelMargin(), 0); } - wxSizer* sizerVert = new wxBoxSizer(wxVERTICAL); - sizerVert->Add(comboBoxM, 1, wxEXPAND); + sizerVert->Add(fileComboBoxM, 1, wxEXPAND); topSizer->Add(sizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); + + wxSizer* buttomSizer = new wxBoxSizer(wxVERTICAL); + sizer->Add(buttomSizer, 1, wxEXPAND); + wxSizer* languageStyleSizer = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, ""), wxHORIZONTAL);//new wxBoxSizer(wxHORIZONTAL); + buttomSizer->Add(languageStyleSizer, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP, 10); - wxSizer* buttomSizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(buttomSizer, 1, wxEXPAND ); + wxStaticBoxSizer* languageStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Language:"), wxVERTICAL); + languageStyleSizer->Add(languageStaticBox, 1, wxLEFT, 10); + languageStaticBox->Add(stylersListBoxM, 1, wxEXPAND | wxCENTER, 10); + wxStaticBoxSizer* styleStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Style:"), wxVERTICAL); + languageStyleSizer->Add(styleStaticBox, 1, wxLEFT, 10); + styleStaticBox->Add(styleListBoxM, 1, wxEXPAND | wxCENTER, 10); + + + wxSizer* fontSizer = new wxBoxSizer(wxHORIZONTAL); + buttomSizer->Add(fontSizer, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP, 10); - wxSizer* rightSizer = new wxBoxSizer(wxHORIZONTAL); - buttomSizer->Add(rightSizer, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); - wxPanel* rightPanel = new wxPanel(getPage(), wxID_ANY, wxDefaultPosition, wxSize(100,200)); - //rightPanel->SetBackgroundColour(wxColor(200, 100, 200)); - buttomSizer->Add(rightPanel, 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, 10); - wxBoxSizer* rightBoxSizer = new wxBoxSizer(wxVERTICAL); /*vbox*/ - wxStaticBox* rightStaticBox = new wxStaticBox(rightPanel, -1, ""); /*nm*/ - wxStaticBoxSizer* rightStaticBoxSizer = new wxStaticBoxSizer(rightStaticBox, wxHORIZONTAL);/*mnSizer*/ - wxBoxSizer* languageBoxSizer = new wxBoxSizer(wxVERTICAL); /*mnBox*/ - languageBoxSizer->Add(new wxStaticText(rightPanel, -1, "Language:"), 0, wxALL | wxCENTER, 1); - languageBoxSizer->Add(new wxListBox(rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize), 0, wxALL | wxCENTER, 1); + wxStaticBoxSizer* colourStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Colour Style"), wxVERTICAL); + fontSizer->Add(colourStaticBox, 1, wxLEFT, 10); - //wxSizer* sizerlanguageListBox = new wxBoxSizer(wxVERTICAL); - //languageListBoxM->SetParent(rightPanel); - languageBoxSizer->Add(languageListBoxM, 1, wxALL | wxCENTER, 1); - //languageBoxSizer->Add(sizerlanguageListBox, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT, 5); - rightStaticBoxSizer->Add(languageBoxSizer, 0, wxALL | wxCENTER, 10); + wxSizer* foregroundsizerHor = new wxBoxSizer(wxHORIZONTAL); + foregroundsizerHor->Add(new wxStaticText(getPage(), -1, "Foreground Colour"), 0, wxFIXED_MINSIZE | wxALIGN_TOP); + foregroundsizerHor->Add(styleguide().getControlLabelMargin(), 0); + wxSizer* foregroundsizerVert = new wxBoxSizer(wxVERTICAL); + foregroundsizerVert->Add(foregroundPickerM, 0, wxFIXED_MINSIZE, styleguide().getRelatedControlMargin(wxHORIZONTAL)); + foregroundsizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + foregroundsizerHor->Add(foregroundsizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); + + colourStaticBox->Add(foregroundsizerHor, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); - wxBoxSizer* styleBoxSizer = new wxBoxSizer(wxVERTICAL); /*mnBox*/ - styleBoxSizer->Add(new wxStaticText(rightPanel, -1, "Style:"), 0, wxALL | wxCENTER, 1); - styleBoxSizer->Add(styleListBoxM, 1, wxALL | wxCENTER, 1); - rightStaticBoxSizer->Add(styleBoxSizer, 0, wxALL | wxCENTER, 10); + wxSizer* backgroundsizerHor = new wxBoxSizer(wxHORIZONTAL); + backgroundsizerHor->Add(new wxStaticText(getPage(), -1, "Background Colour"), 0, wxFIXED_MINSIZE | wxALIGN_TOP); + backgroundsizerHor->Add(styleguide().getControlLabelMargin(), 0); - rightBoxSizer->Add(rightStaticBoxSizer, 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT | wxBOTTOM, 5); - rightPanel->SetSizer(rightBoxSizer); + wxSizer* backgroundsizerVert = new wxBoxSizer(wxVERTICAL); + backgroundsizerVert->Add(backgroundPickerM, 0, wxFIXED_MINSIZE, styleguide().getRelatedControlMargin(wxHORIZONTAL)); + backgroundsizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + backgroundsizerHor->Add(backgroundsizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); - //wxStaticBoxSizer* rigthStaticSizer = new wxStaticBoxSizer(rigthStaticBox, wxVERTICAL); - //rigthStaticSizer->SetDimension(1, 1, 198, 198); - //rigthStaticSizer->Add(0, styleguide().getUnrelatedControlMargin(wxVERTICAL)); - //rigthStaticSizer->Add(new wxStaticText(rigthStaticSizer->GetStaticBox(), wxID_ANY, "Language:"), 0, wxCENTER, 10); + colourStaticBox->Add(backgroundsizerHor, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); - //wxBoxSizer* languageSizer = new wxBoxSizer(wxVERTICAL); - //rigthStaticSizer->Add(languageSizer, 1); - //languageSizer->Add(new wxStaticText(rigthStaticSizer->GetStaticBox(), wxID_ANY, "Language:"), 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, 10); - + wxStaticBoxSizer* fontStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Font Style"), wxVERTICAL); + fontSizer->Add(fontStaticBox, 1, wxLEFT, 10); + wxSizer* fontNameSizerHor = new wxBoxSizer(wxHORIZONTAL); + fontStaticBox->Add(fontNameSizerHor, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); + fontNameSizerHor->Add(new wxStaticText(getPage(), -1, "Font Name:"), 0, wxFIXED_MINSIZE | wxALIGN_TOP); + fontNameSizerHor->Add(styleguide().getControlLabelMargin(), 0); + wxSizer* fontNameSizerVert = new wxBoxSizer(wxVERTICAL); + fontNameSizerHor->Add(fontNameSizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); + fontNameSizerVert->Add(fontNameComboBoxM, 0, wxEXPAND, styleguide().getRelatedControlMargin(wxHORIZONTAL)); + fontNameSizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); - wxSizer* leftSizer = new wxBoxSizer(wxHORIZONTAL); - buttomSizer->Add(leftSizer, 1, wxEXPAND ); - - - wxPanel* panel_top = new wxPanel(getPage(), wxID_ANY, wxDefaultPosition, wxDefaultSize); - panel_top->SetBackgroundColour(wxColor(100, 100, 200)); - leftSizer->Add(panel_top, 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, 10); - + wxSizer* fontSizeSizerHor = new wxBoxSizer(wxHORIZONTAL); + fontStaticBox->Add(fontSizeSizerHor, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); + + fontSizeSizerHor->Add(new wxStaticText(getPage(), -1, "Font Size:"), 0, wxFIXED_MINSIZE | wxALIGN_TOP); + fontSizeSizerHor->Add(styleguide().getControlLabelMargin(), 0); + + wxSizer* fontSizeSizerVert = new wxBoxSizer(wxVERTICAL); + fontSizeSizerHor->Add(fontSizeSizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); + + fontSizeSizerVert->Add(fontSizeComboBoxM, 0, wxEXPAND, styleguide().getRelatedControlMargin(wxHORIZONTAL)); + fontSizeSizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + + fontStaticBox->Add(blodCheckBoxM, 0, wxFIXED_MINSIZE, 10); + fontStaticBox->Add(italicCheckBoxM, 0, wxFIXED_MINSIZE, 10); + fontStaticBox->Add(underlineCheckBoxM, 0, wxFIXED_MINSIZE, 10); } + } void PrefDlgThemeSetting::enableControls(bool enabled) @@ -1892,7 +2011,97 @@ bool PrefDlgThemeSetting::hasControls() const wxArrayString PrefDlgThemeSetting::getComboBoxItems() { - return wxArrayString(); + wxArrayString lItems = wxArrayString(); + + wxString dirName = config().getXmlStylesPath(); + wxString fileSpec = _T("*.xml"); + wxArrayString files; + lItems.clear(); + + if (wxDir::GetAllFiles(dirName, &files, fileSpec, wxDIR_FILES) > 0) { + wxString name, ext; + wxString allFileNames; + for (size_t i = 0; i < files.GetCount(); i++) { + wxFileName::SplitPath(files[i], NULL, &name, &ext); + lItems.Add(name); + } + } + + return lItems; +} + +void PrefDlgThemeSetting::loadStylers(const wxString& styleFileName) +{ + styleManagerM->setfileName(wxFileName(config().getXmlStylesPath(), styleFileName + ".xml")); + styleManagerM->loadStyle(); + + stylersListBoxM->Clear(); + stylersListBoxM->Insert("Global Styles", 0); + + FRStylers stylers = styleManagerM->getLexerStylers(); + + //if (stylers) + { + int i = 0; + for (FRStyler* styler : stylers.getStylers()) { + stylersListBoxM->Insert(styler->getStylerDesc(), ++i); + } + } + + stylersListBoxM->Select(0); + //loadStyles(stylersListBoxM->GetString(stylersListBoxM->GetSelection())); + +} + +void PrefDlgThemeSetting::loadStyles(const wxString& language) +{ + FRStyler* styler; + styleListBoxM->Clear(); + + if (language == "Global Styles") { + styler = styleManagerM->getGlobalStyler(); + }else{ + styler = styleManagerM->getLexerStylers().getStylerByDesc(language); + } + + if (styler) { + int i = 0; + for (FRStyle* style : styler->getStyles()) { + styleListBoxM->Insert(style->getStyleDesc(), i++); + } + } + +} + +void PrefDlgThemeSetting::loadStyle(const wxString& styleName) +{ + FRStyle* style = styleManagerM->getStylerByDesc(stylersListBoxM->GetString(stylersListBoxM->GetSelection()))->getStyleByName(styleName); + fontNameComboBoxM->SetSelection(fontNameComboBoxM->FindString(style->getFontName())); + + fontSizeComboBoxM->SetSelection(fontSizeComboBoxM->FindString(wxString::Format("%i", style->getFontSize()))); + + foregroundPickerM->SetColour(style->getfgColour()); + backgroundPickerM->SetColour(style->getbgColour()); + + blodCheckBoxM->SetValue(style->getFontStyle() & FONTSTYLE_BOLD); + italicCheckBoxM->SetValue(style->getFontStyle() & FONTSTYLE_ITALIC); + underlineCheckBoxM->SetValue(style->getFontStyle() & FONTSTYLE_UNDERLINE); + +} + +void PrefDlgThemeSetting::OnSelectFileComboBox(wxCommandEvent& event) +{ + loadStylers(fileComboBoxM->GetValue()); +} + +void PrefDlgThemeSetting::OnSelectStylersListBox(wxCommandEvent& event) +{ + loadStyles(stylersListBoxM->GetString(stylersListBoxM->GetSelection())); +} + +void PrefDlgThemeSetting::OnSelectStyleListBox(wxCommandEvent& event) +{ + loadStyle(styleListBoxM->GetString(styleListBoxM->GetSelection())); } diff --git a/xml-styles/stylers.xml b/xml-styles/stylers.xml index 59de3cf1..e86326de 100644 --- a/xml-styles/stylers.xml +++ b/xml-styles/stylers.xml @@ -1,6 +1,15 @@ + + + + + + + + + From 8aaf2de984870e63d6272b2a9c815f0fcea8f2cc Mon Sep 17 00:00:00 2001 From: jdochoa Date: Thu, 3 Mar 2022 16:30:24 -0600 Subject: [PATCH 19/25] correct fold --- src/gui/ExecuteSqlFrame.cpp | 225 -------------------------- src/gui/ExecuteSqlFrame.h | 9 -- src/gui/FRStyle.cpp | 1 + src/gui/PreferencesDialogSettings.cpp | 13 +- 4 files changed, 8 insertions(+), 240 deletions(-) diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp index 23c14820..2b4a8365 100644 --- a/src/gui/ExecuteSqlFrame.cpp +++ b/src/gui/ExecuteSqlFrame.cpp @@ -594,231 +594,6 @@ Database* ExecuteSqlFrame::getDatabase() const return databaseM; } -void ExecuteSqlFrame::onMarginClick(wxStyledTextEvent& event) -{ - int margin = event.GetMargin(); - int position = event.GetPosition(); - int line = styled_text_ctrl_sql->LineFromPosition(position); - int foldLevel = styled_text_ctrl_sql->GetFoldLevel(line); - bool headerFlag = (foldLevel & wxSTC_FOLDLEVELHEADERFLAG) != 0; - - if (margin == FR_FOLDMARGIN && headerFlag) { - styled_text_ctrl_sql->ToggleFold(line); - } -} - -void ExecuteSqlFrame::onStyleNeeded(wxStyledTextEvent& event) -{ - /*this is called every time the styler detects a line that needs style, so we style that range. - This will save a lot of performance since we only style text when needed instead of parsing the whole file every time.*/ - size_t line_end = styled_text_ctrl_sql->LineFromPosition(styled_text_ctrl_sql->GetCurrentPos()); - size_t line_start = styled_text_ctrl_sql->LineFromPosition(styled_text_ctrl_sql->GetEndStyled()); - /*fold level: May need to include the two lines in front because of the fold level these lines have- the line above - may be affected*/ - if (line_start > 1) { - line_start -= 2; - } - else { - line_start = 0; - } - //if it is so small that all lines are visible, style the whole document - if (styled_text_ctrl_sql->GetLineCount() == styled_text_ctrl_sql->LinesOnScreen()) { - line_start = 0; - line_end = styled_text_ctrl_sql->GetLineCount() - 1; - } - if (line_end < line_start) { - //that happens when you select parts that are in front of the styled area - size_t temp = line_end; - line_end = line_start; - line_start = temp; - } - //style the line following the style area too (if present) in case fold level decreases in that one - if (line_end < styled_text_ctrl_sql->GetLineCount() - 1) { - line_end++; - } - //get exact start positions - size_t startpos = styled_text_ctrl_sql->PositionFromLine(line_start); - size_t endpos = (styled_text_ctrl_sql->GetLineEndPosition(line_end)); - int startfoldlevel = styled_text_ctrl_sql->GetFoldLevel(line_start); - startfoldlevel &= wxSTC_FOLDFLAG_LEVELNUMBERS; //mask out the flags and only use the fold level - wxString text = styled_text_ctrl_sql->GetTextRange(startpos, endpos).Upper(); - this->highlightSTCsyntax(startpos, endpos, text); - //calculate and apply foldings - this->setfoldlevels(startpos, startfoldlevel, text); -} - -void ExecuteSqlFrame::highlightSTCsyntax(size_t fromPos, size_t toPos, wxString& text) -{ - //this vector will hold the start and end position of each word to highlight - //if you want to highlight more than one, you should pass a whole class or struct containing the offsets - std::vector>GcodeVector; - //the following example is a quick and dirty parser for G-Codes. - //it just iterates through the Text Range and finds "Gxx" where xx is a digit. - //you could also use regex, but one can build a pretty fast routine based on single char evaluation - size_t actual_cursorpos = 0; - size_t startpos = 0; - size_t end_of_text = text.length(); - bool word_boundary = true; //check for word boundary - char actualchar; - while (actual_cursorpos < end_of_text) { - actualchar = text[actual_cursorpos]; - //check if syntax matches "G" followed by a couple of numbers - if ((actualchar == 'G') && (word_boundary == true)) { - //this is a new G-Code, store startposition - startpos = actual_cursorpos; - word_boundary = false; - actual_cursorpos++; - if (actual_cursorpos < end_of_text) { - //refresh actual character - actualchar = text[actual_cursorpos]; - } - //add digits - while ((std::isdigit(actualchar) && (actual_cursorpos < end_of_text))) { - actual_cursorpos++; - actualchar = text[actual_cursorpos]; - } - //check if word boundary occurs at end of digits - if ((actualchar == ' ') || (actualchar == '\n') || (actualchar == '\r') || (actualchar == '\t') || (actual_cursorpos == end_of_text)) { - //success, append this one - if ((actual_cursorpos - startpos) > 1) { - //success, append to vector. DO NOT FORGET THE OFFSET HERE! We start from fromPos, so we need to add this - GcodeVector.push_back(std::make_pair(startpos + fromPos, actual_cursorpos + fromPos)); - } - word_boundary = true; - } - } - if ((actualchar == ' ') || (actualchar == '\n') || (actualchar == '\r') || (actualchar == '\t') || (actual_cursorpos == end_of_text)) { - word_boundary = true; - } - actual_cursorpos++; - } - //remove old styling - styled_text_ctrl_sql->StartStyling(fromPos, m_stylemask); //from here - styled_text_ctrl_sql->SetStyling(toPos - fromPos, 0); //with that length and style -> cleared - //now style the G-Codes - for (int i = 0; i < GcodeVector.size(); i++) { - size_t startpos = GcodeVector[i].first; - size_t endpos = GcodeVector[i].second; - size_t length = (endpos - startpos); - styled_text_ctrl_sql->StartStyling(startpos, m_stylemask); - styled_text_ctrl_sql->SetStyling(length, 19); //must match the style set above - } -} - -void ExecuteSqlFrame::setfoldlevels(size_t fromPos, int startfoldlevel, wxString& text) -{ - /*we'll increase the fold level with "IF" and decrease it with "ENDIF". - First, find all "IF" included in the text. Then we check if this IF is actually an ENDIF. - Keep in mind that you still need to check if this is actually commented out and so on. - This is a pretty simple and not perfect example to demonstrate basic folding*/ - std::vectorif_positions; - size_t actual_cursorpos = 0; - while ((actual_cursorpos < text.size()) && (actual_cursorpos != wxNOT_FOUND)) { - actual_cursorpos = text.find("IF", actual_cursorpos + 1); - if (actual_cursorpos != wxNOT_FOUND) { - if_positions.push_back(actual_cursorpos + fromPos); - } - } - //build a vector to include line and folding level - //also, check if this IF is actually an ENDIF - std::vector>foldingvector; - int actualfoldlevel = startfoldlevel; - for (int i = 0; i < if_positions.size(); i++) { - size_t this_line = styled_text_ctrl_sql->LineFromPosition(if_positions[i]); - //check if that "IF" is an ENDIF - wxString endif_string; - if (if_positions[i] > 3) { - endif_string = text.substr(if_positions[i] - 3 - fromPos, 5); - } - //if it's an IF the fold level increases, if it's an ENDIF the foldlevel decreases - if (endif_string == "ENDIF") { - actualfoldlevel--; - foldingvector.push_back(std::make_pair(this_line, actualfoldlevel)); - } - else { - actualfoldlevel++; - foldingvector.push_back(std::make_pair(this_line, actualfoldlevel)); - } - } - //now that we know which lines shall influence folding, we can apply to folding level to the STC line for line - int foldlevel = startfoldlevel; //this is a temporary marker containing the foldlevel of that position - size_t vectorcount = 0; - //get positions from line from start and end - size_t startline = styled_text_ctrl_sql->LineFromPosition(fromPos); - size_t endline = styled_text_ctrl_sql->LineFromPosition(fromPos + text.size()); - //set folding for these lines - for (size_t i = startline; i <= endline; i++) { - int prevlevel = foldlevel; //previous foldlevel - int foldflag = foldlevel; //this flag will be applied to the line - if ((foldingvector.size() > 0) && (vectorcount < foldingvector.size())) { - if (i == foldingvector[vectorcount].first) { //if the fold level changes in that line - //new foldlevel = foldlevel in that line - foldlevel = foldingvector[vectorcount].second; - vectorcount++; - if (foldlevel > prevlevel) { - //when incremented, this line keeps the previous fold level (!) but is marked as a folder level header - foldflag = foldflag | wxSTC_FOLDLEVELHEADERFLAG; //incremented, set header flag - } - } - } - foldflag = foldflag | wxSTC_FOLDLEVELBASE; //add 1024 to the fold level - if (styled_text_ctrl_sql->GetLineLength(i) == 0) { //if this does not contain any characters, set the white flag - foldflag = foldflag | wxSTC_FOLDLEVELWHITEFLAG; - } - //finally, set fold level to line - styled_text_ctrl_sql->SetFoldLevel(i, foldflag); - } -} - -void ExecuteSqlFrame::fold(size_t line, bool mode) -{ - - auto endStyled = styled_text_ctrl_sql->GetEndStyled(); - auto len = styled_text_ctrl_sql->GetTextLength(); - - if (endStyled < len) - styled_text_ctrl_sql->Colourise(0, -1); - - int headerLine; - auto level = styled_text_ctrl_sql->GetFoldLevel(line); - - if (level & wxSTC_FOLDLEVELHEADERFLAG) - headerLine = static_cast(line); - else - { - headerLine = styled_text_ctrl_sql->GetFoldParent(line); - if (headerLine == -1) - return; - } - - if (styled_text_ctrl_sql->GetFoldExpanded(headerLine) != mode) - { - styled_text_ctrl_sql->ToggleFold(headerLine); - /*SCNotification scnN; - scnN.nmhdr.code = SCN_FOLDINGSTATECHANGED; - scnN.nmhdr.hwndFrom = _hSelf; - scnN.nmhdr.idFrom = 0; - scnN.line = headerLine; - scnN.foldLevelNow = isFolded(headerLine) ? 1 : 0; //folded:1, unfolded:0 - - ::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast(&scnN));*/ - } - -} - -void ExecuteSqlFrame::foldAll(bool mode) -{ - auto maxLine = styled_text_ctrl_sql->GetLineCount(); - - for (int line = 0; line < maxLine; ++line) - { - auto level = styled_text_ctrl_sql->GetFoldLevel(line); - if (level & wxSTC_FOLDLEVELHEADERFLAG) - if (styled_text_ctrl_sql->GetFoldExpanded(line) != mode) - fold(line, mode); - } - -} void ExecuteSqlFrame::buildToolbar(CommandManager& cm) { diff --git a/src/gui/ExecuteSqlFrame.h b/src/gui/ExecuteSqlFrame.h index e318302e..c5931654 100644 --- a/src/gui/ExecuteSqlFrame.h +++ b/src/gui/ExecuteSqlFrame.h @@ -83,15 +83,6 @@ class ExecuteSqlFrame: public BaseFrame, public Observer Database* getDatabase() const; private: - // fold - int m_stylemask = 255; - void onMarginClick(wxStyledTextEvent& event); - void onStyleNeeded(wxStyledTextEvent& event); - void highlightSTCsyntax(size_t fromPos, size_t toPos, wxString& text); - void setfoldlevels(size_t fromPos, int startfoldlevel, wxString& text); - void fold(size_t line, bool mode); - void foldAll(bool mode); - virtual bool doCanClose(); virtual void doBeforeDestroy(); diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp index a77bdd1a..afa0a834 100644 --- a/src/gui/FRStyle.cpp +++ b/src/gui/FRStyle.cpp @@ -555,6 +555,7 @@ void FRStyleManager::assignFold(wxStyledTextCtrl* text) text->SetProperty(wxT("fold"), wxT("1")); text->SetProperty(wxT("fold.comment"), wxT("1")); + text->SetProperty(wxT("fold.sql.only.begin"), wxT("1")); text->SetFoldFlags(wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED | wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED); text->SetAutomaticFold(wxSTC_AUTOMATICFOLD_SHOW | wxSTC_AUTOMATICFOLD_CLICK | wxSTC_AUTOMATICFOLD_CHANGE); diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index 0eb05164..64ac3c6d 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -1732,6 +1732,7 @@ class PrefDlgThemeSetting : public PrefDlgSetting virtual bool loadFromTargetConfig(Config& config); virtual bool parseProperty(wxXmlNode* xmln); virtual bool saveToTargetConfig(Config& config); + FRStyleManager* getStyleManager() { return styleManagerM; }; protected: wxString defaultM; @@ -2032,13 +2033,13 @@ wxArrayString PrefDlgThemeSetting::getComboBoxItems() void PrefDlgThemeSetting::loadStylers(const wxString& styleFileName) { - styleManagerM->setfileName(wxFileName(config().getXmlStylesPath(), styleFileName + ".xml")); - styleManagerM->loadStyle(); + getStyleManager()->setfileName(wxFileName(config().getXmlStylesPath(), styleFileName + ".xml")); + getStyleManager()->loadStyle(); stylersListBoxM->Clear(); stylersListBoxM->Insert("Global Styles", 0); - FRStylers stylers = styleManagerM->getLexerStylers(); + FRStylers stylers = getStyleManager()->getLexerStylers(); //if (stylers) { @@ -2059,9 +2060,9 @@ void PrefDlgThemeSetting::loadStyles(const wxString& language) styleListBoxM->Clear(); if (language == "Global Styles") { - styler = styleManagerM->getGlobalStyler(); + styler = getStyleManager()->getGlobalStyler(); }else{ - styler = styleManagerM->getLexerStylers().getStylerByDesc(language); + styler = getStyleManager()->getLexerStylers().getStylerByDesc(language); } if (styler) { @@ -2075,7 +2076,7 @@ void PrefDlgThemeSetting::loadStyles(const wxString& language) void PrefDlgThemeSetting::loadStyle(const wxString& styleName) { - FRStyle* style = styleManagerM->getStylerByDesc(stylersListBoxM->GetString(stylersListBoxM->GetSelection()))->getStyleByName(styleName); + FRStyle* style = getStyleManager()->getStylerByDesc(stylersListBoxM->GetString(stylersListBoxM->GetSelection()))->getStyleByName(styleName); fontNameComboBoxM->SetSelection(fontNameComboBoxM->FindString(style->getFontName())); fontSizeComboBoxM->SetSelection(fontSizeComboBoxM->FindString(wxString::Format("%i", style->getFontSize()))); From bb92168fd7400d34fd7fafe5e43d199547f3c880 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Sat, 28 May 2022 18:47:15 -0600 Subject: [PATCH 20/25] GUI --- src/gui/FRStyle.cpp | 14 +- src/gui/FRStyle.h | 12 +- src/gui/PreferencesDialogSettings.cpp | 13 +- src/gui/controls/DataGrid.cpp | 4 +- src/gui/controls/DataGridTable.cpp | 6 +- xml-styles/Bespin.xml | 724 ++++++++++++- xml-styles/Black board.xml | 720 ++++++++++++- xml-styles/Choco.xml | 724 ++++++++++++- xml-styles/DansLeRuSH-Dark.xml | 856 ++++++++++++++- xml-styles/DarkModeDefault.xml | 162 +-- xml-styles/Deep Black.xml | 29 +- xml-styles/Hello Kitty.xml | 53 +- xml-styles/HotFudgeSundae.xml | 21 +- xml-styles/Mono Industrial.xml | 247 +++-- xml-styles/Monokai.xml | 241 +++-- xml-styles/MossyLawn.xml | 21 +- xml-styles/Navajo.xml | 21 +- xml-styles/Obsidian.xml | 5 +- xml-styles/Plastic Code Wrap.xml | 251 ++--- xml-styles/Ruby Blue.xml | 580 +++++++++- xml-styles/Solarized-light.xml | 864 ++++++++++++++- xml-styles/Solarized.xml | 864 ++++++++++++++- xml-styles/Twilight.xml | 724 ++++++++++++- xml-styles/Vibrant Ink.xml | 720 ++++++++++++- xml-styles/Zenburn.xml | 1398 ++++++++++++++++++++++++- xml-styles/khaki.xml | 21 +- xml-styles/stylers.xml | 48 +- xml-styles/vim Dark Blue.xml | 731 ++++++++++++- 28 files changed, 9521 insertions(+), 553 deletions(-) diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp index afa0a834..7778ca66 100644 --- a/src/gui/FRStyle.cpp +++ b/src/gui/FRStyle.cpp @@ -40,7 +40,7 @@ FRStyle::FRStyle() - :styleIDM(-1), styleDescM(""), fgColourM(STYLE_NOT_USED), bgColourM(STYLE_NOT_USED), colourStyleM(COLORSTYLE_ALL), + :styleIDM(-1), styleDescM(""), /*fgColourM(wxBLACK), bgColourM(wxWHITE),*/ colourStyleM(COLORSTYLE_ALL), fontNameM(""), fontStyleM(FONTSTYLE_NONE), fontSizeM(STYLE_NOT_USED), nestingM(FONTSTYLE_NONE), keywordClassM(STYLE_NOT_USED), keywordsM("") { @@ -156,7 +156,7 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) long result; str.ToLong(&result, 16); - newStyle->setfgColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + newStyle->setfgColour(wxColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000))); } @@ -165,7 +165,7 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) { long result; str.ToLong(&result, 16); - newStyle->setbgColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + newStyle->setbgColour(wxColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000))); } str = element->GetAttribute("colorStyle"); @@ -403,8 +403,10 @@ void FRStyleManager::loadLexerStyles(wxXmlNode* node) wxXmlNode* child = node->GetChildren(); while (child) { - if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "LexerType" && - child->GetAttribute("name")=="sql") { + if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "LexerType" + //&& child->GetAttribute("name")=="sql" + ) + { stylersM.addStyler(child->GetAttribute("name"), child->GetAttribute("desc"), child->GetAttribute("ext"), child); } @@ -439,6 +441,8 @@ void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) text->StyleSetForeground(style->getStyleID(), style->getfgColour()); //} + + text->StyleSetCase(style->getStyleID(), style->getCaseVisible()); double size = style->getFontSize() == 0 ? getGlobalStyle()->getFontSize() : style->getFontSize(); wxFontInfo fontInfo(size); diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h index acb720b2..48049c30 100644 --- a/src/gui/FRStyle.h +++ b/src/gui/FRStyle.h @@ -66,8 +66,8 @@ class FRStyle int styleIDM; wxString styleDescM; - _COLOURREF fgColourM; - _COLOURREF bgColourM; + wxColour fgColourM; + wxColour bgColourM; int colourStyleM; wxString fontNameM; @@ -93,11 +93,11 @@ class FRStyle void setStyleDesc(wxString name) { styleDescM = name; }; - _COLOURREF getfgColour() { return fgColourM; }; - void setfgColour(_COLOURREF color) { fgColourM = color; }; + wxColour getfgColour() { return fgColourM; }; + void setfgColour(wxColour color) { fgColourM = color; }; - _COLOURREF getbgColour() { return bgColourM; }; - void setbgColour(_COLOURREF color) { bgColourM = color; }; + wxColour getbgColour() { return bgColourM; }; + void setbgColour(wxColour color) { bgColourM = color; }; int getColourStyle() { return colourStyleM; }; void setColourStyle(int color) { colourStyleM = color; }; diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index 64ac3c6d..65e534be 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -1635,9 +1636,8 @@ bool PrefDlgColourPickerSetting::loadFromTargetConfig(Config& config) long result; value.ToLong(&result, 16); - _COLOURREF colour = (_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000); - colourPickerM->SetColour(colour); + colourPickerM->SetColour(wxColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000))); } enableControls(true); @@ -1914,7 +1914,10 @@ void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) topSizer->Add(styleguide().getControlLabelMargin(), 0); } - wxSizer* sizerVert = new wxBoxSizer(wxVERTICAL); + //wxSizer* sizerVert = new wxBoxSizer(wxVERTICAL); + wxGridBagSizer* sizerVert = new wxGridBagSizer(styleguide().getRelatedControlMargin(wxVERTICAL), + styleguide().getControlLabelMargin()); + sizerVert->Add(fileComboBoxM, 1, wxEXPAND); topSizer->Add(sizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); @@ -1937,8 +1940,6 @@ void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) buttomSizer->Add(fontSizer, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP, 10); - - wxStaticBoxSizer* colourStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Colour Style"), wxVERTICAL); fontSizer->Add(colourStaticBox, 1, wxLEFT, 10); @@ -2050,7 +2051,7 @@ void PrefDlgThemeSetting::loadStylers(const wxString& styleFileName) } stylersListBoxM->Select(0); - //loadStyles(stylersListBoxM->GetString(stylersListBoxM->GetSelection())); + loadStyles(stylersListBoxM->GetString(stylersListBoxM->GetSelection())); } diff --git a/src/gui/controls/DataGrid.cpp b/src/gui/controls/DataGrid.cpp index ccf0d5e4..4462290c 100644 --- a/src/gui/controls/DataGrid.cpp +++ b/src/gui/controls/DataGrid.cpp @@ -81,12 +81,12 @@ DataGrid::DataGrid(wxWindow* parent, wxWindowID id) wxFont f; SetDefaultCellFont(stylerManager().getDefaultStyle()->getFont()); - if (config().getValue("DataGridFont", s) && !s.empty()) + /*if (config().getValue("DataGridFont", s) && !s.empty()) { f.SetNativeFontInfo(s); if (f.Ok()) SetDefaultCellFont(f); - } + }*/ SetLabelFont(stylerManager().getDefaultStyle()->getFont()); if (config().getValue("DataGridHeaderFont", s) && !s.empty()) diff --git a/src/gui/controls/DataGridTable.cpp b/src/gui/controls/DataGridTable.cpp index 28e359aa..9d4f5e7c 100644 --- a/src/gui/controls/DataGridTable.cpp +++ b/src/gui/controls/DataGridTable.cpp @@ -210,7 +210,8 @@ wxGridCellAttr* DataGridTable::GetAttr(int row, int col, else if (info.fieldModified) textCol = *wxBLUE; else - textCol = stylerManager().getDefaultStyle()->getfgColour() != 0 ? stylerManager().getDefaultStyle()->getfgColour() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + //textCol = stylerManager().getDefaultStyle()->getfgColour() != 0 ? stylerManager().getDefaultStyle()->getfgColour() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + textCol = stylerManager().getDefaultStyle()->getfgColour(); cellAttriM->SetTextColour(textCol); // background colour @@ -222,7 +223,8 @@ wxGridCellAttr* DataGridTable::GetAttr(int row, int col, else if (readOnlyM || info.fieldReadOnly || info.fieldBlob) bgCol = frlayoutconfig().getReadonlyColour(); else - bgCol = stylerManager().getDefaultStyle()->getbgColour() != 0 ? stylerManager().getDefaultStyle()->getbgColour() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); + //bgCol = stylerManager().getDefaultStyle()->getbgColour() != 0 ? stylerManager().getDefaultStyle()->getbgColour() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); + bgCol = stylerManager().getDefaultStyle()->getbgColour(); cellAttriM->SetBackgroundColour(bgCol); // text alignment diff --git a/xml-styles/Bespin.xml b/xml-styles/Bespin.xml index c0fe3594..1b9d5b73 100644 --- a/xml-styles/Bespin.xml +++ b/xml-styles/Bespin.xml @@ -39,12 +39,139 @@ Credits: Thanks for the user for the tmTheme source. //--> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -54,6 +181,593 @@ Credits: + + + + + + + + + + + + + + + + + + + + the_ID the_post have_posts wp_link_pages the_content + + + + $_POST $_GET $_SESSION + + + + + + + + + + + alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window + XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + ContentScroller + + + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + @@ -90,4 +804,4 @@ Credits: - + diff --git a/xml-styles/Black board.xml b/xml-styles/Black board.xml index 41ac8bf1..709ef334 100644 --- a/xml-styles/Black board.xml +++ b/xml-styles/Black board.xml @@ -41,12 +41,139 @@ Credits: Thanks for the user for the tmTheme source. //--> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -56,6 +183,589 @@ Credits: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + @@ -92,4 +802,4 @@ Credits: - + diff --git a/xml-styles/Choco.xml b/xml-styles/Choco.xml index fe7822cc..5d31b87c 100644 --- a/xml-styles/Choco.xml +++ b/xml-styles/Choco.xml @@ -41,20 +41,730 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ooooo - + ooooo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char @@ -92,4 +802,4 @@ Credits: - + diff --git a/xml-styles/DansLeRuSH-Dark.xml b/xml-styles/DansLeRuSH-Dark.xml index 45232fbc..40155eeb 100644 --- a/xml-styles/DansLeRuSH-Dark.xml +++ b/xml-styles/DansLeRuSH-Dark.xml @@ -17,10 +17,754 @@ Requirements : This style is based on Consolas (or other nice monotype) font and Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable installation to "%INSTALL FOLDER%\themes" //--> - + + + + ContentScroller + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + ContentScroller + + + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + bool long int char + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window + XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the_ID the_post have_posts wp_link_pages the_content + + + + $_POST $_GET $_SESSION + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + raise + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + bool long int char + + + + + + + + + + + - + @@ -29,6 +773,112 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + + @@ -64,4 +914,4 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable - + diff --git a/xml-styles/DarkModeDefault.xml b/xml-styles/DarkModeDefault.xml index 5dfd1f3c..9d5064ef 100644 --- a/xml-styles/DarkModeDefault.xml +++ b/xml-styles/DarkModeDefault.xml @@ -10,7 +10,7 @@ Created by: Jani Kesänen (jani dot kesanen gmail com) Released: 25.06.2019 License: GPL2 --> - + @@ -60,13 +60,13 @@ License: GPL2 - + - - + + @@ -120,17 +120,32 @@ License: GPL2 - - + + - + - + + + + + + + + + + + + + + + + @@ -289,7 +304,7 @@ License: GPL2 - + @@ -328,16 +343,28 @@ License: GPL2 - - + + - + + + + + + + + + + + + + @@ -503,23 +530,23 @@ License: GPL2 - - - - + + + + - - + + - - + + - - + + @@ -551,6 +578,7 @@ License: GPL2 + @@ -568,7 +596,6 @@ License: GPL2 - @@ -590,13 +617,13 @@ License: GPL2 - - + + - - + + @@ -605,7 +632,7 @@ License: GPL2 - + @@ -618,13 +645,21 @@ License: GPL2 - - - - - - - + + + + + + + + + + + + + + + @@ -639,7 +674,7 @@ License: GPL2 - + @@ -728,7 +763,7 @@ License: GPL2 - + @@ -861,13 +896,14 @@ License: GPL2 - - + + + - + @@ -910,6 +946,7 @@ License: GPL2 + @@ -930,20 +967,25 @@ License: GPL2 - + - - - + + + - + + - + + + + + @@ -1027,7 +1069,7 @@ License: GPL2 - + @@ -1076,7 +1118,7 @@ License: GPL2 - + @@ -1127,6 +1169,8 @@ License: GPL2 + + @@ -1251,7 +1295,7 @@ License: GPL2 - + @@ -1292,15 +1336,15 @@ License: GPL2 + + - - @@ -1337,14 +1381,14 @@ License: GPL2 - - + + - - + + - - + + @@ -1364,7 +1408,6 @@ License: GPL2 - @@ -1400,5 +1443,6 @@ License: GPL2 + - + diff --git a/xml-styles/Deep Black.xml b/xml-styles/Deep Black.xml index 3178ee10..828856f8 100644 --- a/xml-styles/Deep Black.xml +++ b/xml-styles/Deep Black.xml @@ -15,17 +15,26 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - - + + + + + + + + + + + + + + - - - + + + + + diff --git a/xml-styles/Hello Kitty.xml b/xml-styles/Hello Kitty.xml index 1fd13de8..aabcf458 100644 --- a/xml-styles/Hello Kitty.xml +++ b/xml-styles/Hello Kitty.xml @@ -5,7 +5,7 @@ This theme is not complete. If you enhance it, please send it back to me : so your enhanced file can be included in Notepad++ future release. --> - + @@ -298,7 +298,7 @@ so your enhanced file can be included in Notepad++ future release. - + @@ -318,7 +318,6 @@ so your enhanced file can be included in Notepad++ future release. - @@ -336,19 +335,35 @@ so your enhanced file can be included in Notepad++ future release. - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -420,7 +420,6 @@ Installation: - @@ -454,6 +453,22 @@ Installation: param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + @@ -925,4 +940,4 @@ Installation: - + diff --git a/xml-styles/Mono Industrial.xml b/xml-styles/Mono Industrial.xml index 69d25b18..66556d24 100644 --- a/xml-styles/Mono Industrial.xml +++ b/xml-styles/Mono Industrial.xml @@ -41,7 +41,7 @@ Credits: Thanks for the user for the tmTheme source. //--> - + @@ -80,7 +80,6 @@ Credits: - @@ -154,7 +153,7 @@ Credits: - + @@ -228,6 +227,22 @@ Credits: + + + + + + + + + + + + + + + + @@ -273,10 +288,10 @@ Credits: - - - - + + + + @@ -287,8 +302,8 @@ Credits: - - + + @@ -338,17 +353,17 @@ Credits: - - - + + + - - - - - - - + + + + + + + @@ -357,18 +372,18 @@ Credits: - - - - + + + + - - + + @@ -392,14 +407,14 @@ Credits: - - - + + + - - + + @@ -413,16 +428,16 @@ Credits: - + - - - + + + - - - + + + @@ -449,19 +464,19 @@ Credits: - + - + - - - - + + + + @@ -473,12 +488,12 @@ Credits: - - + + - + - + @@ -490,24 +505,24 @@ Credits: - - + + - + - + - + - + @@ -517,21 +532,21 @@ Credits: - - - + + + - + - + - + - + @@ -543,26 +558,26 @@ Credits: - + - - - + + + - - + + - + - - - - - + + + + + @@ -578,14 +593,14 @@ Credits: - + - - - - - + + + + + @@ -593,27 +608,27 @@ Credits: - - - - - + + + + + - - - - + + + + - + - - - + + + @@ -637,7 +652,7 @@ Credits: - + - + @@ -80,7 +80,6 @@ Credits: - @@ -154,7 +153,7 @@ Credits: - + @@ -228,6 +227,22 @@ Credits: + + + + + + + + + + + + + + + + @@ -287,8 +302,8 @@ Credits: - - + + @@ -338,17 +353,17 @@ Credits: - - - + + + - - - - - - - + + + + + + + @@ -357,18 +372,18 @@ Credits: - - - - + + + + - - + + @@ -392,14 +407,14 @@ Credits: - - - + + + - - + + @@ -413,16 +428,16 @@ Credits: - + - - - + + + - - - + + + @@ -449,19 +464,19 @@ Credits: - + - + - - - - + + + + @@ -473,12 +488,12 @@ Credits: - - + + - + - + @@ -490,24 +505,24 @@ Credits: - - + + - + - + - + - + @@ -517,21 +532,21 @@ Credits: - - - + + + - + - + - + - + @@ -543,26 +558,26 @@ Credits: - + - - - + + + - - + + - + - - - - - + + + + + @@ -578,14 +593,14 @@ Credits: - + - - - - - + + + + + @@ -593,27 +608,27 @@ Credits: - - - - - + + + + + - - - - + + + + - + - - - + + + @@ -637,19 +652,19 @@ Credits: - + - - + + @@ -661,29 +676,29 @@ Credits: - + - + - - - + + + - + - + - + @@ -704,12 +719,12 @@ Credits: - - - - + + + + - + @@ -719,10 +734,10 @@ Credits: - + - + @@ -737,13 +752,13 @@ Credits: - + - - - - - + + + + + @@ -807,4 +822,4 @@ Credits: - + diff --git a/xml-styles/MossyLawn.xml b/xml-styles/MossyLawn.xml index 06836555..29ec7fc8 100644 --- a/xml-styles/MossyLawn.xml +++ b/xml-styles/MossyLawn.xml @@ -36,7 +36,7 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + @@ -421,7 +421,6 @@ Installation: - @@ -455,6 +454,22 @@ Installation: param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + @@ -926,4 +941,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Navajo.xml b/xml-styles/Navajo.xml index 2bec42dc..be0ce9f6 100644 --- a/xml-styles/Navajo.xml +++ b/xml-styles/Navajo.xml @@ -33,7 +33,7 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + @@ -418,7 +418,6 @@ Installation: - @@ -452,6 +451,22 @@ Installation: param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + @@ -923,4 +938,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Obsidian.xml b/xml-styles/Obsidian.xml index 51f35200..38d90175 100644 --- a/xml-styles/Obsidian.xml +++ b/xml-styles/Obsidian.xml @@ -9,7 +9,7 @@ Notepad++ Custom Style assembly, bash, batch, lua at least for detail. Everything else more or less... Info: Inspired by Oblivion theme for gedit. --> - + @@ -322,7 +322,6 @@ Notepad++ Custom Style - @@ -808,4 +807,4 @@ Notepad++ Custom Style - + diff --git a/xml-styles/Plastic Code Wrap.xml b/xml-styles/Plastic Code Wrap.xml index 6d7eba42..1079d515 100644 --- a/xml-styles/Plastic Code Wrap.xml +++ b/xml-styles/Plastic Code Wrap.xml @@ -41,7 +41,7 @@ Credits: Thanks for the user for the tmTheme source. //--> - + @@ -80,7 +80,6 @@ Credits: - @@ -154,7 +153,7 @@ Credits: - + @@ -228,6 +227,22 @@ Credits: + + + + + + + + + + + + + + + + @@ -273,10 +288,10 @@ Credits: - - - - + + + + @@ -287,8 +302,8 @@ Credits: - - + + @@ -338,17 +353,17 @@ Credits: - - - + + + - - - - - - - + + + + + + + @@ -369,18 +384,18 @@ Credits: - - - - + + + + - - + + @@ -404,14 +419,14 @@ Credits: - - - + + + - - + + @@ -425,16 +440,16 @@ Credits: - + - - - + + + - - - + + + @@ -461,19 +476,19 @@ Credits: - + - + - - - - + + + + @@ -485,12 +500,12 @@ Credits: - - + + - + - + @@ -502,24 +517,24 @@ Credits: - - + + - + - + - + - + @@ -529,21 +544,21 @@ Credits: - - - + + + - + - + - + - + @@ -555,26 +570,26 @@ Credits: - + - - - + + + - - + + - + - - - - - + + + + + @@ -590,14 +605,14 @@ Credits: - + - - - - - + + + + + @@ -605,27 +620,27 @@ Credits: - - - - - + + + + + - - - - + + + + - + - - - + + + @@ -649,7 +664,7 @@ Credits: - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -50,7 +177,448 @@ http://sourceforge.net/donate/index.php?group_id=95717 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + @@ -87,4 +655,4 @@ http://sourceforge.net/donate/index.php?group_id=95717 - + diff --git a/xml-styles/Solarized-light.xml b/xml-styles/Solarized-light.xml index d17b97c1..2d81beae 100644 --- a/xml-styles/Solarized-light.xml +++ b/xml-styles/Solarized-light.xml @@ -44,17 +44,771 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -62,7 +816,105 @@ Installation: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,4 +949,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Solarized.xml b/xml-styles/Solarized.xml index f9f94670..329d17ea 100644 --- a/xml-styles/Solarized.xml +++ b/xml-styles/Solarized.xml @@ -44,17 +44,771 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -62,7 +816,105 @@ Installation: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,4 +949,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Twilight.xml b/xml-styles/Twilight.xml index 59bd0724..47b74890 100644 --- a/xml-styles/Twilight.xml +++ b/xml-styles/Twilight.xml @@ -42,12 +42,139 @@ Credits: Thanks for the user for the tmTheme source. //--> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -57,6 +184,593 @@ Credits: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + raise + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + @@ -93,4 +807,4 @@ Credits: - + diff --git a/xml-styles/Vibrant Ink.xml b/xml-styles/Vibrant Ink.xml index ca25b19d..7c37322a 100644 --- a/xml-styles/Vibrant Ink.xml +++ b/xml-styles/Vibrant Ink.xml @@ -17,12 +17,139 @@ http://sourceforge.net/donate/index.php?group_id=95717 2007.11.16 --> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -32,6 +159,589 @@ http://sourceforge.net/donate/index.php?group_id=95717 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + @@ -68,4 +778,4 @@ http://sourceforge.net/donate/index.php?group_id=95717 - + diff --git a/xml-styles/Zenburn.xml b/xml-styles/Zenburn.xml index 238baf20..9d5064ef 100644 --- a/xml-styles/Zenburn.xml +++ b/xml-styles/Zenburn.xml @@ -10,18 +10,1405 @@ Created by: Jani Kesänen (jani dot kesanen gmail com) Released: 25.06.2019 License: GPL2 --> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56,5 +1443,6 @@ License: GPL2 + - + diff --git a/xml-styles/khaki.xml b/xml-styles/khaki.xml index 9d44d21a..c807bdde 100644 --- a/xml-styles/khaki.xml +++ b/xml-styles/khaki.xml @@ -33,7 +33,7 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + @@ -418,7 +418,6 @@ Installation: - @@ -452,6 +451,22 @@ Installation: param @projectDescription projectDescription @param + + + + + + + + + + + + + + + + @@ -923,4 +938,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/stylers.xml b/xml-styles/stylers.xml index e86326de..38b812e7 100644 --- a/xml-styles/stylers.xml +++ b/xml-styles/stylers.xml @@ -2,40 +2,40 @@ - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - + diff --git a/xml-styles/vim Dark Blue.xml b/xml-styles/vim Dark Blue.xml index 8e89574b..4b2acf3d 100644 --- a/xml-styles/vim Dark Blue.xml +++ b/xml-styles/vim Dark Blue.xml @@ -1,10 +1,624 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -14,6 +628,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + @@ -51,4 +772,4 @@ - + From 80e0194966b71a23fb8891d72ad15c7b55e818a5 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Mon, 20 Jun 2022 01:28:51 -0600 Subject: [PATCH 21/25] Clean .xml files. --- xml-styles/Bespin.xml | 701 +-------------- xml-styles/Black board.xml | 697 +-------------- xml-styles/Choco.xml | 697 +-------------- xml-styles/DansLeRuSH-Dark.xml | 838 +----------------- xml-styles/DarkModeDefault.xml | 1373 +----------------------------- xml-styles/Deep Black.xml | 8 + xml-styles/Hello Kitty.xml | 710 +-------------- xml-styles/HotFudgeSundae.xml | 839 +----------------- xml-styles/Mono Industrial.xml | 701 +-------------- xml-styles/Monokai.xml | 717 +--------------- xml-styles/MossyLawn.xml | 839 +----------------- xml-styles/Navajo.xml | 839 +----------------- xml-styles/Obsidian.xml | 736 +--------------- xml-styles/Plastic Code Wrap.xml | 713 +--------------- xml-styles/Ruby Blue.xml | 556 +----------- xml-styles/Solarized-light.xml | 848 +----------------- xml-styles/Solarized.xml | 839 +----------------- xml-styles/Twilight.xml | 701 +-------------- xml-styles/Vibrant Ink.xml | 697 +-------------- xml-styles/Zenburn.xml | 1373 +----------------------------- xml-styles/khaki.xml | 839 +----------------- xml-styles/stylers.xml | 8 + xml-styles/vim Dark Blue.xml | 708 +-------------- 23 files changed, 58 insertions(+), 16919 deletions(-) diff --git a/xml-styles/Bespin.xml b/xml-styles/Bespin.xml index 1b9d5b73..0e4d5347 100644 --- a/xml-styles/Bespin.xml +++ b/xml-styles/Bespin.xml @@ -39,135 +39,8 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -181,111 +54,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - the_ID the_post have_posts wp_link_pages the_content - - - - $_POST $_GET $_SESSION - - - - - - - - - - - alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window - XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - import - import - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -295,471 +63,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - ContentScroller - - - onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -804,4 +107,4 @@ Credits: - + diff --git a/xml-styles/Black board.xml b/xml-styles/Black board.xml index 709ef334..3573ca37 100644 --- a/xml-styles/Black board.xml +++ b/xml-styles/Black board.xml @@ -41,135 +41,8 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -183,107 +56,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -293,471 +65,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -802,4 +109,4 @@ Credits: - + diff --git a/xml-styles/Choco.xml b/xml-styles/Choco.xml index 5d31b87c..ecb05441 100644 --- a/xml-styles/Choco.xml +++ b/xml-styles/Choco.xml @@ -41,135 +41,8 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -183,107 +56,6 @@ Credits: ooooo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -293,471 +65,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -802,4 +109,4 @@ Credits: - + diff --git a/xml-styles/DansLeRuSH-Dark.xml b/xml-styles/DansLeRuSH-Dark.xml index 40155eeb..2ec4025b 100644 --- a/xml-styles/DansLeRuSH-Dark.xml +++ b/xml-styles/DansLeRuSH-Dark.xml @@ -17,286 +17,8 @@ Requirements : This style is based on Consolas (or other nice monotype) font and Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable installation to "%INSTALL FOLDER%\themes" //--> - + - - - ContentScroller - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - import - import - - - - - - - - - - - - - - - - - - - - - - - - - ContentScroller - - - onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - bool long int char - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -306,463 +28,6 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window - XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - the_ID the_post have_posts wp_link_pages the_content - - - - $_POST $_GET $_SESSION - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - raise - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - bool long int char - - - - - - - - - - - @@ -772,105 +37,6 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -914,4 +80,4 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable - + diff --git a/xml-styles/DarkModeDefault.xml b/xml-styles/DarkModeDefault.xml index 9d5064ef..1256d370 100644 --- a/xml-styles/DarkModeDefault.xml +++ b/xml-styles/DarkModeDefault.xml @@ -10,386 +10,8 @@ Created by: Jani Kesänen (jani dot kesanen gmail com) Released: 25.06.2019 License: GPL2 --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -399,766 +21,6 @@ License: GPL2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1172,237 +34,6 @@ License: GPL2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1445,4 +76,4 @@ License: GPL2 - + diff --git a/xml-styles/Deep Black.xml b/xml-styles/Deep Black.xml index 828856f8..c5ecd623 100644 --- a/xml-styles/Deep Black.xml +++ b/xml-styles/Deep Black.xml @@ -36,6 +36,14 @@ http://sourceforge.net/donate/index.php?group_id=95717 + + + + + + if else for while + bool long int char + diff --git a/xml-styles/Hello Kitty.xml b/xml-styles/Hello Kitty.xml index aabcf458..e48db11b 100644 --- a/xml-styles/Hello Kitty.xml +++ b/xml-styles/Hello Kitty.xml @@ -5,215 +5,8 @@ This theme is not complete. If you enhance it, please send it back to me : so your enhanced file can be included in Notepad++ future release. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -223,406 +16,6 @@ so your enhanced file can be included in Notepad++ future release. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -636,105 +29,6 @@ so your enhanced file can be included in Notepad++ future release. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - @@ -777,4 +71,4 @@ so your enhanced file can be included in Notepad++ future release. - + diff --git a/xml-styles/HotFudgeSundae.xml b/xml-styles/HotFudgeSundae.xml index 7c90bc2f..ed6ffcd4 100644 --- a/xml-styles/HotFudgeSundae.xml +++ b/xml-styles/HotFudgeSundae.xml @@ -35,278 +35,8 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ooooo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - the_ID the_post have_posts wp_link_pages the_content - - - - $_POST $_GET $_SESSION - - - - - - - - - - - - - - alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window - XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - import - import - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -316,453 +46,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - ContentScroller - - - onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - raise - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -772,25 +55,6 @@ Installation: - - - - - - if else for while - if else for while - bool long int char - - - - - - - - - - - @@ -807,105 +71,6 @@ Installation: bool long int char - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -940,4 +105,4 @@ Installation: - + diff --git a/xml-styles/Mono Industrial.xml b/xml-styles/Mono Industrial.xml index 66556d24..ac8f1c06 100644 --- a/xml-styles/Mono Industrial.xml +++ b/xml-styles/Mono Industrial.xml @@ -41,135 +41,8 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -183,107 +56,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -293,475 +65,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -806,4 +109,4 @@ Credits: - + diff --git a/xml-styles/Monokai.xml b/xml-styles/Monokai.xml index 94541e74..84786840 100644 --- a/xml-styles/Monokai.xml +++ b/xml-styles/Monokai.xml @@ -41,135 +41,8 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -183,107 +56,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -293,475 +65,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -770,22 +73,6 @@ Credits: if else for while bool long int char - - - - - - - - - - - - - - - - @@ -822,4 +109,4 @@ Credits: - + diff --git a/xml-styles/MossyLawn.xml b/xml-styles/MossyLawn.xml index 29ec7fc8..425167c7 100644 --- a/xml-styles/MossyLawn.xml +++ b/xml-styles/MossyLawn.xml @@ -36,278 +36,8 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -317,453 +47,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -773,25 +56,6 @@ Installation: - - - - - - - - - - - - - - - - - - - @@ -808,105 +72,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -941,4 +106,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Navajo.xml b/xml-styles/Navajo.xml index be0ce9f6..0402f78d 100644 --- a/xml-styles/Navajo.xml +++ b/xml-styles/Navajo.xml @@ -33,278 +33,8 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -314,453 +44,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -770,25 +53,6 @@ Installation: - - - - - - - - - - - - - - - - - - - @@ -805,105 +69,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -938,4 +103,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Obsidian.xml b/xml-styles/Obsidian.xml index 38d90175..2771a224 100644 --- a/xml-styles/Obsidian.xml +++ b/xml-styles/Obsidian.xml @@ -9,215 +9,8 @@ Notepad++ Custom Style assembly, bash, batch, lua at least for detail. Everything else more or less... Info: Inspired by Oblivion theme for gedit. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -227,416 +20,6 @@ Notepad++ Custom Style - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -650,105 +33,6 @@ Notepad++ Custom Style - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if else for while - bool long int char - - - - - - - - - - - - - - - - if else for while - bool long int char - - - @@ -757,22 +41,6 @@ Notepad++ Custom Style if else for while bool long int char - - - - - - - - - - - - - - - - @@ -807,4 +75,4 @@ Notepad++ Custom Style - + diff --git a/xml-styles/Plastic Code Wrap.xml b/xml-styles/Plastic Code Wrap.xml index 1079d515..88990bb1 100644 --- a/xml-styles/Plastic Code Wrap.xml +++ b/xml-styles/Plastic Code Wrap.xml @@ -41,135 +41,8 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -183,107 +56,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -293,487 +65,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool long int char - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -818,4 +109,4 @@ Credits: - + diff --git a/xml-styles/Ruby Blue.xml b/xml-styles/Ruby Blue.xml index 2a59a873..26098458 100644 --- a/xml-styles/Ruby Blue.xml +++ b/xml-styles/Ruby Blue.xml @@ -35,135 +35,8 @@ http://sourceforge.net/donate/index.php?group_id=95717 2006.03.27. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -177,107 +50,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -287,330 +59,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -655,4 +103,4 @@ http://sourceforge.net/donate/index.php?group_id=95717 - + diff --git a/xml-styles/Solarized-light.xml b/xml-styles/Solarized-light.xml index 2d81beae..f18434ac 100644 --- a/xml-styles/Solarized-light.xml +++ b/xml-styles/Solarized-light.xml @@ -44,278 +44,8 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -325,481 +55,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -816,105 +71,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -949,4 +105,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Solarized.xml b/xml-styles/Solarized.xml index 329d17ea..f9df9685 100644 --- a/xml-styles/Solarized.xml +++ b/xml-styles/Solarized.xml @@ -44,278 +44,8 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -325,453 +55,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -781,25 +64,6 @@ Installation: - - - - - - - - - - - - - - - - - - - @@ -816,105 +80,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -949,4 +114,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/Twilight.xml b/xml-styles/Twilight.xml index 47b74890..84023f14 100644 --- a/xml-styles/Twilight.xml +++ b/xml-styles/Twilight.xml @@ -42,135 +42,8 @@ Credits: Thanks for the user for the tmTheme source. //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -184,107 +57,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -294,475 +66,6 @@ Credits: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - raise - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -807,4 +110,4 @@ Credits: - + diff --git a/xml-styles/Vibrant Ink.xml b/xml-styles/Vibrant Ink.xml index 7c37322a..a334a6b2 100644 --- a/xml-styles/Vibrant Ink.xml +++ b/xml-styles/Vibrant Ink.xml @@ -17,135 +17,8 @@ http://sourceforge.net/donate/index.php?group_id=95717 2007.11.16 --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -159,107 +32,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -269,471 +41,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -778,4 +85,4 @@ http://sourceforge.net/donate/index.php?group_id=95717 - + diff --git a/xml-styles/Zenburn.xml b/xml-styles/Zenburn.xml index 9d5064ef..1256d370 100644 --- a/xml-styles/Zenburn.xml +++ b/xml-styles/Zenburn.xml @@ -10,386 +10,8 @@ Created by: Jani Kesänen (jani dot kesanen gmail com) Released: 25.06.2019 License: GPL2 --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -399,766 +21,6 @@ License: GPL2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1172,237 +34,6 @@ License: GPL2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1445,4 +76,4 @@ License: GPL2 - + diff --git a/xml-styles/khaki.xml b/xml-styles/khaki.xml index c807bdde..8dd1f25e 100644 --- a/xml-styles/khaki.xml +++ b/xml-styles/khaki.xml @@ -33,278 +33,8 @@ Installation: Copy this file to C:\Users\%%USERNAME%%\AppData\Roaming\Notepad++\themes //--> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -314,453 +44,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - param @projectDescription projectDescription @param - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -770,25 +53,6 @@ Installation: - - - - - - - - - - - - - - - - - - - @@ -805,105 +69,6 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -938,4 +103,4 @@ Installation: - \ No newline at end of file + \ No newline at end of file diff --git a/xml-styles/stylers.xml b/xml-styles/stylers.xml index 38b812e7..7971448c 100644 --- a/xml-styles/stylers.xml +++ b/xml-styles/stylers.xml @@ -23,6 +23,13 @@ + + + + + + + @@ -55,5 +62,6 @@ + diff --git a/xml-styles/vim Dark Blue.xml b/xml-styles/vim Dark Blue.xml index 4b2acf3d..cff5c554 100644 --- a/xml-styles/vim Dark Blue.xml +++ b/xml-styles/vim Dark Blue.xml @@ -1,216 +1,6 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -220,401 +10,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endfunction endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -628,105 +23,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -772,4 +68,4 @@ - + From 80739ff950834da9903bdc1e2ed26140deb7aba9 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Tue, 23 Aug 2022 08:09:59 -0600 Subject: [PATCH 22/25] Folding --- install/win32/FlameRobinSetup.iss | 1 + src/gui/ExecuteSqlFrame.cpp | 8 +- src/gui/FRLayoutConfig.cpp | 2 +- src/gui/FRStyle.cpp | 290 +++++++++++++++++++++----- src/gui/FRStyle.h | 69 ++++-- src/gui/PreferencesDialogSettings.cpp | 16 +- src/gui/controls/DataGrid.cpp | 12 +- src/gui/controls/DataGridTable.cpp | 4 +- 8 files changed, 302 insertions(+), 100 deletions(-) diff --git a/install/win32/FlameRobinSetup.iss b/install/win32/FlameRobinSetup.iss index f7b64d68..82427720 100644 --- a/install/win32/FlameRobinSetup.iss +++ b/install/win32/FlameRobinSetup.iss @@ -109,6 +109,7 @@ Source: ..\..\conf-defs\*.*; DestDir: {app}\conf-defs; Flags: ignoreversion Source: ..\..\code-templates\*.*; DestDir: {app}\code-templates; Flags: ignoreversion Source: ..\..\html-templates\*.*; DestDir: {app}\html-templates; Flags: ignoreversion Source: ..\..\sys-templates\*.*; DestDir: {app}\sys-templates; Flags: ignoreversion +Source: ..\..\xml-styles\*.*; DestDir: {app}\xml-styles; Flags: ignoreversion #ifndef X64VERSION ;Source: ..\..\res\system32\msvcr71.dll; DestDir: {app} ;Source: ..\..\res\system32\msvcp71.dll; DestDir: {app} diff --git a/src/gui/ExecuteSqlFrame.cpp b/src/gui/ExecuteSqlFrame.cpp index 2b4a8365..ccabab14 100644 --- a/src/gui/ExecuteSqlFrame.cpp +++ b/src/gui/ExecuteSqlFrame.cpp @@ -329,8 +329,8 @@ void SqlEditor::setup() SetCaretLineVisible(true); SetMargins(0, 0); - SetMarginWidth(MARGE_LINENUMBER, 40); - SetMarginType(MARGE_LINENUMBER, wxSTC_MARGIN_NUMBER); + SetMarginWidth(FR_LINENUMBERNARGIN, 40); + SetMarginType(FR_LINENUMBERNARGIN, wxSTC_MARGIN_NUMBER); SetAutomaticFold(wxSTC_AUTOMATICFOLD_SHOW); if (config().get("sqlEditorShowEdge", false)) @@ -346,7 +346,7 @@ void SqlEditor::setup() StyleClearAll(); stylerManager().assignLexer(this); SetLexer(wxSTC_LEX_SQL); - stylerManager().assignFold(this); + stylerManager().assignMargin(this); setChars(false); @@ -805,7 +805,7 @@ void ExecuteSqlFrame::set_properties() statusbar_1->SetStatusText("Transaction status", 3); grid_data->SetTable(new DataGridTable(statementM, databaseM), true); - grid_data->SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColour()); + grid_data->SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); splitter_window_1->Initialize(styled_text_ctrl_sql); viewModeM = vmEditor; diff --git a/src/gui/FRLayoutConfig.cpp b/src/gui/FRLayoutConfig.cpp index 2afa28c0..07d18a77 100644 --- a/src/gui/FRLayoutConfig.cpp +++ b/src/gui/FRLayoutConfig.cpp @@ -196,7 +196,7 @@ wxColour FRLayoutConfig::getReadonlyColour() // first try to compute a colour that is between "white" and "gray" // (but use the actual system colours instead of hard-coded values) //wxColour clWnd(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - wxColour clWnd(stylerManager().getDefaultStyle()->getbgColour()); + wxColour clWnd(stylerManager().getDefaultStyle()->getbgColor()); int r1 = clWnd.Red(), g1 = clWnd.Green(), b1 = clWnd.Blue(); wxColour clBtn = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); int r2 = clBtn.Red(), g2 = clBtn.Green(), b2 = clBtn.Blue(); diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp index 7778ca66..71e96e7b 100644 --- a/src/gui/FRStyle.cpp +++ b/src/gui/FRStyle.cpp @@ -38,10 +38,16 @@ #include "FRStyle.h" +int RGB2int(_COLORREF color) +{ + return (((((_DWORD)color) & 0x0000FF) << 16) | ((((_DWORD)color) & 0x00FF00)) | ((((_DWORD)color) & 0xFF0000) >> 16)); +} FRStyle::FRStyle() - :styleIDM(-1), styleDescM(""), /*fgColourM(wxBLACK), bgColourM(wxWHITE),*/ colourStyleM(COLORSTYLE_ALL), - fontNameM(""), fontStyleM(FONTSTYLE_NONE), fontSizeM(STYLE_NOT_USED), nestingM(FONTSTYLE_NONE), + :styleIDM(STYLE_NOT_USED), styleDescM(""), + fgColorM(STYLE_NOT_USED), bgColorM(STYLE_NOT_USED), colorStyleM(COLORSTYLE_ALL), + isFontEnabledM(false), fontNameM(""), fontStyleM(FONTSTYLE_NONE), fontSizeM(STYLE_NOT_USED), caseVisibleM(STYLE_NOT_USED), + nestingM(FONTSTYLE_NONE), keywordClassM(STYLE_NOT_USED), keywordsM("") { } @@ -50,13 +56,19 @@ FRStyle::FRStyle(const FRStyle& style) { styleIDM = style.styleIDM; styleDescM = style.styleDescM; - fgColourM = style.fgColourM; - bgColourM = style.bgColourM; - colourStyleM = style.colourStyleM; + + fgColorM = style.fgColorM; + bgColorM = style.bgColorM; + colorStyleM = style.colorStyleM; + + isFontEnabledM = style.isFontEnabledM; fontNameM = style.fontNameM; fontSizeM = style.fontSizeM; fontStyleM = style.fontStyleM; + caseVisibleM = style.caseVisibleM; + keywordClassM = style.keywordClassM; + nestingM = style.nestingM; keywordsM = style.keywordsM; } @@ -69,19 +81,116 @@ FRStyle& FRStyle::operator=(const FRStyle& style) { styleIDM = style.styleIDM; styleDescM = style.styleDescM; - fgColourM = style.fgColourM; - bgColourM = style.bgColourM; - colourStyleM = style.colourStyleM; + + fgColorM = style.fgColorM; + bgColorM = style.bgColorM; + colorStyleM = style.colorStyleM; + + isFontEnabledM = style.isFontEnabledM; fontNameM = style.fontNameM; fontSizeM = style.fontSizeM; fontStyleM = style.fontStyleM; + caseVisibleM = style.caseVisibleM; + keywordClassM = style.keywordClassM; + nestingM = style.nestingM; keywordsM = style.keywordsM; return *this; } +bool FRStyle::operator==(const FRStyle& style) +{ + return + styleIDM == style.styleIDM && + styleDescM == style.styleDescM && + + fgColorM == style.fgColorM && + bgColorM == style.bgColorM && + colorStyleM == style.colorStyleM && + + isFontEnabledM == style.isFontEnabledM && + fontNameM == style.fontNameM && + fontSizeM == style.fontSizeM && + fontStyleM == style.fontStyleM && + caseVisibleM == style.caseVisibleM && + + keywordClassM == style.keywordClassM && + + nestingM == style.nestingM && + keywordsM == style.keywordsM + ; +} + +void FRStyle::write2Element(wxXmlNode* element) +{ + wxXmlAttribute* lAttribute = element->GetAttributes(); + while (lAttribute) { + wxString lName = lAttribute->GetName(); + if (lName == "fgColor") { + if (_HIBYTE(_HIWORD(fgColorM.GetRGB())) != 0xFF) + { + int rgbVal = RGB2int(fgColorM.GetRGB()); + //element->AddAttribute(TEXT("fgColor"), wxString::Format(wxT("%.6X"), rgbVal)); + lAttribute->SetValue(wxString::Format(wxT("%.6X"), rgbVal)); + + } + } + if (lName == "bgColor") { + if (_HIBYTE(_HIWORD(bgColorM.GetRGB())) != 0xFF) + { + int rgbVal = RGB2int(bgColorM.GetRGB()); + //element->AddAttribute(TEXT("bgColor"), wxString::Format(wxT("%.6X"), rgbVal)); + lAttribute->SetValue(wxString::Format(wxT("%.6X"), rgbVal)); + } + } + if (lName == "colorStyle") { + if (colorStyleM != COLORSTYLE_ALL) + lAttribute->SetValue(wxString::Format(wxT("%i"), colorStyleM)); + } + if (lName == "fontName") { + if (!fontNameM.empty()) + { + wxString oldFontName = element->GetAttribute(wxT("fontName")); + if (!oldFontName.IsEmpty() && oldFontName != fontNameM) + lAttribute->SetValue(fontNameM); + } + } + + if (lName == "fontSize") { + if (fontSizeM != STYLE_NOT_USED) + { + if (!fontSizeM) + lAttribute->SetValue(wxT("")); + else + lAttribute->SetValue(wxString::Format(wxT("%i"), fontSizeM)); + } + } + + if (lName == "fontStyle") { + if (fontStyleM != STYLE_NOT_USED) + lAttribute->SetValue(wxString::Format(wxT("%i"), fontStyleM)); + } + /* + if (!keywordsM.empty()) + { + TiXmlNode* teteDeNoeud = element->LastChild(); + + if (teteDeNoeud) + teteDeNoeud->SetValue(style2Write._keywords.c_str()); + else + element->InsertEndChild(TiXmlText(style2Write._keywords.c_str())); + } + */ + + lAttribute = lAttribute->GetNext(); + } + + + +} + wxFont FRStyle::getFont() { wxFontInfo fontInfo(getFontSize()); @@ -112,6 +221,27 @@ FRStyles& FRStyles::operator=(const FRStyles& sa) return *this; } +bool FRStyles::operator==(const FRStyles& sa) +{ + return false; +} + +void FRStyles::write2Element(wxXmlNode* element) +{ + wxXmlNode* child = element->GetChildren(); + while (child) { + if (child->GetType() == wxXML_ELEMENT_NODE && + (child->GetName() == "WidgetStyle") || (child->GetName() == "WordsStyle")) { + wxString lName = child->GetAttribute("name"); + FRStyle* lStyle = getStyleByName(lName); + if (lStyle) { + lStyle->write2Element(child); + } + } + child = child->GetNext(); + } +} + int FRStyles::getStyleIndexByID(int id) { std::vector::iterator it; @@ -156,7 +286,11 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) long result; str.ToLong(&result, 16); - newStyle->setfgColour(wxColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000))); + //newStyle->setfgColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + + wxColour colour (result); + colour.SetRGB((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + newStyle->setfgColor(colour); } @@ -165,7 +299,12 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) { long result; str.ToLong(&result, 16); - newStyle->setbgColour(wxColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000))); + //newStyle->setbgColour((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + + wxColour colour(result); + colour.SetRGB((_RGB((result >> 16) & 0xFF, (result >> 8) & 0xFF, result & 0xFF)) | (result & 0xFF000000)); + newStyle->setbgColor(colour); + } str = element->GetAttribute("colorStyle"); @@ -173,11 +312,14 @@ void FRStyles::addStyler(int styleID, wxXmlNode* styleNode) { long temp; str.ToLong(&temp, 10); - newStyle->setColourStyle(temp); + newStyle->setColorStyle(temp); } str = element->GetAttribute("fontName"); - newStyle->setFontName(str); + if (!str.IsEmpty()) { + newStyle->setFontName(str); + newStyle->setisFontEnable(TRUE); + } str = element->GetAttribute("fontStyle"); if (!str.IsEmpty()) @@ -232,8 +374,8 @@ void FRStyles::addStyler(int styleID, const wxString styleName) FRStyle* newStyle = new FRStyle(); newStyle->setStyleID(styleID); newStyle->setStyleDesc(styleName); - newStyle->setfgColour(wxBLACK->GetRGB()); - newStyle->setbgColour(wxWHITE->GetRGB()); + newStyle->setfgColor(wxBLACK->GetRGB()); + newStyle->setbgColor(wxWHITE->GetRGB()); styleVectorM.push_back(newStyle); @@ -302,6 +444,22 @@ FRStylers& FRStylers::operator=(const FRStylers& lsa) return *this; } +void FRStylers::write2Element(wxXmlNode* element) +{ + wxXmlNode* child = element->GetChildren(); + while (child) { + if (child->GetType() == wxXML_ELEMENT_NODE && + child->GetName() == "LexerType") { + wxString lName = child->GetAttribute("name"); + FRStyles* lStyles = getStylerByName(lName); + if (lStyles) { + lStyles->write2Element(child); + } + } + child = child->GetNext(); + } +} + FRStyler* FRStylers::getStylerByName(wxString lexerName) { if (!lexerName) @@ -403,9 +561,7 @@ void FRStyleManager::loadLexerStyles(wxXmlNode* node) wxXmlNode* child = node->GetChildren(); while (child) { - if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "LexerType" - //&& child->GetAttribute("name")=="sql" - ) + if (child->GetType() == wxXML_ELEMENT_NODE && child->GetName() == "LexerType") { stylersM.addStyler(child->GetAttribute("name"), child->GetAttribute("desc"), child->GetAttribute("ext"), child); @@ -431,14 +587,15 @@ void FRStyleManager::loadGlobalStyles(wxXmlNode* node) }; } + void FRStyleManager::assignWordStyle(wxStyledTextCtrl* text, FRStyle* style) { //if (style->getbgColour() & COLORSTYLE_BACKGROUND){ - text->StyleSetBackground(style->getStyleID(), style->getbgColour()); + text->StyleSetBackground(style->getStyleID(), style->getbgColor()); //} //if (style->getfgColour() & COLORSTYLE_FOREGROUND) { - text->StyleSetForeground(style->getStyleID(), style->getfgColour()); + text->StyleSetForeground(style->getStyleID(), style->getfgColor()); //} @@ -491,8 +648,8 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) if (style->getStyleDesc() == "Global override") { //globalStyleM = style; text->StyleResetDefault(); - text->SetBackgroundColour(style->getbgColour()); - text->SetForegroundColour(style->getfgColour()); + text->SetBackgroundColour(style->getbgColor()); + text->SetForegroundColour(style->getfgColor()); assignWordStyle(text, style); } if (style->getStyleDesc() == "Default Style") { @@ -500,11 +657,11 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) } if (style->getStyleDesc() == "Mark colour") {} if (style->getStyleDesc() == "Selected text colour") { - text->SetSelBackground(true, style->getbgColour()); + text->SetSelBackground(true, style->getbgColor()); //text->SetSelForeground(true, style->getfgColor()); } if (style->getStyleDesc() == "Edge colour") { - text->SetEdgeColour(style->getfgColour()); + text->SetEdgeColour(style->getfgColor()); } if (style->getStyleDesc() == "Bookmark margin" ) { //text->SetMarginBackground() @@ -512,12 +669,12 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) if (style->getStyleDesc() == "Fold") {} if (style->getStyleDesc() == "Fold active") {} if (style->getStyleDesc() == "Fold margin") { - text->SetFoldMarginColour(true, style->getbgColour()); - text->SetFoldMarginHiColour(true, style->getfgColour()); + text->SetFoldMarginColour(true, style->getbgColor()); + text->SetFoldMarginHiColour(true, style->getfgColor()); } if (style->getStyleDesc() == "White space symbol") { - text->SetWhitespaceForeground(true, style->getfgColour()); - text->SetWhitespaceBackground(true, style->getbgColour()); + text->SetWhitespaceForeground(true, style->getfgColor()); + text->SetWhitespaceBackground(true, style->getbgColor()); } if (style->getStyleDesc() == "Active tab focused indicator") {} if (style->getStyleDesc() == "Active tab unfocused indicator") {} @@ -525,8 +682,8 @@ void FRStyleManager::assignGlobal(wxStyledTextCtrl* text) if (style->getStyleDesc() == "Inactive tabs") {} if (style->getStyleDesc() == "URL hovered") {} if (style->getStyleDesc() == "Current line background colour") { - text->SetCaretLineBackground(style->getbgColour()); - text->SetCaretForeground(style->getfgColour()); + text->SetCaretLineBackground(style->getbgColor()); + text->SetCaretForeground(style->getfgColor()); } } @@ -551,10 +708,10 @@ void FRStyleManager::assignLexer(wxStyledTextCtrl* text) } } -void FRStyleManager::assignFold(wxStyledTextCtrl* text) +void FRStyleManager::assignMargin(wxStyledTextCtrl* text) { - FRStyle* styleFoldMargin = getGlobalStyler()->getStyleByName("Fold margin"); FRStyle* styleFold = getGlobalStyler()->getStyleByName("Fold"); + FRStyle* styleFoldMargin = getGlobalStyler()->getStyleByName("Fold margin"); FRStyle* styleFoldActive = getGlobalStyler()->getStyleByName("Fold active"); text->SetProperty(wxT("fold"), wxT("1")); @@ -565,44 +722,44 @@ void FRStyleManager::assignFold(wxStyledTextCtrl* text) text->SetMarginWidth(FR_FOLDMARGIN, 14); text->SetMarginMask(FR_FOLDMARGIN, wxSTC_MASK_FOLDERS); - text->SetFoldMarginColour(true, styleFoldMargin->getbgColour()); - text->SetFoldMarginHiColour(true, styleFoldMargin->getfgColour()); + text->SetFoldMarginColour(true, styleFoldMargin->getbgColor()); + text->SetFoldMarginHiColour(true, styleFoldMargin->getfgColor()); text->MarkerDefine(wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_BOXPLUSCONNECTED); - text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEREND, styleFold->getfgColour()); - text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEREND, styleFold->getbgColour()); - text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEREND, styleFoldActive->getfgColour()); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEREND, styleFold->getfgColor()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEREND, styleFold->getbgColor()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEREND, styleFoldActive->getfgColor()); text->MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUSCONNECTED); - text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEROPENMID, styleFold->getfgColour()); - text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEROPENMID, styleFold->getbgColour()); - text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEROPENMID, styleFoldActive->getfgColour()); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEROPENMID, styleFold->getfgColor()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEROPENMID, styleFold->getbgColor()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEROPENMID, styleFoldActive->getfgColor()); text->MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNER); - text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFold->getfgColour()); - text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFold->getbgColour()); - text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFoldActive->getfgColour()); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFold->getfgColor()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFold->getbgColor()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERMIDTAIL, styleFoldActive->getfgColor()); text->MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_LCORNER); - text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERTAIL, styleFold->getfgColour()); - text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERTAIL, styleFold->getbgColour()); - text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERTAIL, styleFoldActive->getfgColour()); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERTAIL, styleFold->getfgColor()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERTAIL, styleFold->getbgColor()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERTAIL, styleFoldActive->getfgColor()); text->MarkerDefine(wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_VLINE); - text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERSUB, styleFold->getfgColour()); - text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERSUB, styleFold->getbgColour()); - text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERSUB, styleFoldActive->getfgColour()); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDERSUB, styleFold->getfgColor()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDERSUB, styleFold->getbgColor()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDERSUB, styleFoldActive->getfgColor()); text->MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS); - text->MarkerSetForeground(wxSTC_MARKNUM_FOLDER, styleFold->getfgColour()); - text->MarkerSetBackground(wxSTC_MARKNUM_FOLDER, styleFold->getbgColour()); - text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDER, styleFoldActive->getfgColour()); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDER, styleFold->getfgColor()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDER, styleFold->getbgColor()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDER, styleFoldActive->getfgColor()); text->MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS); - text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEROPEN, styleFold->getfgColour()); - text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEROPEN, styleFold->getbgColour()); - text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEROPEN, styleFoldActive->getfgColour()); + text->MarkerSetForeground(wxSTC_MARKNUM_FOLDEROPEN, styleFold->getfgColor()); + text->MarkerSetBackground(wxSTC_MARKNUM_FOLDEROPEN, styleFold->getbgColor()); + text->MarkerSetBackgroundSelected(wxSTC_MARKNUM_FOLDEROPEN, styleFoldActive->getfgColor()); //Turn the fold markers red when the caret is a line in the group (optional) text->MarkerEnableHighlight(true); @@ -632,7 +789,6 @@ void FRStyleManager::loadConfig() void FRStyleManager::loadStyle() { - wxXmlDocument xmlDoc; xmlDoc.Load(fileNameM.GetFullPath()); if (xmlDoc.IsOk()) { @@ -654,10 +810,30 @@ void FRStyleManager::loadStyle() } } } - } void FRStyleManager::saveStyle() { - //TODO: Implemented + wxXmlDocument xmlDoc; + xmlDoc.Load(fileNameM.GetFullPath()); + if (xmlDoc.IsOk()) { + + wxXmlNode* xmlNode = xmlDoc.GetRoot(); + if (xmlNode->GetType() == wxXML_ELEMENT_NODE && xmlNode->GetName() == "Flamerobin") { + + wxXmlNode* child = xmlNode->GetChildren(); + while (child) { + + if (child->GetName() == "GlobalStyles") + getGlobalStyler()->write2Element(child); + + if (child->GetName() == "LexerStyles") + getLexerStylers().write2Element(child); + + child = child->GetNext(); + } + } + + xmlDoc.Save(fileNameM.GetFullPath(), 4); + } } diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h index 48049c30..a69bfc57 100644 --- a/src/gui/FRStyle.h +++ b/src/gui/FRStyle.h @@ -37,9 +37,13 @@ typedef unsigned short _WORD; typedef unsigned long _DWORD; typedef unsigned char _BYTE; -typedef _DWORD _COLOURREF; +typedef _DWORD _COLORREF; +typedef unsigned long _ULONG_PTR, *_PULONG_PTR; +typedef _ULONG_PTR _DWORD_PTR; -#define _RGB(r,g,b) ((_COLOURREF)(((_BYTE)(r)|((_WORD)((_BYTE)(g))<<8))|(((_DWORD)(_BYTE)(b))<<16))) +#define _RGB(r,g,b) ((_COLORREF)(((_BYTE)(r)|((_WORD)((_BYTE)(g))<<8))|(((_DWORD)(_BYTE)(b))<<16))) +#define _HIWORD(l) ((_WORD)((((_DWORD_PTR)(l)) >> 16) & 0xffff)) +#define _HIBYTE(w) ((_BYTE)((((_DWORD_PTR)(w)) >> 8) & 0xff)) const int FONTSTYLE_NONE = 0; @@ -47,7 +51,7 @@ const int FONTSTYLE_BOLD = 1; const int FONTSTYLE_ITALIC = 2; const int FONTSTYLE_UNDERLINE = 4; -const int STYLE_NOT_USED = 0; +const int STYLE_NOT_USED = -1; const int COLORSTYLE_FOREGROUND = 0x01; const int COLORSTYLE_BACKGROUND = 0x02; @@ -55,25 +59,28 @@ const int COLORSTYLE_ALL = COLORSTYLE_FOREGROUND | COLORSTYLE_BACKGROUND; const int MAX_LEXER_STYLE = 100; -const int MARGE_LINENUMBER = 0; -const int MARGE_SYMBOLE = 1; - +const int FR_LINENUMBERNARGIN = 0; +const int FR_SYMBOLEMARGIN = 1; #define FR_FOLDMARGIN 2 +// or class FRStyle { protected: int styleIDM; wxString styleDescM; - wxColour fgColourM; - wxColour bgColourM; - int colourStyleM; + wxColour fgColorM; + wxColour bgColorM; + int colorStyleM; + bool isFontEnabledM; wxString fontNameM; int fontStyleM; int fontSizeM; int caseVisibleM; + + int nestingM; int keywordClassM; @@ -84,6 +91,9 @@ class FRStyle ~FRStyle(); FRStyle& operator = (const FRStyle& style); + bool operator == (const FRStyle& style); + + void write2Element(wxXmlNode* element); int getStyleID() { return styleIDM; }; @@ -93,19 +103,22 @@ class FRStyle void setStyleDesc(wxString name) { styleDescM = name; }; - wxColour getfgColour() { return fgColourM; }; - void setfgColour(wxColour color) { fgColourM = color; }; + wxColour getfgColor() { return fgColorM; }; + void setfgColor(wxColour color) { fgColorM = color; }; - wxColour getbgColour() { return bgColourM; }; - void setbgColour(wxColour color) { bgColourM = color; }; + wxColour getbgColor() { return bgColorM; }; + void setbgColor(wxColour color) { bgColorM = color; }; - int getColourStyle() { return colourStyleM; }; - void setColourStyle(int color) { colourStyleM = color; }; + int getColorStyle() { return colorStyleM; }; + void setColorStyle(int color) { colorStyleM = color; }; + + bool getisFontEnable() { return isFontEnabledM; }; + void setisFontEnable(bool value) { isFontEnabledM = value; }; wxString getFontName() { return fontNameM; }; void setFontName(wxString name) { fontNameM = name; }; - + int getFontStyle() { return fontStyleM; }; void setFontStyle(int font) { fontStyleM = font; }; @@ -129,6 +142,7 @@ class FRStyle }; +//List of or for GlobalStyles class FRStyles { @@ -139,6 +153,9 @@ class FRStyles FRStyles(); FRStyles& operator=(const FRStyles& sa); + bool operator==(const FRStyles& sa); + + void write2Element(wxXmlNode* element); int getNbStyler() const { return styleVectorM.size(); }; //void setNbStyler(int nb) { nbStylerM = nb; }; @@ -158,7 +175,7 @@ class FRStyles }; - +// class FRStyler : public FRStyles { private: @@ -181,7 +198,7 @@ class FRStyler : public FRStyles }; - +// class FRStylers { private: @@ -192,6 +209,7 @@ class FRStylers FRStylers(); FRStylers& operator=(const FRStylers& lsa); + void write2Element(wxXmlNode* element); int getNbLexerStyler() const { return stylerVectorM.size(); }; //void setNbLexerStyler(int nbLexer) { nbLexerStylerM = nbLexer; }; @@ -217,24 +235,29 @@ class FRStylers void clear(); }; + +// class FRStyleManager { private: wxFileName fileNameM; - FRStyler* globalStylerM; + FRStyles* globalStylerM; FRStylers stylersM; wxColor m_GCodecolor{ 255,130,0 }; protected: void loadLexerStyles(wxXmlNode* node); void loadGlobalStyles(wxXmlNode* node); + void saveLexerStyles(wxXmlNode* node); + void saveGlobalStyles(wxXmlNode* node); + void assignWordStyle(wxStyledTextCtrl* text, FRStyle* style); public: FRStyleManager(wxFileName style); - FRStyler* getGlobalStyler() { return globalStylerM; }; + FRStyles* getGlobalStyler() { return globalStylerM; }; FRStylers getLexerStylers() { return stylersM; }; - FRStyler* getStylerByName(wxString stylerName) { return stylerName == "Global Styles" ? getGlobalStyler() : getLexerStylers().getStylerByName(stylerName); }; - FRStyler* getStylerByDesc(wxString stylerDesc) { return stylerDesc == "Global Styles" ? getGlobalStyler() : getLexerStylers().getStylerByDesc(stylerDesc); }; + FRStyles* getStylerByName(wxString stylerName) { return stylerName == "Global Styles" ? getGlobalStyler() : getLexerStylers().getStylerByName(stylerName); }; + FRStyles* getStylerByDesc(wxString stylerDesc) { return stylerDesc == "Global Styles" ? getGlobalStyler() : getLexerStylers().getStylerByDesc(stylerDesc); }; FRStyle* getGlobalStyle() { return globalStylerM->getStyleByName("Global override"); }; FRStyle* getDefaultStyle() { return globalStylerM->getStyleByName("Default Style"); }; @@ -249,7 +272,7 @@ class FRStyleManager { void assignLexer(wxStyledTextCtrl* text); - void assignFold(wxStyledTextCtrl* text); + void assignMargin(wxStyledTextCtrl* text); void loadConfig(); void loadStyle(); diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index 65e534be..155c087a 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -2057,21 +2057,23 @@ void PrefDlgThemeSetting::loadStylers(const wxString& styleFileName) void PrefDlgThemeSetting::loadStyles(const wxString& language) { - FRStyler* styler; + FRStyles* styles; styleListBoxM->Clear(); if (language == "Global Styles") { - styler = getStyleManager()->getGlobalStyler(); + styles = getStyleManager()->getGlobalStyler(); }else{ - styler = getStyleManager()->getLexerStylers().getStylerByDesc(language); + styles = getStyleManager()->getLexerStylers().getStylerByDesc(language); } - if (styler) { + if (styles) { int i = 0; - for (FRStyle* style : styler->getStyles()) { + for (FRStyle* style : styles->getStyles()) { styleListBoxM->Insert(style->getStyleDesc(), i++); } } + styleListBoxM->Select(0); + loadStyle(styleListBoxM->GetString(styleListBoxM->GetSelection())); } @@ -2082,8 +2084,8 @@ void PrefDlgThemeSetting::loadStyle(const wxString& styleName) fontSizeComboBoxM->SetSelection(fontSizeComboBoxM->FindString(wxString::Format("%i", style->getFontSize()))); - foregroundPickerM->SetColour(style->getfgColour()); - backgroundPickerM->SetColour(style->getbgColour()); + foregroundPickerM->SetColour(style->getfgColor()); + backgroundPickerM->SetColour(style->getbgColor()); blodCheckBoxM->SetValue(style->getFontStyle() & FONTSTYLE_BOLD); italicCheckBoxM->SetValue(style->getFontStyle() & FONTSTYLE_ITALIC); diff --git a/src/gui/controls/DataGrid.cpp b/src/gui/controls/DataGrid.cpp index 4462290c..71181770 100644 --- a/src/gui/controls/DataGrid.cpp +++ b/src/gui/controls/DataGrid.cpp @@ -65,17 +65,17 @@ DataGrid::DataGrid(wxWindow* parent, wxWindowID id) SetColLabelAlignment(wxALIGN_LEFT, wxALIGN_CENTRE); SetRowLabelAlignment(wxALIGN_RIGHT, wxALIGN_CENTRE); - SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColour()); - SetForegroundColour(stylerManager().getDefaultStyle()->getfgColour()); + SetBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); + SetForegroundColour(stylerManager().getDefaultStyle()->getfgColor()); - SetSelectionBackground(stylerManager().getStyleByName("Selected text colour")->getbgColour()); + SetSelectionBackground(stylerManager().getStyleByName("Selected text colour")->getbgColor()); //SetSelectionForeground(stylerManager().getDefaultStyle()->getfgColor()); - SetDefaultCellBackgroundColour(stylerManager().getDefaultStyle()->getbgColour()); - SetDefaultCellTextColour(stylerManager().getDefaultStyle()->getfgColour()); + SetDefaultCellBackgroundColour(stylerManager().getDefaultStyle()->getbgColor()); + SetDefaultCellTextColour(stylerManager().getDefaultStyle()->getfgColor()); - SetCellHighlightColour(stylerManager().getDefaultStyle()->getfgColour()); + SetCellHighlightColour(stylerManager().getDefaultStyle()->getfgColor()); wxString s; wxFont f; diff --git a/src/gui/controls/DataGridTable.cpp b/src/gui/controls/DataGridTable.cpp index 9d4f5e7c..a4598c5d 100644 --- a/src/gui/controls/DataGridTable.cpp +++ b/src/gui/controls/DataGridTable.cpp @@ -211,7 +211,7 @@ wxGridCellAttr* DataGridTable::GetAttr(int row, int col, textCol = *wxBLUE; else //textCol = stylerManager().getDefaultStyle()->getfgColour() != 0 ? stylerManager().getDefaultStyle()->getfgColour() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - textCol = stylerManager().getDefaultStyle()->getfgColour(); + textCol = stylerManager().getDefaultStyle()->getfgColor(); cellAttriM->SetTextColour(textCol); // background colour @@ -224,7 +224,7 @@ wxGridCellAttr* DataGridTable::GetAttr(int row, int col, bgCol = frlayoutconfig().getReadonlyColour(); else //bgCol = stylerManager().getDefaultStyle()->getbgColour() != 0 ? stylerManager().getDefaultStyle()->getbgColour() : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - bgCol = stylerManager().getDefaultStyle()->getbgColour(); + bgCol = stylerManager().getDefaultStyle()->getbgColor(); cellAttriM->SetBackgroundColour(bgCol); // text alignment From 9041a7e65753dbe69742ab3d7d6bb41b3e5d6632 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Tue, 18 Oct 2022 01:05:00 -0600 Subject: [PATCH 23/25] fix --- CMakeLists.txt | 4 ++++ src/gui/PreferencesDialogSettings.cpp | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40579efb..b6115107 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,6 +411,7 @@ if(APPLE) add_resources(SYS_TEMPLATES ${CMAKE_SOURCE_DIR}/sys-templates SharedSupport/sys-templates *) add_resources(CODE_TEMPLATES ${CMAKE_SOURCE_DIR}/code-templates SharedSupport/code-templates *) add_resources(ICON ${CMAKE_SOURCE_DIR}/res Resources flamerobin.icns) + add_resources(XML_STYLES ${CMAKE_SOURCE_DIR}/xml-styles SharedSupport/xml-styles *) set(RESOURCE_FILES_MAC ${HTML_TEMPLATES} @@ -419,6 +420,7 @@ if(APPLE) ${SYS_TEMPLATES} ${CODE_TEMPLATES} ${ICON} + ${XML_STYLES} ) endif (APPLE) @@ -449,6 +451,7 @@ file(COPY ${CMAKE_SOURCE_DIR}/html-templates DESTINATION ${CMAKE_CURRENT_BINARY_ file(COPY ${CMAKE_SOURCE_DIR}/code-templates DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY ${CMAKE_SOURCE_DIR}/sys-templates DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY ${CMAKE_SOURCE_DIR}/conf-defs DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +file(COPY ${CMAKE_SOURCE_DIR}/xml-styles DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) if (APPLE) add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${SOURCE_LIST} ${HEADER_LIST} ${RESOURCE_FILES_MAC}) @@ -479,6 +482,7 @@ if (UNIX AND NOT APPLE) code-templates sys-templates conf-defs + xml-styles DESTINATION share/flamerobin ) install( diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index 155c087a..e1ff493b 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -1897,7 +1897,9 @@ bool PrefDlgThemeSetting::parseProperty(wxXmlNode* xmln) bool PrefDlgThemeSetting::saveToTargetConfig(Config& config) { - return false; + config.setValue(keyM, fileComboBoxM->GetValue()); + + return true; } void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) @@ -2034,6 +2036,9 @@ wxArrayString PrefDlgThemeSetting::getComboBoxItems() void PrefDlgThemeSetting::loadStylers(const wxString& styleFileName) { + if (!styleFileName.IsEmpty()) + styleFileName = "stylers"; + getStyleManager()->setfileName(wxFileName(config().getXmlStylesPath(), styleFileName + ".xml")); getStyleManager()->loadStyle(); From 7516653b2516368888b4af7a23a0e23f9705f809 Mon Sep 17 00:00:00 2001 From: jdochoa Date: Tue, 18 Oct 2022 03:44:47 -0600 Subject: [PATCH 24/25] Fix GUI --- src/gui/PreferencesDialogSettings.cpp | 181 +++++++++++++------------- 1 file changed, 94 insertions(+), 87 deletions(-) diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index e1ff493b..848a7403 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -1905,103 +1905,112 @@ bool PrefDlgThemeSetting::saveToTargetConfig(Config& config) void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) { - //if (checkListBoxM) + wxSizer* sizerV = new wxBoxSizer(wxVERTICAL); + sizerV->Add(0, styleguide().getFrameMargin(wxTOP)); { - static_cast(sizer)->SetOrientation(wxVERTICAL); - wxSizer* topSizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(topSizer, 0, wxEXPAND | wxALIGN_TOP); + wxSizer* sz = new wxBoxSizer(wxHORIZONTAL); + sz->Add(styleguide().getFrameMargin(wxLEFT), 0); if (captionBeforeM) { - topSizer->Add(captionBeforeM, 0, wxFIXED_MINSIZE | wxALIGN_TOP); - topSizer->Add(styleguide().getControlLabelMargin(), 0); + sz->Add(captionBeforeM, 0, wxALIGN_CENTER_VERTICAL); + sz->Add(styleguide().getControlLabelMargin(), 0); } + sz->Add(fileComboBoxM, 1, wxALIGN_CENTER_VERTICAL); - //wxSizer* sizerVert = new wxBoxSizer(wxVERTICAL); - wxGridBagSizer* sizerVert = new wxGridBagSizer(styleguide().getRelatedControlMargin(wxVERTICAL), - styleguide().getControlLabelMargin()); - - sizerVert->Add(fileComboBoxM, 1, wxEXPAND); - topSizer->Add(sizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); - - wxSizer* buttomSizer = new wxBoxSizer(wxVERTICAL); - sizer->Add(buttomSizer, 1, wxEXPAND); - - wxSizer* languageStyleSizer = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, ""), wxHORIZONTAL);//new wxBoxSizer(wxHORIZONTAL); - buttomSizer->Add(languageStyleSizer, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP, 10); - - wxStaticBoxSizer* languageStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Language:"), wxVERTICAL); - languageStyleSizer->Add(languageStaticBox, 1, wxLEFT, 10); - languageStaticBox->Add(stylersListBoxM, 1, wxEXPAND | wxCENTER, 10); - - wxStaticBoxSizer* styleStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Style:"), wxVERTICAL); - languageStyleSizer->Add(styleStaticBox, 1, wxLEFT, 10); - styleStaticBox->Add(styleListBoxM, 1, wxEXPAND | wxCENTER, 10); - - - wxSizer* fontSizer = new wxBoxSizer(wxHORIZONTAL); - buttomSizer->Add(fontSizer, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP, 10); - - - wxStaticBoxSizer* colourStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Colour Style"), wxVERTICAL); - fontSizer->Add(colourStaticBox, 1, wxLEFT, 10); - - - wxSizer* foregroundsizerHor = new wxBoxSizer(wxHORIZONTAL); - foregroundsizerHor->Add(new wxStaticText(getPage(), -1, "Foreground Colour"), 0, wxFIXED_MINSIZE | wxALIGN_TOP); - foregroundsizerHor->Add(styleguide().getControlLabelMargin(), 0); - - wxSizer* foregroundsizerVert = new wxBoxSizer(wxVERTICAL); - foregroundsizerVert->Add(foregroundPickerM, 0, wxFIXED_MINSIZE, styleguide().getRelatedControlMargin(wxHORIZONTAL)); - foregroundsizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); - foregroundsizerHor->Add(foregroundsizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); - - colourStaticBox->Add(foregroundsizerHor, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); - - - wxSizer* backgroundsizerHor = new wxBoxSizer(wxHORIZONTAL); - backgroundsizerHor->Add(new wxStaticText(getPage(), -1, "Background Colour"), 0, wxFIXED_MINSIZE | wxALIGN_TOP); - backgroundsizerHor->Add(styleguide().getControlLabelMargin(), 0); - - wxSizer* backgroundsizerVert = new wxBoxSizer(wxVERTICAL); - backgroundsizerVert->Add(backgroundPickerM, 0, wxFIXED_MINSIZE, styleguide().getRelatedControlMargin(wxHORIZONTAL)); - backgroundsizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); - backgroundsizerHor->Add(backgroundsizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); - - colourStaticBox->Add(backgroundsizerHor, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); - - - wxStaticBoxSizer* fontStaticBox = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Font Style"), wxVERTICAL); - fontSizer->Add(fontStaticBox, 1, wxLEFT, 10); - - wxSizer* fontNameSizerHor = new wxBoxSizer(wxHORIZONTAL); - fontStaticBox->Add(fontNameSizerHor, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); + sizerV->Add(sz, 0, wxEXPAND); + } - fontNameSizerHor->Add(new wxStaticText(getPage(), -1, "Font Name:"), 0, wxFIXED_MINSIZE | wxALIGN_TOP); - fontNameSizerHor->Add(styleguide().getControlLabelMargin(), 0); + { + wxSizer* sz = new wxBoxSizer(wxHORIZONTAL); + sz->Add(styleguide().getFrameMargin(wxLEFT), 0); + { + wxStaticBoxSizer* sbz = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Language"), wxVERTICAL); + sbz->Add(0, styleguide().getFrameMargin(wxTOP)); + sbz->Add(stylersListBoxM, 0, wxEXPAND); + sbz->Add(0, styleguide().getFrameMargin(wxBOTTOM)); + sz->Add(sbz, 0, wxEXPAND); - wxSizer* fontNameSizerVert = new wxBoxSizer(wxVERTICAL); - fontNameSizerHor->Add(fontNameSizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); + } + sz->Add(0, styleguide().getUnrelatedControlMargin(wxHORIZONTAL)); + { + wxStaticBoxSizer* sbz = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Style"), wxVERTICAL); + sbz->Add(0, styleguide().getFrameMargin(wxTOP)); + sbz->Add(styleListBoxM, 0, wxEXPAND); + sbz->Add(0, styleguide().getFrameMargin(wxBOTTOM)); + sz->Add(sbz, 1, wxEXPAND); + } + sz->Add(styleguide().getFrameMargin(wxRIGHT), 0); + sizerV->Add(sz, 1, wxEXPAND); + } - fontNameSizerVert->Add(fontNameComboBoxM, 0, wxEXPAND, styleguide().getRelatedControlMargin(wxHORIZONTAL)); - fontNameSizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + { + wxSizer* sz = new wxBoxSizer(wxHORIZONTAL); + sz->Add(styleguide().getFrameMargin(wxLEFT), 0); + { + wxStaticBoxSizer* sbz = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Color Style"), wxVERTICAL); + sbz->Add(0, styleguide().getFrameMargin(wxTOP)); + { + wxSizer* s = new wxBoxSizer(wxHORIZONTAL); + s->Add(new wxStaticText(getPage(), -1, "Foreground Color"), 0, wxALIGN_CENTER_VERTICAL); + s->Add(styleguide().getControlLabelMargin(), 0); + s->Add(foregroundPickerM, 0, wxALIGN_CENTER_VERTICAL); + sbz->Add(s, 0, wxEXPAND); + } + sbz->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + { + wxSizer* s = new wxBoxSizer(wxHORIZONTAL); + s->Add(new wxStaticText(getPage(), -1, "Background Color"), 0, wxALIGN_CENTER_VERTICAL); + s->Add(styleguide().getControlLabelMargin(), 0); + s->Add(backgroundPickerM, 0, wxALIGN_CENTER_VERTICAL); + sbz->Add(s, 0, wxEXPAND); + } - wxSizer* fontSizeSizerHor = new wxBoxSizer(wxHORIZONTAL); - fontStaticBox->Add(fontSizeSizerHor, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_TOP); + sbz->Add(0, styleguide().getFrameMargin(wxBOTTOM)); + sz->Add(sbz, 0, wxEXPAND); - fontSizeSizerHor->Add(new wxStaticText(getPage(), -1, "Font Size:"), 0, wxFIXED_MINSIZE | wxALIGN_TOP); - fontSizeSizerHor->Add(styleguide().getControlLabelMargin(), 0); + } + sz->Add(0, styleguide().getUnrelatedControlMargin(wxHORIZONTAL)); + { + wxStaticBoxSizer* sbz = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Font Style"), wxVERTICAL); + sbz->Add(0, styleguide().getFrameMargin(wxTOP)); + { + wxSizer* s = new wxBoxSizer(wxHORIZONTAL); + s->Add(styleguide().getFrameMargin(wxLEFT), 0); + s->Add(new wxStaticText(getPage(), -1, "Font Name"), 0, wxALIGN_CENTER_VERTICAL); + s->Add(styleguide().getControlLabelMargin(), 0); + s->Add(fontNameComboBoxM, 1, wxALIGN_CENTER_VERTICAL); + sbz->Add(s, 0, wxEXPAND); + } + sbz->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + { + wxSizer* s = new wxBoxSizer(wxHORIZONTAL); + s->Add(styleguide().getFrameMargin(wxLEFT), 0); + s->Add(new wxStaticText(getPage(), -1, "Font Size"), 0, wxALIGN_CENTER_VERTICAL); + s->Add(styleguide().getControlLabelMargin(), 0); + s->Add(fontSizeComboBoxM, 1, wxALIGN_CENTER_VERTICAL); + sbz->Add(s, 0, wxEXPAND); + } + sbz->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + { + wxGridSizer* gz = new wxGridSizer(1, 3, + styleguide().getCheckboxSpacing(), + styleguide().getUnrelatedControlMargin(wxHORIZONTAL)); + + gz->Add(blodCheckBoxM, 0, wxEXPAND); + gz->Add(italicCheckBoxM, 0, wxEXPAND); + gz->Add(underlineCheckBoxM, 0, wxEXPAND); + sbz->Add(gz, 0, wxEXPAND); + } + sbz->Add(0, styleguide().getFrameMargin(wxBOTTOM)); + sz->Add(sbz, 0, wxEXPAND); - wxSizer* fontSizeSizerVert = new wxBoxSizer(wxVERTICAL); - fontSizeSizerHor->Add(fontSizeSizerVert, 1, wxEXPAND | wxFIXED_MINSIZE | wxALIGN_LEFT); + } - fontSizeSizerVert->Add(fontSizeComboBoxM, 0, wxEXPAND, styleguide().getRelatedControlMargin(wxHORIZONTAL)); - fontSizeSizerVert->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + sz->Add(styleguide().getFrameMargin(wxRIGHT), 0); + sizerV->Add(sz, 1, wxEXPAND); - fontStaticBox->Add(blodCheckBoxM, 0, wxFIXED_MINSIZE, 10); - fontStaticBox->Add(italicCheckBoxM, 0, wxFIXED_MINSIZE, 10); - fontStaticBox->Add(underlineCheckBoxM, 0, wxFIXED_MINSIZE, 10); } - + sizer->Add(sizerV, 1, wxEXPAND); } void PrefDlgThemeSetting::enableControls(bool enabled) @@ -2036,10 +2045,8 @@ wxArrayString PrefDlgThemeSetting::getComboBoxItems() void PrefDlgThemeSetting::loadStylers(const wxString& styleFileName) { - if (!styleFileName.IsEmpty()) - styleFileName = "stylers"; - - getStyleManager()->setfileName(wxFileName(config().getXmlStylesPath(), styleFileName + ".xml")); + + getStyleManager()->setfileName(wxFileName(config().getXmlStylesPath(), styleFileName.IsEmpty() ? "stylers.xml" : styleFileName + ".xml")); getStyleManager()->loadStyle(); stylersListBoxM->Clear(); From 14905056e4ed8b81e6bd67bb2d902df06744ce9b Mon Sep 17 00:00:00 2001 From: jdochoa Date: Tue, 18 Oct 2022 19:27:52 -0600 Subject: [PATCH 25/25] implemented case visible --- src/gui/FRStyle.cpp | 17 +-- src/gui/FRStyle.h | 2 - src/gui/PreferencesDialogSettings.cpp | 150 ++++++++++++++++++++++++-- xml-styles/DarkModeDefault.xml | 110 +++++++++---------- xml-styles/stylers.xml | 62 +++++------ 5 files changed, 230 insertions(+), 111 deletions(-) diff --git a/src/gui/FRStyle.cpp b/src/gui/FRStyle.cpp index 71e96e7b..c2183b9d 100644 --- a/src/gui/FRStyle.cpp +++ b/src/gui/FRStyle.cpp @@ -46,7 +46,7 @@ int RGB2int(_COLORREF color) FRStyle::FRStyle() :styleIDM(STYLE_NOT_USED), styleDescM(""), fgColorM(STYLE_NOT_USED), bgColorM(STYLE_NOT_USED), colorStyleM(COLORSTYLE_ALL), - isFontEnabledM(false), fontNameM(""), fontStyleM(FONTSTYLE_NONE), fontSizeM(STYLE_NOT_USED), caseVisibleM(STYLE_NOT_USED), + isFontEnabledM(false), fontNameM(""), fontStyleM(FONTSTYLE_NONE), fontSizeM(STYLE_NOT_USED), caseVisibleM(0), nestingM(FONTSTYLE_NONE), keywordClassM(STYLE_NOT_USED), keywordsM("") { @@ -157,7 +157,6 @@ void FRStyle::write2Element(wxXmlNode* element) lAttribute->SetValue(fontNameM); } } - if (lName == "fontSize") { if (fontSizeM != STYLE_NOT_USED) { @@ -167,28 +166,22 @@ void FRStyle::write2Element(wxXmlNode* element) lAttribute->SetValue(wxString::Format(wxT("%i"), fontSizeM)); } } - if (lName == "fontStyle") { if (fontStyleM != STYLE_NOT_USED) lAttribute->SetValue(wxString::Format(wxT("%i"), fontStyleM)); } + if (lName == "caseVisible") { + if (caseVisibleM != STYLE_NOT_USED) + lAttribute->SetValue(wxString::Format(wxT("%i"), caseVisibleM)); + } /* if (!keywordsM.empty()) { - TiXmlNode* teteDeNoeud = element->LastChild(); - - if (teteDeNoeud) - teteDeNoeud->SetValue(style2Write._keywords.c_str()); - else - element->InsertEndChild(TiXmlText(style2Write._keywords.c_str())); } */ lAttribute = lAttribute->GetNext(); } - - - } wxFont FRStyle::getFont() diff --git a/src/gui/FRStyle.h b/src/gui/FRStyle.h index a69bfc57..0fbda200 100644 --- a/src/gui/FRStyle.h +++ b/src/gui/FRStyle.h @@ -278,8 +278,6 @@ class FRStyleManager { void loadStyle(); void saveStyle(); - - }; FRStyleManager& stylerManager(); diff --git a/src/gui/PreferencesDialogSettings.cpp b/src/gui/PreferencesDialogSettings.cpp index 848a7403..ce323bd4 100644 --- a/src/gui/PreferencesDialogSettings.cpp +++ b/src/gui/PreferencesDialogSettings.cpp @@ -1745,6 +1745,8 @@ class PrefDlgThemeSetting : public PrefDlgSetting void loadStylers(const wxString& styleFileName); void loadStyles(const wxString& language); void loadStyle(const wxString& styleName); + + void saveStyle(const wxString& styleName); private: FRStyleManager* styleManagerM; @@ -1762,17 +1764,30 @@ class PrefDlgThemeSetting : public PrefDlgSetting std::unique_ptr styleListBoxHandlerM; void OnSelectStyleListBox(wxCommandEvent& event); - //wxStaticText* lenguageStyleM; + + wxColourPickerCtrl* foregroundPickerM; + std::unique_ptr foregroundPickerHandlerM; wxColourPickerCtrl* backgroundPickerM; + std::unique_ptr backgroundPickerHandlerM; wxComboBox* fontNameComboBoxM; + std::unique_ptr fontNameComboBoxHandlerM; wxComboBox* fontSizeComboBoxM; + std::unique_ptr fontSizeComboBoxHandlerM; wxCheckBox* blodCheckBoxM; + std::unique_ptr blodCheckBoxHandlerM; wxCheckBox* italicCheckBoxM; + std::unique_ptr italicCheckBoxHandlerM; wxCheckBox* underlineCheckBoxM; + std::unique_ptr underlineCheckBoxHandlerM; + + wxRadioBox* caseRadioBoxM; + std::unique_ptr caseRadioBoxHandlerM; + + void OnChangeStyle(wxCommandEvent& event); }; @@ -1791,12 +1806,31 @@ PrefDlgThemeSetting::~PrefDlgThemeSetting() { if (fileComboBoxM && fileComboBoxHandlerM.get()) fileComboBoxM->PopEventHandler(); - if (stylersListBoxM && stylersListBoxHandlerM.get()) stylersListBoxM->PopEventHandler(); - if (styleListBoxM && styleListBoxHandlerM.get()) styleListBoxM->PopEventHandler(); + + if (foregroundPickerM && foregroundPickerHandlerM.get()) + foregroundPickerM->PopEventHandler(); + if (backgroundPickerM && backgroundPickerHandlerM.get()) + backgroundPickerM->PopEventHandler(); + + if (fontNameComboBoxM && fontNameComboBoxHandlerM.get()) + fontNameComboBoxM->PopEventHandler(); + if (fontSizeComboBoxM && fontSizeComboBoxHandlerM.get()) + fontSizeComboBoxM->PopEventHandler(); + + if (blodCheckBoxM && blodCheckBoxHandlerM.get()) + blodCheckBoxM->PopEventHandler(); + if (italicCheckBoxM && italicCheckBoxHandlerM.get()) + italicCheckBoxM->PopEventHandler(); + if (underlineCheckBoxM && underlineCheckBoxHandlerM.get()) + underlineCheckBoxM->PopEventHandler(); + + if (caseRadioBoxM && caseRadioBoxHandlerM.get()) + caseRadioBoxM->PopEventHandler(); + } bool PrefDlgThemeSetting::createControl(bool WXUNUSED(ignoreerrors)) @@ -1826,15 +1860,31 @@ bool PrefDlgThemeSetting::createControl(bool WXUNUSED(ignoreerrors)) wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); - - foregroundPickerM = new wxColourPickerCtrl(getPage(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxDefaultSize); + foregroundPickerHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnChangeStyle, this, std::placeholders::_1))); + foregroundPickerM->PushEventHandler(foregroundPickerHandlerM.get()); + foregroundPickerHandlerM->Connect(foregroundPickerM->GetId(), + wxEVT_COMMAND_COLOURPICKER_CHANGED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + backgroundPickerM = new wxColourPickerCtrl(getPage(), wxID_ANY, *wxBLACK, wxDefaultPosition, wxDefaultSize); + backgroundPickerHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnChangeStyle, this, std::placeholders::_1))); + backgroundPickerM->PushEventHandler(backgroundPickerHandlerM.get()); + backgroundPickerHandlerM->Connect(backgroundPickerM->GetId(), + wxEVT_COMMAND_COLOURPICKER_CHANGED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + wxArrayString strArray = wxFontEnumerator::GetFacenames(); strArray.Sort(); - fontNameComboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, strArray); - + fontNameComboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, strArray); + fontNameComboBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnChangeStyle, this, std::placeholders::_1))); + fontNameComboBoxM->PushEventHandler(fontNameComboBoxHandlerM.get()); + fontNameComboBoxHandlerM->Connect(fontNameComboBoxM->GetId(), + wxEVT_COMMAND_COMBOBOX_SELECTED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + + //wxArrayString strArray; strArray.Clear(); for (int i = 5; i <= 30; i++) { if (i <= 12 || i % 2 == 0) { @@ -1842,12 +1892,46 @@ bool PrefDlgThemeSetting::createControl(bool WXUNUSED(ignoreerrors)) } } fontSizeComboBoxM = new wxComboBox(getPage(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, strArray); + fontSizeComboBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnChangeStyle, this, std::placeholders::_1))); + fontSizeComboBoxM->PushEventHandler(fontSizeComboBoxHandlerM.get()); + fontSizeComboBoxHandlerM->Connect(fontSizeComboBoxM->GetId(), + wxEVT_COMMAND_COMBOBOX_SELECTED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + blodCheckBoxM = new wxCheckBox(getPage(), wxID_ANY, "Bold", wxDefaultPosition, wxDefaultSize); + blodCheckBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnChangeStyle, this, std::placeholders::_1))); + blodCheckBoxM->PushEventHandler(blodCheckBoxHandlerM.get()); + blodCheckBoxHandlerM->Connect(blodCheckBoxM->GetId(), + wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + italicCheckBoxM = new wxCheckBox(getPage(), wxID_ANY, "Italic", wxDefaultPosition, wxDefaultSize); + italicCheckBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnChangeStyle, this, std::placeholders::_1))); + italicCheckBoxM->PushEventHandler(italicCheckBoxHandlerM.get()); + italicCheckBoxHandlerM->Connect(italicCheckBoxM->GetId(), + wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + underlineCheckBoxM = new wxCheckBox(getPage(), wxID_ANY, "Underline", wxDefaultPosition, wxDefaultSize); + underlineCheckBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnChangeStyle, this, std::placeholders::_1))); + underlineCheckBoxM->PushEventHandler(underlineCheckBoxHandlerM.get()); + underlineCheckBoxHandlerM->Connect(underlineCheckBoxM->GetId(), + wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); + + wxArrayString caseChoices; + caseChoices.Add("Mixed"); + caseChoices.Add("Upper"); + caseChoices.Add("Lower"); + caseChoices.Add("Camel"); + caseRadioBoxM = new wxRadioBox(getPage(), wxID_ANY, "Font Case", wxDefaultPosition, wxDefaultSize, caseChoices, 4); + caseRadioBoxHandlerM.reset(new PrefDlgEventHandler(std::bind(&PrefDlgThemeSetting::OnChangeStyle, this, std::placeholders::_1))); + caseRadioBoxM->PushEventHandler(caseRadioBoxHandlerM.get()); + caseRadioBoxHandlerM->Connect(caseRadioBoxM->GetId(), + wxEVT_COMMAND_RADIOBOX_SELECTED, + wxCommandEventHandler(PrefDlgEventHandler::OnCommandEvent)); - return true; } @@ -1898,6 +1982,7 @@ bool PrefDlgThemeSetting::parseProperty(wxXmlNode* xmln) bool PrefDlgThemeSetting::saveToTargetConfig(Config& config) { config.setValue(keyM, fileComboBoxM->GetValue()); + getStyleManager()->saveStyle(); return true; } @@ -1926,12 +2011,12 @@ void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) { wxStaticBoxSizer* sbz = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Language"), wxVERTICAL); sbz->Add(0, styleguide().getFrameMargin(wxTOP)); - sbz->Add(stylersListBoxM, 0, wxEXPAND); + sbz->Add(stylersListBoxM, 0, wxSHAPED); sbz->Add(0, styleguide().getFrameMargin(wxBOTTOM)); sz->Add(sbz, 0, wxEXPAND); } - sz->Add(0, styleguide().getUnrelatedControlMargin(wxHORIZONTAL)); + sz->Add(0, styleguide().getRelatedControlMargin(wxHORIZONTAL)); { wxStaticBoxSizer* sbz = new wxStaticBoxSizer(new wxStaticBox(getPage(), -1, "Style"), wxVERTICAL); sbz->Add(0, styleguide().getFrameMargin(wxTOP)); @@ -2001,6 +2086,15 @@ void PrefDlgThemeSetting::addControlsToSizer(wxSizer* sizer) gz->Add(underlineCheckBoxM, 0, wxEXPAND); sbz->Add(gz, 0, wxEXPAND); } + sbz->Add(0, styleguide().getRelatedControlMargin(wxVERTICAL)); + { + wxSizer* s = new wxBoxSizer(wxHORIZONTAL); + s->Add(styleguide().getFrameMargin(wxLEFT), 0); + s->Add(styleguide().getControlLabelMargin(), 0); + s->Add(caseRadioBoxM, 1, wxALIGN_CENTER_VERTICAL); + sbz->Add(s, 0, wxEXPAND); + } + sbz->Add(0, styleguide().getFrameMargin(wxBOTTOM)); sz->Add(sbz, 0, wxEXPAND); @@ -2091,9 +2185,10 @@ void PrefDlgThemeSetting::loadStyles(const wxString& language) void PrefDlgThemeSetting::loadStyle(const wxString& styleName) { + FRStyle* style = getStyleManager()->getStylerByDesc(stylersListBoxM->GetString(stylersListBoxM->GetSelection()))->getStyleByName(styleName); - fontNameComboBoxM->SetSelection(fontNameComboBoxM->FindString(style->getFontName())); + fontNameComboBoxM->SetSelection(fontNameComboBoxM->FindString(style->getFontName())); fontSizeComboBoxM->SetSelection(fontSizeComboBoxM->FindString(wxString::Format("%i", style->getFontSize()))); foregroundPickerM->SetColour(style->getfgColor()); @@ -2103,6 +2198,34 @@ void PrefDlgThemeSetting::loadStyle(const wxString& styleName) italicCheckBoxM->SetValue(style->getFontStyle() & FONTSTYLE_ITALIC); underlineCheckBoxM->SetValue(style->getFontStyle() & FONTSTYLE_UNDERLINE); + caseRadioBoxM->SetSelection(style->getCaseVisible()); + +} + +void PrefDlgThemeSetting::saveStyle(const wxString& styleName) +{ + FRStyle* style = getStyleManager()->getStylerByDesc(stylersListBoxM->GetString(stylersListBoxM->GetSelection()))->getStyleByName(styleName); + + style->setFontName(fontNameComboBoxM->GetString(fontNameComboBoxM->GetSelection())); + style->setFontSize(atoi(fontSizeComboBoxM->GetString(fontSizeComboBoxM->GetSelection()))); + + + style->setfgColor(foregroundPickerM->GetColour()); + style->setbgColor(backgroundPickerM->GetColour()); + + int fontStyle = 0; + if (blodCheckBoxM->IsChecked()) + fontStyle |= FONTSTYLE_BOLD; + if (italicCheckBoxM->IsChecked()) + fontStyle |= FONTSTYLE_ITALIC; + if (underlineCheckBoxM->IsChecked()) + fontStyle |= FONTSTYLE_UNDERLINE; + + style->setFontStyle(fontStyle); + + style->setCaseVisible(caseRadioBoxM->GetSelection()); + + } void PrefDlgThemeSetting::OnSelectFileComboBox(wxCommandEvent& event) @@ -2120,6 +2243,11 @@ void PrefDlgThemeSetting::OnSelectStyleListBox(wxCommandEvent& event) loadStyle(styleListBoxM->GetString(styleListBoxM->GetSelection())); } +void PrefDlgThemeSetting::OnChangeStyle(wxCommandEvent& event) +{ + saveStyle(styleListBoxM->GetString(styleListBoxM->GetSelection())); +} + // PrefDlgSetting factory /* static */ diff --git a/xml-styles/DarkModeDefault.xml b/xml-styles/DarkModeDefault.xml index 1256d370..deded048 100644 --- a/xml-styles/DarkModeDefault.xml +++ b/xml-styles/DarkModeDefault.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-styles/stylers.xml b/xml-styles/stylers.xml index 7971448c..f32e8573 100644 --- a/xml-styles/stylers.xml +++ b/xml-styles/stylers.xml @@ -1,4 +1,4 @@ - + @@ -24,12 +24,12 @@ - - - - - - + + + + + + @@ -38,30 +38,30 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +