Merge pull request #72 from krazkidd/12-wxformbuilder

Add wxFormBuilder project

.vscode/c_cpp_properties.json

@@ -4,6 +4,7 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceFolder}/include/**",
+                "${workspaceFolder}/src/wxfb/**",
                 "${workspaceFolder}/build/vcpkg_installed/x64-linux/include/**",
                 "/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.2",
                 "/usr/include/wx-3.2"

README.md

@@ -36,6 +36,10 @@ vcpkg is designed to statically compile programs and makes it difficult to rely
 
 However, a number of build tools are required to be present on the system. A `Dockerfile` documents which packages must be installed to acquire the necessary tools on a Debian-based system. You may install these directly or use the Docker-based build.
 
+### Design Tools
+
+This project makes use of [wxFormBuilder](https://github.com/wxFormBuilder/wxFormBuilder) for rapid UI iteration. The project file and generated classes can be found under `src/wxfb`.
+
 ## Build Steps
 
 > [!NOTE]
@@ -99,16 +103,6 @@ For subsequent builds, vcpkg will make use of the binary cache under `$(pwd)/bui
 > [!WARNING]
 > This is the default vcpkg binary cache directory for this project. If your host system is Debian 12 (Bookworm), it should be safe to bind-mount this directory and share installed dependencies with the container. Users on other systems wishing to build with and without Docker may want to bind-mount to a different host directory (although builds targeting different system triplets can coexist).
 
-## Design Tools
-
-This project is **not yet** making use of wxWidgets' XRC support. In the future, one of the following design tools will be recommended for work on the kdeck project:
-
-* codeblocks
-* codelite
-* wxglade
-
-**Suggestions are welcome.**
-
 ## Kalshi API
 
 Kalshi provides a [REST API](https://trading-api.readme.io/reference/getting-started) for getting portfolio information and making trades, among other things. kdeck uses the [Oat++](https://oatpp.io/) library to make API requests[^1].

include/ui/ExchangeAnnouncementsDialog.hpp

@@ -3,22 +3,18 @@
 
 #include <wx/wx.h>
 
+#include "App.h" // wxfb
+
 namespace kdeck
 {
     class Api;
 
-    class ExchangeAnnouncementsDialog : public wxDialog
+    class ExchangeAnnouncementsDialog : public wxfb::ExchangeAnnouncementsDialog
     {
     public:
-        ExchangeAnnouncementsDialog(wxWindow* parent, wxWindowID winid = wxID_ANY, const wxString &title = "Exchange Announcements");
+        ExchangeAnnouncementsDialog(wxWindow* parent, wxWindowID winid = wxID_ANY);
 
         void UpdateStuff(Api* api);
-
-    private:
-        wxBoxSizer* boxSizer;
-
-        // init
-        void Setup();
     };
 }
 

include/ui/ExchangeScheduleDialog.hpp

@@ -3,30 +3,18 @@
 
 #include <wx/wx.h>
 
+#include "App.h" // wxfb
+
 namespace kdeck
 {
     class Api;
 
-    class ExchangeScheduleDialog : public wxDialog
+    class ExchangeScheduleDialog : public wxfb::ExchangeScheduleDialog
     {
     public:
-        ExchangeScheduleDialog(wxWindow* parent, wxWindowID winid = wxID_ANY, const wxString &title = "Exchange Schedule");
+        ExchangeScheduleDialog(wxWindow* parent, wxWindowID winid = wxID_ANY);
 
         void UpdateStuff(Api* api);
-
-    private:
-        wxStaticText* lblSundaySchedule;
-        wxStaticText* lblMondaySchedule;
-        wxStaticText* lblTuesdaySchedule;
-        wxStaticText* lblWednesdaySchedule;
-        wxStaticText* lblThursdaySchedule;
-        wxStaticText* lblFridaySchedule;
-        wxStaticText* lblSaturdaySchedule;
-
-        wxBoxSizer* boxSizer;
-
-        // init
-        void Setup();
     };
 }
 

include/ui/ExchangeStatusDialog.hpp

@@ -3,23 +3,18 @@
 
 #include <wx/wx.h>
 
+#include "App.h" // wxfb
+
 namespace kdeck
 {
     class Api;
 
-    class ExchangeStatusDialog : public wxDialog
+    class ExchangeStatusDialog : public wxfb::ExchangeStatusDialog
     {
     public:
-        ExchangeStatusDialog(wxWindow* parent, wxWindowID winid = wxID_ANY, const wxString &title = "Exchange Status");
+        ExchangeStatusDialog(wxWindow* parent, wxWindowID winid = wxID_ANY);
 
         void UpdateStuff(Api* api);
-
-    private:
-        wxStaticText* lblExchangeStatus;
-        wxStaticText* lblTradingStatus;
-
-        // init
-        void Setup();
     };
 }
 

include/ui/LoginDialog.hpp

@@ -3,29 +3,23 @@
 
 #include <wx/wx.h>
 
+#include "App.h" // wxfb
+
 namespace kdeck
 {
     class Config;
 
-    class LoginDialog : public wxDialog
+    class LoginDialog : public wxfb::LoginDialog
     {
     public:
-        LoginDialog(wxWindow* parent, wxWindowID winid = wxID_ANY, const wxString &title = "Login");
+        LoginDialog(wxWindow* parent, wxWindowID winid = wxID_ANY);
 
         void UpdateStuff(const Config* config);
 
         std::string GetEmail() const;
         std::string GetPassword() const;
 
         bool GetRememberMe() const;
-
-    private:
-        wxTextCtrl* txtEmail;
-        wxTextCtrl* txtPassword;
-        wxCheckBox* chkRememberMe;
-
-        // init
-        void Setup();
     };
 }
 

include/ui/MainFrame.hpp

@@ -3,25 +3,15 @@
 
 #include <wx/wx.h>
 
+#include "App.h" // wxfb
+
 #include "app_config.hpp"
 #include "api/Api.hpp"
 #include "config/Config.hpp"
 
 namespace kdeck
 {
-    class PortfolioPanel;
-
-    enum
-    {
-        ID_Login = wxID_HIGHEST + 1,
-        ID_Logout = wxID_HIGHEST + 2,
-        ID_Exchange_Announcements = wxID_HIGHEST + 3,
-        ID_Exchange_Schedule = wxID_HIGHEST + 4,
-        ID_Exchange_Status = wxID_HIGHEST + 5,
-        ID_View_ShowClosedPositions = wxID_HIGHEST + 6,
-    };
-
-    class MainFrame : public wxFrame
+    class MainFrame : public wxfb::MainFrame
     {
     public:
         MainFrame(wxWindow* parent = nullptr, wxWindowID winid = wxID_ANY, const wxString &title = std::string{kProjectName});
@@ -33,11 +23,7 @@ namespace kdeck
         Config config;
         Api api;
 
-        wxMenuItem *mnuLogin;
-        wxMenuItem *mnuLogout;
-        wxMenuItem *mnuShowClosedPositions;
-
-        PortfolioPanel* pnlPortfolio;
+        bool isLoginDialogShownOnce = false;
 
         // init
         void Setup();
@@ -54,9 +40,9 @@ namespace kdeck
         // event handlers
         void OnLoginOrLogout(wxCommandEvent& event);
         void OnApiError(wxCommandEvent& event);
-        void OnIdleRunOnce(wxIdleEvent& event);
-        void OnMenuItemSelected(wxCommandEvent& event);
-        void OnClose(wxCloseEvent& event);
+        void OnShow(wxShowEvent &event) override;
+        void OnMenuItemSelected(wxCommandEvent& event) override;
+        void OnClose(wxCloseEvent& event) override;
     };
 }
 

include/ui/PortfolioPanel.hpp

@@ -3,25 +3,19 @@
 
 #include <wx/wx.h>
 
+#include "PortfolioPanel.h" // wxfb
+
 namespace kdeck
 {
     class Api;
-    class BalancePanel;
     class Config;
 
-    class PortfolioPanel : public wxScrolledWindow
+    class PortfolioPanel : public wxfb::PortfolioPanel
     {
     public:
         PortfolioPanel(wxWindow* parent, wxWindowID winid = wxID_ANY);
 
         void UpdateStuff(const Config* config, Api* api);
-
-    private:
-        BalancePanel* pnlBalance;
-        wxPanel* pnlPositions;
-
-        // init
-        void Setup();
     };
 }
 

src/CMakeLists.txt

@@ -23,3 +23,4 @@ target_link_libraries(${PROJECT_NAME}
 add_subdirectory(api)
 add_subdirectory(config)
 add_subdirectory(ui)
+add_subdirectory(wxfb)