Merge branch 'Stylers' into master

Jdochoa · Oct 19, 2022 · c522814 · c522814
2 parents aa6dc04 + 1490505
commit c522814
Show file tree

Hide file tree

Showing 58 changed files with 5,674 additions and 59 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -2,9 +2,9 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ master, dev ]
+    branches: [ Stylers ]
   pull_request:
-    branches: [ master, dev ]
+    branches: [ master ]
 
 jobs:
   build:
@@ -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 libwxgtk*-gtk3-dev -y
+      run: sudo apt-get install build-essential git cmake firebird-dev libwxgtk3.1-dev -y
     - name: CMake
       run: |
           mkdir build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,6 +110,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
@@ -228,6 +229,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
@@ -466,6 +468,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}
@@ -474,6 +477,7 @@ if(APPLE)
             ${SYS_TEMPLATES}
             ${CODE_TEMPLATES}
             ${ICON}
+			${XML_STYLES}
     )
 
 endif (APPLE)
@@ -504,6 +508,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})
@@ -534,6 +539,7 @@ if (UNIX AND NOT APPLE)
 			code-templates
 			sys-templates
 			conf-defs 
+			xml-styles			
 		DESTINATION share/flamerobin
 	)
 	install(

diff --git 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 \
@@ -377,6 +378,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
@@ -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 \
@@ -470,6 +471,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
@@ -101,6 +101,7 @@ FLAMEROBIN_OBJECTS =  \
 	flamerobin_FieldPropertiesDialog.o \
 	flamerobin_FindDialog.o \
 	flamerobin_FRLayoutConfig.o \
+	flamerobin_FRStyle.o \
 	flamerobin_GUIURIHandlerHelper.o \
 	flamerobin_HtmlHeaderMetadataItemVisitor.o \
 	flamerobin_HtmlTemplateProcessor.o \
@@ -123,6 +124,9 @@ FLAMEROBIN_OBJECTS =  \
 	flamerobin_StartupFrame.o \
 	flamerobin_StyleGuide.o \
 	flamerobin_ThreadBaseFrame.o \
+	flamerobin_SimpleHtmlFrame.o \
+	flamerobin_StatementHistoryDialog.o \
+	flamerobin_StyleGuide.o \
 	flamerobin_UserDialog.o \
 	flamerobin_UsernamePasswordDialog.o \
 	flamerobin_logger.o \
@@ -374,6 +378,11 @@ 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) $<
 
@@ -419,18 +428,21 @@ flamerobin_RestoreFrame.o: ./src/gui/RestoreFrame.cpp
 flamerobin_ServerRegistrationDialog.o: ./src/gui/ServerRegistrationDialog.cpp
 	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
 
+
 flamerobin_ShutdownStartupBaseFrame.o: ./${SOURCEDIR}/gui/ShutdownStartupBaseFrame.cpp
 	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
 
 flamerobin_ShutdownFrame.o: ./${SOURCEDIR}/gui/ShutdownFrame.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_StartupFrame.o: ./${SOURCEDIR}/gui/StartupFrame.cpp
 	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
 
@@ -440,6 +452,11 @@ flamerobin_StyleGuide.o: ./src/gui/StyleGuide.cpp
 flamerobin_ThreadBaseFrame.o: ./${SOURCEDIR}/gui/ThreadBaseFrame.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) $<
 

diff --git a/conf-defs/fr_settings.confdef b/conf-defs/fr_settings.confdef
@@ -385,6 +385,35 @@
                 </option>
             </setting>
         </node>
+		<node>
+            <caption>Style Configurator</caption>
+            <description>SQL Style Editor </description>
+            <image>0</image>
+			<setting type="themecombobox">
+				<caption>Select theme:</caption>
+                <description>Select the file with the style</description>
+                <key>StyleTheme</key>
+				<default>Default</default>
+				<aligngroup>1</aligngroup>
+                <file>StyleTheme</file>
+            </setting>
+			<!--
+			<setting type="colour">
+				<caption>Foreground Colour:</caption>
+                <description>Foregound Colour with the style</description>
+                <key>ForegroundColour</key>
+				<default>BDAE9D</default>
+				<aligngroup>1</aligngroup>
+            </setting>
+			<setting type="colour">
+				<caption>Background Colour:</caption>
+                <description>Background Colour with the style</description>
+                <key>BackgroundColour</key>
+				<default>2A211C</default>
+				<aligngroup>2</aligngroup>
+            </setting>
+			-->
+		</node>
     </node>
     <node>
         <caption>Data Grid</caption>

diff --git a/flamerobin.bkl b/flamerobin.bkl
@@ -177,8 +177,8 @@ Accepted values: AMD64, IA64.
             <define>WIN32_LEAN_AND_MEAN</define>
 
             <set var="WX_PORT">wxmsw</set>
-<!-- set this to 28 for wxWidgets 2.8.X, to 30 for wxWidgets 3.0.x-->
-            <set var="WX_VERSION">30</set>
+<!-- set this to 28 for wxWidgets 2.8.X, to 30 for wxWidgets 3.1.x-->
+            <set var="WX_VERSION">31</set>
 
             <set var="WX_LIB_DIR" make_var="1">
                 <if cond="USEDLL=='1'">$(WXDIR)/lib/$(COMPILER)$(DIR_SUFFIX_CPU)_dll</if>
@@ -188,10 +188,8 @@ Accepted values: AMD64, IA64.
             <include>$(WX_LIB_DIR)/msw$(U_OPT)$(D_OPT)</include>
             <include>$(WXDIR)/contrib/include</include>
             <include>$(WXDIR)/include</include>
-            <include>$(DOLLAR)(BOOST_ROOT)</include>
 
             <lib-path>$(WX_LIB_DIR)</lib-path>
-            <lib-path>$(DOLLAR)(BOOST_LIB_DIR)</lib-path>
 
             <!-- another nice thing that wx-config will take care of -->
             <sys-lib>$(WX_PORT)$(WX_VERSION)$(U_OPT)$(D_OPT)_aui</sys-lib>
@@ -201,7 +199,7 @@ Accepted values: AMD64, IA64.
             <sys-lib>$(WX_PORT)$(WX_VERSION)$(U_OPT)$(D_OPT)_core</sys-lib>
             <sys-lib>wxbase$(WX_VERSION)$(U_OPT)$(D_OPT)_xml</sys-lib>
             <sys-lib>wxbase$(WX_VERSION)$(U_OPT)$(D_OPT)</sys-lib>
-            <if cond="WX_VERSION>='30'">
+            <if cond="WX_VERSION>='31'">
                 <sys-lib>wxscintilla$(D_OPT)</sys-lib>
             </if>
             <sys-lib>wxexpat$(D_OPT)</sys-lib>
@@ -278,6 +276,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
@@ -405,6 +404,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/flamerobin_flamerobin.vcxproj b/flamerobin_flamerobin.vcxproj
@@ -1046,6 +1046,7 @@
     <ClCompile Include="src\gui\FieldPropertiesDialog.cpp" />
     <ClCompile Include="src\gui\FindDialog.cpp" />
     <ClCompile Include="src\gui\FRLayoutConfig.cpp" />
+    <ClCompile Include="src\gui\FRStyle.cpp" />
     <ClCompile Include="src\gui\GUIURIHandlerHelper.cpp" />
     <ClCompile Include="src\gui\HtmlHeaderMetadataItemVisitor.cpp" />
     <ClCompile Include="src\gui\HtmlTemplateProcessor.cpp" />
@@ -1164,6 +1165,7 @@
     <ClInclude Include="src\gui\FieldPropertiesDialog.h" />
     <ClInclude Include="src\gui\FindDialog.h" />
     <ClInclude Include="src\gui\FRLayoutConfig.h" />
+    <ClInclude Include="src\gui\FRStyle.h" />
     <ClInclude Include="src\gui\GUIURIHandlerHelper.h" />
     <ClInclude Include="src\gui\HtmlHeaderMetadataItemVisitor.h" />
     <ClInclude Include="src\gui\HtmlTemplateProcessor.h" />

diff --git a/flamerobin_flamerobin.vcxproj.filters b/flamerobin_flamerobin.vcxproj.filters
@@ -369,6 +369,14 @@
     <ClCompile Include="src\gui\StartupFrame.cpp">
       <Filter>Source Files\gui</Filter>
     </ClCompile>
+
+    <ClCompile Include="src\gui\FRStyle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\core\FRInt128.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\gui\AboutBox.h">
@@ -719,6 +727,12 @@
     <ClInclude Include="src\firebird\constants.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\gui\FRStyle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\core\FRInt128.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\flamerobin.rc">

diff --git 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/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 \
@@ -428,6 +429,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