Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some improvements for Style Manager. #356

Merged
merged 15 commits into from
Nov 30, 2023
Merged

Some improvements for Style Manager. #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
73de35f
New Style Manager
Nov 15, 2023
9682f54
New Preference dialog theme
Nov 15, 2023
5e13a04
Remove Dialog Settings theme
Nov 15, 2023
6cb5df4
Remove Style Manager
Nov 15, 2023
37a713c
Clean
Nov 15, 2023
8c27962
Add observer
Nov 15, 2023
d84dfb2
new files
Nov 15, 2023
ad5805d
Fix
Nov 15, 2023
ba2f1ef
Ad to functionality to cancel button in preference dialog.
Nov 24, 2023
17f49fb
Adds functionality to show changes in open SQL Editors.
Nov 24, 2023
4ca4102
Removed previous settings the font for grid and font for SQL editor.
Nov 24, 2023
81b6408
Restore Screen Button #351
Nov 25, 2023
516eee8
Replace Collation with Collations #352
Nov 25, 2023
2f1d0c4
Fix some warnings
Nov 25, 2023
f4386f8
Merge branch 'mariuz:master' into master
Jdochoa Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ list(APPEND SOURCE_LIST
${SOURCEDIR}/gui/FindDialog.cpp
${SOURCEDIR}/gui/FRLayoutConfig.cpp
${SOURCEDIR}/gui/FRStyle.cpp
${SOURCEDIR}/gui/FRStyleManager.cpp
${SOURCEDIR}/gui/GUIURIHandlerHelper.cpp
${SOURCEDIR}/gui/HtmlHeaderMetadataItemVisitor.cpp
${SOURCEDIR}/gui/HtmlTemplateProcessor.cpp
Expand All @@ -116,6 +117,7 @@ list(APPEND SOURCE_LIST
${SOURCEDIR}/gui/MultilineEnterDialog.cpp
${SOURCEDIR}/gui/PreferencesDialog.cpp
${SOURCEDIR}/gui/PreferencesDialogSettings.cpp
${SOURCEDIR}/gui/PreferencesDialogStyle.cpp
${SOURCEDIR}/gui/PrivilegesDialog.cpp
${SOURCEDIR}/gui/ProgressDialog.cpp
${SOURCEDIR}/gui/ReorderFieldsDialog.cpp
Expand Down Expand Up @@ -227,6 +229,7 @@ list(APPEND HEADER_LIST
${SOURCEDIR}/gui/FindDialog.h
${SOURCEDIR}/gui/FRLayoutConfig.h
${SOURCEDIR}/gui/FRStyle.h
${SOURCEDIR}/gui/FRStyleManager.h
${SOURCEDIR}/gui/GUIURIHandlerHelper.h
${SOURCEDIR}/gui/HtmlHeaderMetadataItemVisitor.h
${SOURCEDIR}/gui/HtmlTemplateProcessor.h
Expand All @@ -236,6 +239,7 @@ list(APPEND HEADER_LIST
${SOURCEDIR}/gui/MetadataItemPropertiesFrame.h
${SOURCEDIR}/gui/MultilineEnterDialog.h
${SOURCEDIR}/gui/PreferencesDialog.h
${SOURCEDIR}/gui/PreferencesDialogStyle.h
${SOURCEDIR}/gui/PrivilegesDialog.h
${SOURCEDIR}/gui/ProgressDialog.h
${SOURCEDIR}/gui/ReorderFieldsDialog.h
Expand Down
8 changes: 8 additions & 0 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ FLAMEROBIN_OBJECTS = \
flamerobin_FindDialog.o \
flamerobin_FRLayoutConfig.o \
flamerobin_FRStyle.o \
flamerobin_FRStyleManager.o \
flamerobin_GUIURIHandlerHelper.o \
flamerobin_HtmlHeaderMetadataItemVisitor.o \
flamerobin_HtmlTemplateProcessor.o \
Expand All @@ -106,6 +107,7 @@ FLAMEROBIN_OBJECTS = \
flamerobin_MultilineEnterDialog.o \
flamerobin_PreferencesDialog.o \
flamerobin_PreferencesDialogSettings.o \
flamerobin_PreferencesDialogStyle.o \
flamerobin_PrivilegesDialog.o \
flamerobin_ProgressDialog.o \
flamerobin_ReorderFieldsDialog.o \
Expand Down Expand Up @@ -377,6 +379,9 @@ flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp
flamerobin_FRStyle.o: ./src/gui/FRStyle.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_FRStyleManager.o: ./src/gui/FRStyleManager.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

Expand Down Expand Up @@ -407,6 +412,9 @@ flamerobin_PreferencesDialog.o: ./src/gui/PreferencesDialog.cpp
flamerobin_PreferencesDialogSettings.o: ./src/gui/PreferencesDialogSettings.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_PreferencesDialogStyle.o: ./src/gui/PreferencesDialogStyle.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_PrivilegesDialog.o: ./src/gui/PrivilegesDialog.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

Expand Down
8 changes: 8 additions & 0 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ FLAMEROBIN_OBJECTS = \
flamerobin_FindDialog.o \
flamerobin_FRLayoutConfig.o \
flamerobin_FRStyle.o \
flamerobin_FRStyleManager.o \
flamerobin_GUIURIHandlerHelper.o \
flamerobin_HtmlHeaderMetadataItemVisitor.o \
flamerobin_HtmlTemplateProcessor.o \
Expand All @@ -99,6 +100,7 @@ FLAMEROBIN_OBJECTS = \
flamerobin_MultilineEnterDialog.o \
flamerobin_PreferencesDialog.o \
flamerobin_PreferencesDialogSettings.o \
flamerobin_PreferencesDialogStyle.o \
flamerobin_PrivilegesDialog.o \
flamerobin_ProgressDialog.o \
flamerobin_ReorderFieldsDialog.o \
Expand Down Expand Up @@ -469,6 +471,9 @@ flamerobin_FRLayoutConfig.o: $(srcdir)/src/gui/FRLayoutConfig.cpp $(FLAMEROBIN_O
flamerobin_FRStyle.o: $(srcdir)/src/gui/FRStyle.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/FRStyle.cpp

flamerobin_FRStyleManager.o: $(srcdir)/src/gui/FRStyleManager.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/FRStyleManager.cpp

flamerobin_GUIURIHandlerHelper.o: $(srcdir)/src/gui/GUIURIHandlerHelper.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/GUIURIHandlerHelper.cpp

Expand Down Expand Up @@ -499,6 +504,9 @@ flamerobin_PreferencesDialog.o: $(srcdir)/src/gui/PreferencesDialog.cpp $(FLAMER
flamerobin_PreferencesDialogSettings.o: $(srcdir)/src/gui/PreferencesDialogSettings.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/PreferencesDialogSettings.cpp

flamerobin_PreferencesDialogStyle.o: $(srcdir)/src/gui/PreferencesDialogStyle.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/PreferencesDialogStyle.cpp

flamerobin_PrivilegesDialog.o: $(srcdir)/src/gui/PrivilegesDialog.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/PrivilegesDialog.cpp

Expand Down
8 changes: 8 additions & 0 deletions Makefile.suncc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ FLAMEROBIN_OBJECTS = \
flamerobin_FindDialog.o \
flamerobin_FRLayoutConfig.o \
flamerobin_FRStyle.o \
flamerobin_FRStyleManager.o \
flamerobin_GUIURIHandlerHelper.o \
flamerobin_HtmlHeaderMetadataItemVisitor.o \
flamerobin_HtmlTemplateProcessor.o \
Expand All @@ -109,6 +110,7 @@ FLAMEROBIN_OBJECTS = \
flamerobin_MultilineEnterDialog.o \
flamerobin_PreferencesDialog.o \
flamerobin_PreferencesDialogSettings.o \
flamerobin_PreferencesDialogStyle.o \
flamerobin_PrivilegesDialog.o \
flamerobin_ProgressDialog.o \
flamerobin_ReorderFieldsDialog.o \
Expand Down Expand Up @@ -374,6 +376,9 @@ flamerobin_FRLayoutConfig.o: ./src/gui/FRLayoutConfig.cpp
flamerobin_FRStyle.o: ./src/gui/FRStyle.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_FRStyleManager.o: ./src/gui/FRStyleManager.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_GUIURIHandlerHelper.o: ./src/gui/GUIURIHandlerHelper.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

Expand Down Expand Up @@ -404,6 +409,9 @@ flamerobin_PreferencesDialog.o: ./src/gui/PreferencesDialog.cpp
flamerobin_PreferencesDialogSettings.o: ./src/gui/PreferencesDialogSettings.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_PreferencesDialogStyle.o: ./src/gui/PreferencesDialogStyle.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_PrivilegesDialog.o: ./src/gui/PrivilegesDialog.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

Expand Down
32 changes: 3 additions & 29 deletions conf-defs/fr_settings.confdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,29 +402,13 @@
<description>SQL Style Editor </description>
<image>0</image>
<setting type="themecombobox">
<caption>Select theme:</caption>
<description>Select the file with the style</description>
<caption> </caption>
<description>Select the file with the primary style</description>
<key>StyleTheme</key>
<default>Default</default>
<default>styles</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>
Expand Down Expand Up @@ -466,16 +450,6 @@
<caption>Append time zone name.</caption>
</option>
</setting>
<setting type="font">
<caption>Grid header font:</caption>
<key>DataGridHeaderFont</key>
<aligngroup>1</aligngroup>
</setting>
<setting type="font">
<caption>Grid cell font:</caption>
<key>DataGridFont</key>
<aligngroup>1</aligngroup>
</setting>
<setting type="checkbox">
<caption>Re-format float and double precision numbers</caption>
<description>If unchecked, prints decimal numbers as returned from server</description>
Expand Down
4 changes: 4 additions & 0 deletions flamerobin.bkl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ Accepted values: AMD64, IA64.
$(SOURCEDIR)/gui/FindDialog.h
$(SOURCEDIR)/gui/FRLayoutConfig.h
$(SOURCEDIR)/gui/FRStyle.h
$(SOURCEDIR)/gui/FRStyleManager.h
$(SOURCEDIR)/gui/GUIURIHandlerHelper.h
$(SOURCEDIR)/gui/HtmlHeaderMetadataItemVisitor.h
$(SOURCEDIR)/gui/HtmlTemplateProcessor.h
Expand All @@ -283,6 +284,7 @@ Accepted values: AMD64, IA64.
$(SOURCEDIR)/gui/MetadataItemPropertiesFrame.h
$(SOURCEDIR)/gui/MultilineEnterDialog.h
$(SOURCEDIR)/gui/PreferencesDialog.h
$(SOURCEDIR)/gui/PreferencesDialogStyle.h
$(SOURCEDIR)/gui/PrivilegesDialog.h
$(SOURCEDIR)/gui/ProgressDialog.h
$(SOURCEDIR)/gui/ReorderFieldsDialog.h
Expand Down Expand Up @@ -406,6 +408,7 @@ Accepted values: AMD64, IA64.
$(SOURCEDIR)/gui/FindDialog.cpp
$(SOURCEDIR)/gui/FRLayoutConfig.cpp
$(SOURCEDIR)/gui/FRStyle.cpp
$(SOURCEDIR)/gui/FRStyleManager.cpp
$(SOURCEDIR)/gui/GUIURIHandlerHelper.cpp
$(SOURCEDIR)/gui/HtmlHeaderMetadataItemVisitor.cpp
$(SOURCEDIR)/gui/HtmlTemplateProcessor.cpp
Expand All @@ -416,6 +419,7 @@ Accepted values: AMD64, IA64.
$(SOURCEDIR)/gui/MultilineEnterDialog.cpp
$(SOURCEDIR)/gui/PreferencesDialog.cpp
$(SOURCEDIR)/gui/PreferencesDialogSettings.cpp
$(SOURCEDIR)/gui/PreferencesDialogStyle.cpp
$(SOURCEDIR)/gui/PrivilegesDialog.cpp
$(SOURCEDIR)/gui/ProgressDialog.cpp
$(SOURCEDIR)/gui/ReorderFieldsDialog.cpp
Expand Down
38 changes: 19 additions & 19 deletions flamerobin.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
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
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}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ibpp", "flamerobin_ibpp.vcproj", "{F98A5270-7698-516C-9430-13EBB667AEA5}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ibpp", "flamerobin_ibpp.vcxproj", "{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
Expand All @@ -36,14 +30,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
Expand All @@ -52,9 +46,15 @@ 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 = {DA2F3312-7A9E-4DD4-97E7-3C5BD6644232}
EndGlobalSection
EndGlobal

Loading
Loading