User Collation

Jdochoa · Oct 21, 2023 · 7e8edf0 · 7e8edf0
1 parent 0cef8f5
commit 7e8edf0
Show file tree

Hide file tree

Showing 15 changed files with 545 additions and 733 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,9 +140,6 @@ list(APPEND SOURCE_LIST
         ${SOURCEDIR}/gui/controls/LogTextControl.cpp
         ${SOURCEDIR}/gui/controls/PrintableHtmlWindow.cpp
         ${SOURCEDIR}/gui/controls/TextControl.cpp
-        ${SOURCEDIR}/gui/gtk/StyleGuideGTK.cpp
-        ${SOURCEDIR}/gui/mac/StyleGuideMAC.cpp
-        ${SOURCEDIR}/gui/msw/StyleGuideMSW.cpp
         ${SOURCEDIR}/metadata/CharacterSet.cpp
         ${SOURCEDIR}/metadata/Collation.cpp
         ${SOURCEDIR}/metadata/column.cpp

diff --git a/GNUmakefile b/GNUmakefile
@@ -130,9 +130,6 @@ FLAMEROBIN_OBJECTS =  \
 	flamerobin_LogTextControl.o \
 	flamerobin_PrintableHtmlWindow.o \
 	flamerobin_TextControl.o \
-	flamerobin_StyleGuideGTK.o \
-	flamerobin_StyleGuideMAC.o \
-	flamerobin_StyleGuideMSW.o \
 	flamerobin_CharacterSet.o \
 	flamerobin_Collation.o \
 	flamerobin_column.o \
@@ -482,12 +479,6 @@ flamerobin_PrintableHtmlWindow.o: ./src/gui/controls/PrintableHtmlWindow.cpp
 flamerobin_TextControl.o: ./src/gui/controls/TextControl.cpp
 	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
 
-flamerobin_StyleGuideMAC.o: ./src/gui/mac/StyleGuideMAC.cpp
-	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
-
-flamerobin_StyleGuideMSW.o: ./src/gui/msw/StyleGuideMSW.cpp
-	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
-
 flamerobin_CharacterSet.o: ./src/metadata/CharacterSet.cpp
 	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
 
@@ -602,9 +593,6 @@ flamerobin_StatementBuilder.o: ./src/sql/StatementBuilder.cpp
 flamerobin_StyleGuideGTK.o: ./src/gui/gtk/StyleGuideGTK.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) $<
 

diff --git a/Makefile.in b/Makefile.in
@@ -123,9 +123,6 @@ FLAMEROBIN_OBJECTS =  \
 	flamerobin_LogTextControl.o \
 	flamerobin_PrintableHtmlWindow.o \
 	flamerobin_TextControl.o \
-	flamerobin_StyleGuideGTK.o \
-	flamerobin_StyleGuideMAC.o \
-	flamerobin_StyleGuideMSW.o \
 	flamerobin_CharacterSet.o \
 	flamerobin_Collation.o \
 	flamerobin_column.o \
@@ -688,21 +685,12 @@ flamerobin_StatementBuilder.o: $(srcdir)/src/sql/StatementBuilder.cpp $(FLAMEROB
 flamerobin_StyleGuideGTK.o: $(srcdir)/src/gui/gtk/StyleGuideGTK.cpp $(FLAMEROBIN_ODEP)
 	$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/gtk/StyleGuideGTK.cpp
 
-@COND_PLATFORM_UNIX_1@flamerobin_StyleGuideGTK.o: $(srcdir)/src/gui/gtk/StyleGuideGTK.cpp $(FLAMEROBIN_ODEP)
-@COND_PLATFORM_UNIX_1@	$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/gtk/StyleGuideGTK.cpp
-
 flamerobin_StyleGuideMAC.o: $(srcdir)/src/gui/mac/StyleGuideMAC.cpp $(FLAMEROBIN_ODEP)
 	$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/mac/StyleGuideMAC.cpp
 
-@COND_PLATFORM_MACOSX_1@flamerobin_StyleGuideMAC.o: $(srcdir)/src/gui/mac/StyleGuideMAC.cpp $(FLAMEROBIN_ODEP)
-@COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/mac/StyleGuideMAC.cpp
-
 flamerobin_StyleGuideMSW.o: $(srcdir)/src/gui/msw/StyleGuideMSW.cpp $(FLAMEROBIN_ODEP)
 	$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/msw/StyleGuideMSW.cpp
 
-@COND_PLATFORM_WIN32_1@flamerobin_StyleGuideMSW.o: $(srcdir)/src/gui/msw/StyleGuideMSW.cpp $(FLAMEROBIN_ODEP)
-@COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/msw/StyleGuideMSW.cpp
-
 flamerobin_flamerobin_rc.o: $(srcdir)/res/flamerobin.rc $(FLAMEROBIN_ODEP)
 	$(WINDRES) -i$< -o$@  --define HAVE_FRCONFIG_H $(____flamerobin_WXDEBUG_p_1) $(____flamerobin_DEBUGFLAG_p_1) $(__IBPPPLATFORMDEFINE_p_1) --include-dir . --include-dir $(srcdir)/src --include-dir $(srcdir)/src/ibpp --include-dir $(srcdir)/res @WX_INCLUDES@
 

diff --git a/Makefile.suncc b/Makefile.suncc
@@ -133,9 +133,6 @@ FLAMEROBIN_OBJECTS =  \
 	flamerobin_LogTextControl.o \
 	flamerobin_PrintableHtmlWindow.o \
 	flamerobin_TextControl.o \
-	flamerobin_StyleGuideGTK.o \
-	flamerobin_StyleGuideMAC.o \
-	flamerobin_StyleGuideMSW.o \
 	flamerobin_CharacterSet.o \
 	flamerobin_Collation.o \
 	flamerobin_column.o \
@@ -479,12 +476,6 @@ flamerobin_PrintableHtmlWindow.o: ./src/gui/controls/PrintableHtmlWindow.cpp
 flamerobin_TextControl.o: ./src/gui/controls/TextControl.cpp
 	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
 
-flamerobin_StyleGuideMAC.o: ./src/gui/mac/StyleGuideMAC.cpp
-	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
-
-flamerobin_StyleGuideMSW.o: ./src/gui/msw/StyleGuideMSW.cpp
-	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
-
 flamerobin_CharacterSet.o: ./src/metadata/CharacterSet.cpp
 	$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<
 
@@ -599,9 +590,6 @@ flamerobin_StatementBuilder.o: ./src/sql/StatementBuilder.cpp
 flamerobin_StyleGuideGTK.o: ./src/gui/gtk/StyleGuideGTK.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) $<
 

diff --git a/flamerobin.bkl b/flamerobin.bkl
@@ -440,9 +440,6 @@ Accepted values: AMD64, IA64.
         $(SOURCEDIR)/gui/controls/LogTextControl.cpp
         $(SOURCEDIR)/gui/controls/PrintableHtmlWindow.cpp
         $(SOURCEDIR)/gui/controls/TextControl.cpp
-        $(SOURCEDIR)/gui/gtk/StyleGuideGTK.cpp
-        $(SOURCEDIR)/gui/mac/StyleGuideMAC.cpp
-        $(SOURCEDIR)/gui/msw/StyleGuideMSW.cpp
         $(SOURCEDIR)/metadata/CharacterSet.cpp
         $(SOURCEDIR)/metadata/Collation.cpp
         $(SOURCEDIR)/metadata/column.cpp

diff --git a/flamerobin.sln b/flamerobin.sln
@@ -1,27 +1,33 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.6.33829.357
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flamerobin", "flamerobin_flamerobin.vcxproj", "{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}"
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flamerobin", "flamerobin_flamerobin.vcproj", "{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F98A5270-7698-516C-9430-13EBB667AEA5} = {F98A5270-7698-516C-9430-13EBB667AEA5}
+		{F98A5270-7698-516C-9430-13EBB667AEA5} = {F98A5270-7698-516C-9430-13EBB667AEA5}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ibpp", "flamerobin_ibpp.vcxproj", "{F98A5270-7698-516C-9430-13EBB667AEA5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ibpp", "flamerobin_ibpp.vcproj", "{F98A5270-7698-516C-9430-13EBB667AEA5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug Dynamic|Win32 = Debug Dynamic|Win32
 		Debug Static|Win32 = Debug Static|Win32
+		Release Dynamic|Win32 = Release Dynamic|Win32
+		Release Static|Win32 = Release Static|Win32
 		DLL Debug Dynamic|Win32 = DLL Debug Dynamic|Win32
 		DLL Debug Static|Win32 = DLL Debug Static|Win32
 		DLL Release Dynamic|Win32 = DLL Release Dynamic|Win32
 		DLL Release Static|Win32 = DLL Release Static|Win32
-		Release Dynamic|Win32 = Release Dynamic|Win32
-		Release Static|Win32 = Release Static|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|Win32.Build.0 = Debug Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|Win32.Build.0 = Debug Static|Win32
+		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32
+		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32
+		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.ActiveCfg = Release Static|Win32
+		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.Build.0 = Release Static|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Dynamic|Win32.ActiveCfg = DLL Debug Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Dynamic|Win32.Build.0 = DLL Debug Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Debug Static|Win32.ActiveCfg = DLL Debug Static|Win32
@@ -30,14 +36,14 @@ Global
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Dynamic|Win32.Build.0 = DLL Release Dynamic|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Static|Win32.ActiveCfg = DLL Release Static|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.DLL Release Static|Win32.Build.0 = DLL Release Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.ActiveCfg = Release Static|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Release Static|Win32.Build.0 = Release Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|Win32.ActiveCfg = Debug Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|Win32.Build.0 = Debug Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|Win32.Build.0 = Debug Static|Win32
+		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32
+		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32
+		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.ActiveCfg = Release Static|Win32
+		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.Build.0 = Release Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Dynamic|Win32.ActiveCfg = DLL Debug Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Dynamic|Win32.Build.0 = DLL Debug Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Debug Static|Win32.ActiveCfg = DLL Debug Static|Win32
@@ -46,15 +52,9 @@ Global
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Dynamic|Win32.Build.0 = DLL Release Dynamic|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Static|Win32.ActiveCfg = DLL Release Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.DLL Release Static|Win32.Build.0 = DLL Release Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.ActiveCfg = Release Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Dynamic|Win32.Build.0 = Release Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.ActiveCfg = Release Static|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Release Static|Win32.Build.0 = Release Static|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B33A7A33-AA70-4378-8923-FA9DD5CC4CB0}
-	EndGlobalSection
 EndGlobal
+