Skip to content

Commit

Permalink
Refactor service frame
Browse files Browse the repository at this point in the history
  • Loading branch information
Jdochoa committed Oct 30, 2022
1 parent 347e33f commit c5d1c5a
Show file tree
Hide file tree
Showing 26 changed files with 437 additions and 689 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ list(APPEND SOURCE_LIST
${SOURCEDIR}/gui/ReorderFieldsDialog.cpp
${SOURCEDIR}/gui/RestoreFrame.cpp
${SOURCEDIR}/gui/ServerRegistrationDialog.cpp
${SOURCEDIR}/gui/ServiceBaseFrame.cpp
${SOURCEDIR}/gui/ShutdownStartupBaseFrame.cpp
${SOURCEDIR}/gui/ShutdownFrame.cpp
${SOURCEDIR}/gui/SimpleHtmlFrame.cpp
${SOURCEDIR}/gui/StatementHistoryDialog.cpp
${SOURCEDIR}/gui/StartupFrame.cpp
${SOURCEDIR}/gui/StyleGuide.cpp
${SOURCEDIR}/gui/ThreadBaseFrame.cpp
${SOURCEDIR}/gui/UserDialog.cpp
${SOURCEDIR}/gui/UsernamePasswordDialog.cpp
${SOURCEDIR}/logger.cpp
Expand Down Expand Up @@ -242,13 +242,13 @@ list(APPEND HEADER_LIST
${SOURCEDIR}/gui/ReorderFieldsDialog.h
${SOURCEDIR}/gui/RestoreFrame.h
${SOURCEDIR}/gui/ServerRegistrationDialog.h
${SOURCEDIR}/gui/ServiceBaseFrame.h
${SOURCEDIR}/gui/ShutdownStartupBaseFrame.h
${SOURCEDIR}/gui/ShutdownFrame.h
${SOURCEDIR}/gui/SimpleHtmlFrame.h
${SOURCEDIR}/gui/StatementHistoryDialog.h
${SOURCEDIR}/gui/StartupFrame.h
${SOURCEDIR}/gui/StyleGuide.h
${SOURCEDIR}/gui/ThreadBaseFrame.h
${SOURCEDIR}/gui/UserDialog.h
${SOURCEDIR}/gui/UsernamePasswordDialog.h
${SOURCEDIR}/Isaac.h
Expand Down
8 changes: 4 additions & 4 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ FLAMEROBIN_OBJECTS = \
flamerobin_ReorderFieldsDialog.o \
flamerobin_RestoreFrame.o \
flamerobin_ServerRegistrationDialog.o \
flamerobin_ServiceBaseFrame.o \
flamerobin_ShutdownStartupBaseFrame.o \
flamerobin_ShutdownFrame.o \
flamerobin_SimpleHtmlFrame.o \
flamerobin_StatementHistoryDialog.o \
flamerobin_StartupFrame.o \
flamerobin_StyleGuide.o \
flamerobin_ThreadBaseFrame.o \
flamerobin_UserDialog.o \
flamerobin_UsernamePasswordDialog.o \
flamerobin_logger.o \
Expand Down Expand Up @@ -422,6 +422,9 @@ flamerobin_RestoreFrame.o: ./src/gui/RestoreFrame.cpp
flamerobin_ServerRegistrationDialog.o: ./src/gui/ServerRegistrationDialog.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_ServiceBaseFrame.o: ./${SOURCEDIR}/gui/ServiceBaseFrame.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_ShutdownStartupBaseFrame.o: ./${SOURCEDIR}/gui/ShutdownStartupBaseFrame.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

Expand All @@ -440,9 +443,6 @@ flamerobin_StartupFrame.o: ./${SOURCEDIR}/gui/StartupFrame.cpp
flamerobin_StyleGuide.o: ./src/gui/StyleGuide.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_ThreadBaseFrame.o: ./${SOURCEDIR}/gui/ThreadBaseFrame.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

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

Expand Down
8 changes: 4 additions & 4 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ FLAMEROBIN_OBJECTS = \
flamerobin_ReorderFieldsDialog.o \
flamerobin_RestoreFrame.o \
flamerobin_ServerRegistrationDialog.o \
flamerobin_ServiceBaseFrame.o \
flamerobin_ShutdownStartupBaseFrame.o \
flamerobin_ShutdownFrame.o \
flamerobin_SimpleHtmlFrame.o \
flamerobin_StatementHistoryDialog.o \
flamerobin_StartupFrame.o \
flamerobin_StyleGuide.o \
flamerobin_ThreadBaseFrame.o \
flamerobin_UserDialog.o \
flamerobin_UsernamePasswordDialog.o \
flamerobin_logger.o \
Expand Down Expand Up @@ -515,6 +515,9 @@ flamerobin_RestoreFrame.o: $(srcdir)/src/gui/RestoreFrame.cpp $(FLAMEROBIN_ODEP)
flamerobin_ServerRegistrationDialog.o: $(srcdir)/src/gui/ServerRegistrationDialog.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/ServerRegistrationDialog.cpp

flamerobin_ServiceBaseFrame.o: $(srcdir)/${SOURCEDIR}/gui/ServiceBaseFrame.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/${SOURCEDIR}/gui/ServiceBaseFrame.cpp

flamerobin_ShutdownStartupBaseFrame.o: $(srcdir)/${SOURCEDIR}/gui/ShutdownStartupBaseFrame.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/${SOURCEDIR}/gui/ShutdownStartupBaseFrame.cpp

Expand All @@ -533,9 +536,6 @@ flamerobin_StartupFrame.o: $(srcdir)/${SOURCEDIR}/gui/StartupFrame.cpp $(FLAMERO
flamerobin_StyleGuide.o: $(srcdir)/src/gui/StyleGuide.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/src/gui/StyleGuide.cpp

flamerobin_ThreadBaseFrame.o: $(srcdir)/${SOURCEDIR}/gui/ThreadBaseFrame.cpp $(FLAMEROBIN_ODEP)
$(CXXC) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(srcdir)/${SOURCEDIR}/gui/ThreadBaseFrame.cpp

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

Expand Down
8 changes: 4 additions & 4 deletions Makefile.suncc
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ FLAMEROBIN_OBJECTS = \
flamerobin_ReorderFieldsDialog.o \
flamerobin_RestoreFrame.o \
flamerobin_ServerRegistrationDialog.o \
flamerobin_ServiceBaseFrame.o \
flamerobin_ShutdownStartupBaseFrame.o \
flamerobin_ShutdownFrame.o \
flamerobin_SimpleHtmlFrame.o \
flamerobin_StatementHistoryDialog.o \
flamerobin_StartupFrame.o \
flamerobin_StyleGuide.o \
flamerobin_ThreadBaseFrame.o \
flamerobin_UserDialog.o \
flamerobin_UsernamePasswordDialog.o \
flamerobin_logger.o \
Expand Down Expand Up @@ -419,6 +419,9 @@ flamerobin_RestoreFrame.o: ./src/gui/RestoreFrame.cpp
flamerobin_ServerRegistrationDialog.o: ./src/gui/ServerRegistrationDialog.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_ServiceBaseFrame.o: ./${SOURCEDIR}/gui/ServiceBaseFrame.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_ShutdownStartupBaseFrame.o: ./${SOURCEDIR}/gui/ShutdownStartupBaseFrame.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

Expand All @@ -437,9 +440,6 @@ flamerobin_StartupFrame.o: ./${SOURCEDIR}/gui/StartupFrame.cpp
flamerobin_StyleGuide.o: ./src/gui/StyleGuide.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

flamerobin_ThreadBaseFrame.o: ./${SOURCEDIR}/gui/ThreadBaseFrame.cpp
$(CXX) -c -o $@ $(FLAMEROBIN_CXXFLAGS) $(CPPDEPS) $<

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

Expand Down
4 changes: 2 additions & 2 deletions flamerobin.bkl
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,13 @@ Accepted values: AMD64, IA64.
$(SOURCEDIR)/gui/ReorderFieldsDialog.h
$(SOURCEDIR)/gui/RestoreFrame.h
$(SOURCEDIR)/gui/ServerRegistrationDialog.h
${SOURCEDIR}/gui/ServiceBaseFrame.h
${SOURCEDIR}/gui/ShutdownStartupBaseFrame.h
${SOURCEDIR}/gui/ShutdownFrame.h
$(SOURCEDIR)/gui/SimpleHtmlFrame.h
$(SOURCEDIR)/gui/StatementHistoryDialog.h
${SOURCEDIR}/gui/StartupFrame.h
$(SOURCEDIR)/gui/StyleGuide.h
${SOURCEDIR}/gui/ThreadBaseFrame.h
$(SOURCEDIR)/gui/UserDialog.h
$(SOURCEDIR)/gui/UsernamePasswordDialog.h
$(SOURCEDIR)/Isaac.h
Expand Down Expand Up @@ -420,13 +420,13 @@ Accepted values: AMD64, IA64.
$(SOURCEDIR)/gui/ReorderFieldsDialog.cpp
$(SOURCEDIR)/gui/RestoreFrame.cpp
$(SOURCEDIR)/gui/ServerRegistrationDialog.cpp
${SOURCEDIR}/gui/ServiceBaseFrame.cpp
${SOURCEDIR}/gui/ShutdownStartupBaseFrame.cpp
${SOURCEDIR}/gui/ShutdownFrame.cpp
$(SOURCEDIR)/gui/SimpleHtmlFrame.cpp
$(SOURCEDIR)/gui/StatementHistoryDialog.cpp
${SOURCEDIR}/gui/StartupFrame.cpp
$(SOURCEDIR)/gui/StyleGuide.cpp
${SOURCEDIR}/gui/ThreadBaseFrame.cpp
$(SOURCEDIR)/gui/UserDialog.cpp
$(SOURCEDIR)/gui/UsernamePasswordDialog.cpp
$(SOURCEDIR)/logger.cpp
Expand Down
10 changes: 5 additions & 5 deletions flamerobin.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -185,20 +185,20 @@
<Unit filename="src/gui/RestoreFrame.h" />
<Unit filename="src/gui/ServerRegistrationDialog.cpp" />
<Unit filename="src/gui/ServerRegistrationDialog.h" />
<Unit filename="src/gui/ShutdownStartupBaseFrame.h" />
<Unit filename="src/gui/ServiceBaseFrame.cpp" />
<Unit filename="src/gui/ServiceBaseFrame.h" />
<Unit filename="src/gui/ShutdownStartupBaseFrame.cpp" />
<Unit filename="src/gui/ShutdownFrame.h" />
<Unit filename="src/gui/ShutdownStartupBaseFrame.h" />
<Unit filename="src/gui/ShutdownFrame.cpp" />
<Unit filename="src/gui/ShutdownFrame.h" />
<Unit filename="src/gui/SimpleHtmlFrame.cpp" />
<Unit filename="src/gui/SimpleHtmlFrame.h" />
<Unit filename="src/gui/StatementHistoryDialog.cpp" />
<Unit filename="src/gui/StatementHistoryDialog.h" />
<Unit filename="src/gui/StartupFrame.h" />
<Unit filename="src/gui/StartupFrame.cpp" />
<Unit filename="src/gui/StartupFrame.h" />
<Unit filename="src/gui/StyleGuide.cpp" />
<Unit filename="src/gui/StyleGuide.h" />
<Unit filename="src/gui/ThreadBaseFrame.cpp" />
<Unit filename="src/gui/ThreadBaseFrame.h" />
<Unit filename="src/gui/TriggerWizardDialog.cpp" />
<Unit filename="src/gui/TriggerWizardDialog.h" />
<Unit filename="src/gui/UserDialog.cpp" />
Expand Down
44 changes: 22 additions & 22 deletions flamerobin.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -888,37 +888,37 @@
};
0000000000000000000000a3 = {
isa = PBXFileReference;
path = ShutdownStartupBaseFrame.cpp;
path = ServiceBaseFrame.cpp;
sourceTree = "<group>";
};
0000000000000000000000a5 = {
isa = PBXFileReference;
path = ShutdownFrame.cpp;
path = ShutdownStartupBaseFrame.cpp;
sourceTree = "<group>";
};
0000000000000000000000a7 = {
isa = PBXFileReference;
path = SimpleHtmlFrame.cpp;
path = ShutdownFrame.cpp;
sourceTree = "<group>";
};
0000000000000000000000a9 = {
isa = PBXFileReference;
path = StatementHistoryDialog.cpp;
path = SimpleHtmlFrame.cpp;
sourceTree = "<group>";
};
0000000000000000000000ab = {
isa = PBXFileReference;
path = StartupFrame.cpp;
path = StatementHistoryDialog.cpp;
sourceTree = "<group>";
};
0000000000000000000000ad = {
isa = PBXFileReference;
path = StyleGuide.cpp;
path = StartupFrame.cpp;
sourceTree = "<group>";
};
0000000000000000000000af = {
isa = PBXFileReference;
path = ThreadBaseFrame.cpp;
path = StyleGuide.cpp;
sourceTree = "<group>";
};
0000000000000000000000b1 = {
Expand Down Expand Up @@ -1458,37 +1458,37 @@
};
00000000000000000000014c = {
isa = PBXFileReference;
path = ShutdownStartupBaseFrame.h;
path = ServiceBaseFrame.h;
sourceTree = "<group>";
};
00000000000000000000014d = {
isa = PBXFileReference;
path = ShutdownFrame.h;
path = ShutdownStartupBaseFrame.h;
sourceTree = "<group>";
};
00000000000000000000014e = {
isa = PBXFileReference;
path = SimpleHtmlFrame.h;
path = ShutdownFrame.h;
sourceTree = "<group>";
};
00000000000000000000014f = {
isa = PBXFileReference;
path = StatementHistoryDialog.h;
path = SimpleHtmlFrame.h;
sourceTree = "<group>";
};
000000000000000000000150 = {
isa = PBXFileReference;
path = StartupFrame.h;
path = StatementHistoryDialog.h;
sourceTree = "<group>";
};
000000000000000000000151 = {
isa = PBXFileReference;
path = StyleGuide.h;
path = StartupFrame.h;
sourceTree = "<group>";
};
000000000000000000000152 = {
isa = PBXFileReference;
path = ThreadBaseFrame.h;
path = StyleGuide.h;
sourceTree = "<group>";
};
000000000000000000000153 = {
Expand Down Expand Up @@ -2095,9 +2095,9 @@
00000000000000000000009d,
00000000000000000000009f,
0000000000000000000000a1,
0000000000000000000000a7,
0000000000000000000000a9,
0000000000000000000000ad,
0000000000000000000000ab,
0000000000000000000000af,
0000000000000000000000b1,
0000000000000000000000b3,
00000000000000000000011f,
Expand Down Expand Up @@ -2134,9 +2134,9 @@
000000000000000000000149,
00000000000000000000014a,
00000000000000000000014b,
00000000000000000000014e,
00000000000000000000014f,
000000000000000000000151,
000000000000000000000150,
000000000000000000000152,
000000000000000000000153,
000000000000000000000154,
);
Expand Down Expand Up @@ -2176,13 +2176,13 @@
00000000000000000000008d,
0000000000000000000000a3,
0000000000000000000000a5,
0000000000000000000000ab,
0000000000000000000000af,
0000000000000000000000a7,
0000000000000000000000ad,
000000000000000000000142,
00000000000000000000014c,
00000000000000000000014d,
000000000000000000000150,
000000000000000000000152,
00000000000000000000014e,
000000000000000000000151,
);
path = "${SOURCEDIR}/gui";
sourceTree = "<group>";
Expand Down
4 changes: 2 additions & 2 deletions flamerobin_flamerobin.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@
<ClCompile Include="src\gui\StartupFrame.cpp" />
<ClCompile Include="src\gui\StatementHistoryDialog.cpp" />
<ClCompile Include="src\gui\StyleGuide.cpp" />
<ClCompile Include="src\gui\ThreadBaseFrame.cpp" />
<ClCompile Include="src\gui\ServiceBaseFrame.cpp" />
<ClCompile Include="src\gui\UserDialog.cpp" />
<ClCompile Include="src\gui\UsernamePasswordDialog.cpp" />
<ClCompile Include="src\logger.cpp" />
Expand Down Expand Up @@ -1184,7 +1184,7 @@
<ClInclude Include="src\gui\StartupFrame.h" />
<ClInclude Include="src\gui\StatementHistoryDialog.h" />
<ClInclude Include="src\gui\StyleGuide.h" />
<ClInclude Include="src\gui\ThreadBaseFrame.h" />
<ClInclude Include="src\gui\ServiceBaseFrame.h" />
<ClInclude Include="src\gui\UserDialog.h" />
<ClInclude Include="src\gui\UsernamePasswordDialog.h" />
<ClInclude Include="src\Isaac.h" />
Expand Down
4 changes: 2 additions & 2 deletions flamerobin_flamerobin.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
<ClCompile Include="src\core\FRDecimal.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\gui\ThreadBaseFrame.cpp">
<ClCompile Include="src\gui\ServiceBaseFrame.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\gui\ShutdownFrame.cpp">
Expand Down Expand Up @@ -704,7 +704,7 @@
<ClInclude Include="src\core\FRDecimal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\gui\ThreadBaseFrame.h">
<ClInclude Include="src\gui\ServiceBaseFrame.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\gui\ShutdownFrame.h">
Expand Down
8 changes: 4 additions & 4 deletions makefile.bcc
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ FLAMEROBIN_OBJECTS = \
bccu$(R_OPT)$(D_OPT)\flamerobin_ReorderFieldsDialog.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_RestoreFrame.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_ServerRegistrationDialog.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_ServiceBaseFrame.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_ShutdownStartupBaseFrame.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_ShutdownFrame.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_SimpleHtmlFrame.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_StatementHistoryDialog.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_StartupFrame.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_StyleGuide.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_ThreadBaseFrame.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_UserDialog.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_UsernamePasswordDialog.obj \
bccu$(R_OPT)$(D_OPT)\flamerobin_logger.obj \
Expand Down Expand Up @@ -473,6 +473,9 @@ bccu$(R_OPT)$(D_OPT)\flamerobin_RestoreFrame.obj: .\src\gui\RestoreFrame.cpp
bccu$(R_OPT)$(D_OPT)\flamerobin_ServerRegistrationDialog.obj: .\src\gui\ServerRegistrationDialog.cpp
$(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\ServerRegistrationDialog.cpp

bccu$(R_OPT)$(D_OPT)\flamerobin_ServiceBaseFrame.obj: .\${SOURCEDIR}\gui\ServiceBaseFrame.cpp
$(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\${SOURCEDIR}\gui\ServiceBaseFrame.cpp

bccu$(R_OPT)$(D_OPT)\flamerobin_ShutdownStartupBaseFrame.obj: .\${SOURCEDIR}\gui\ShutdownStartupBaseFrame.cpp
$(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\${SOURCEDIR}\gui\ShutdownStartupBaseFrame.cpp

Expand All @@ -491,9 +494,6 @@ bccu$(R_OPT)$(D_OPT)\flamerobin_StartupFrame.obj: .\${SOURCEDIR}\gui\StartupFram
bccu$(R_OPT)$(D_OPT)\flamerobin_StyleGuide.obj: .\src\gui\StyleGuide.cpp
$(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\StyleGuide.cpp

bccu$(R_OPT)$(D_OPT)\flamerobin_ThreadBaseFrame.obj: .\${SOURCEDIR}\gui\ThreadBaseFrame.cpp
$(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\${SOURCEDIR}\gui\ThreadBaseFrame.cpp

bccu$(R_OPT)$(D_OPT)\flamerobin_UserDialog.obj: .\src\gui\UserDialog.cpp
$(CXX) -q -c -P -o$@ $(FLAMEROBIN_CXXFLAGS) .\src\gui\UserDialog.cpp

Expand Down
Loading

0 comments on commit c5d1c5a

Please sign in to comment.