Fixed all the issues brought up by @vktr

itsuart · May 13, 2023 · 28017d9 · 28017d9
1 parent c6a943d
commit 28017d9
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 177 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -160,9 +160,6 @@ add_executable(
 
     # Win32 specific stuff
     src/picotorrent/ui/win32/openfiledialog
-
-    # Theming
-    src/picotorrent/ui/theming/theming
 )
 
 target_compile_definitions(

diff --git a/lang/en-US.json b/lang/en-US.json
@@ -229,7 +229,6 @@
     "torrent_file_s": "Torrent file(s)",
     "exported_magnet_link_s": "Exported magnet link(s)",
     "theme": "Theme",
-    "light_mode": "Light",
-    "dark_mode": "Dark",
-    "system_sets_theme_mode":"System"
+    "light_theme": "Light",
+    "follow_system_theme": "System"
 }
diff --git a/res/dbmigrations/20220508103321_insert_theme_id.sql b/res/dbmigrations/20220508103321_insert_theme_id.sql
@@ -1,2 +1,2 @@
 INSERT INTO setting (key, value, default_value)
-VALUES ('theme_id', NULL, NULL);
+VALUES ('theme_id', NULL, '"system"');
diff --git a/src/picotorrent/application.cpp b/src/picotorrent/application.cpp
@@ -18,8 +18,6 @@
 #include "ui/mainframe.hpp"
 #include "ui/translator.hpp"
 
-#include "ui/theming/theming.hpp"
-
 using json = nlohmann::json;
 using pt::Application;
 
@@ -112,10 +110,7 @@ bool Application::OnInit()
             .value_or(env->GetCurrentLocale()));
 
     // Load theme
-    pt::UI::Theming &theming = pt::UI::Theming::GetInstance();
-    theming.LoadThemes();
-    theming.SetCurrentTheme(cfg->Get<std::string>("theme_id").value_or("system")); // Sets default to 'System'.
-    if (theming.GetMSWDarkMode())
+    if (cfg->IsDarkMode())
     {
       wxApp::MSWEnableDarkMode();
     }

diff --git a/src/picotorrent/core/configuration.cpp b/src/picotorrent/core/configuration.cpp
@@ -7,6 +7,8 @@
 #include "database.hpp"
 #include "environment.hpp"
 
+#include <Windows.h>
+
 namespace fs = std::filesystem;
 
 using pt::Core::Configuration;
@@ -214,3 +216,30 @@ void Configuration::UpsertListenInterface(Configuration::ListenInterface const&
         stmt->Execute();
     }
 }
+
+bool Configuration::IsSystemDarkMode()
+{
+    bool systemUsesDarkTheme = false;
+    HKEY hKey = 0;
+    DWORD dwValue = 1;
+    DWORD dwBufSize = sizeof(dwValue);
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+    {
+        RegQueryValueEx(hKey, TEXT("AppsUseLightTheme"), NULL, NULL, (LPBYTE)&dwValue, &dwBufSize);
+    }
+    if (dwValue == 0)
+    {
+        systemUsesDarkTheme = true;
+    }
+    return systemUsesDarkTheme;
+}
+
+bool Configuration::IsDarkMode()
+{
+    auto val = Configuration::Get<std::string>("theme_id").value_or("system");
+
+    if (val == "light"){
+        return false;
+    }
+    return Configuration::IsSystemDarkMode();
+}
diff --git a/src/picotorrent/core/configuration.hpp b/src/picotorrent/core/configuration.hpp
@@ -103,6 +103,10 @@ namespace Core
 
         std::vector<DhtBootstrapNode> GetDhtBootstrapNodes();
 
+        // Dark mode
+        bool IsDarkMode();
+        bool IsSystemDarkMode();
+
         std::vector<Filter> GetFilters();
         std::optional<Filter> GetFilterById(int id);
 

diff --git a/src/picotorrent/resources.rc b/src/picotorrent/resources.rc
@@ -31,7 +31,7 @@ ICO_TERMINAL_DARK_THEME ICON "..\\..\\res\\terminal-dark-theme.ico"
 20201107234213_setup_filters                    DBMIGRATION "..\\..\\res\\dbmigrations\\20201107234213_setup_filters.sql"
 20201219222232_insert_connections_limit         DBMIGRATION "..\\..\\res\\dbmigrations\\20201219222232_insert_connections_limit.sql"
 20201227195100_insert_ipfilter_settings         DBMIGRATION "..\\..\\res\\dbmigrations\\20201227195100_insert_ipfilter_settings.sql"
-20220508103321_insert_theme_id.sql              DBMIGRATION "..\\..\\res\\dbmigrations\\20220508103321_insert_theme_id.sql"
+20220508103321_insert_theme_id                  DBMIGRATION "..\\..\\res\\dbmigrations\\20220508103321_insert_theme_id.sql"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION        VER_FILE_VERSION

diff --git a/src/picotorrent/ui/console.cpp b/src/picotorrent/ui/console.cpp
@@ -4,21 +4,21 @@
 #include "ids.hpp"
 #include "models/torrentlistmodel.hpp"
 #include "torrentlistview.hpp"
-#include "theming/theming.hpp"
+#include "../core/configuration.hpp"
 
 using pt::UI::Console;
 
 wxDEFINE_EVENT(ptEVT_FILTER_CHANGED, wxCommandEvent);
 
-Console::Console(wxWindow* parent, wxWindowID id, pt::UI::Models::TorrentListModel* model)
+Console::Console(wxWindow* parent, wxWindowID id, pt::UI::Models::TorrentListModel* model, std::shared_ptr<pt::Core::Configuration> cfg)
     : wxPanel(parent, id),
     m_input(new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_LEFT | wxTE_PROCESS_ENTER)),
     m_model(model)
 {
     m_input->SetFont(
         wxFont(9, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Consolas")));
 
-    wxIcon funnel(pt::UI::Theming::GetInstance().GetMSWDarkMode() ? L"ICO_TERMINAL_DARK_THEME" : L"ICO_TERMINAL", wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16));
+    wxIcon funnel((cfg -> IsDarkMode()) ? L"ICO_TERMINAL_DARK_THEME" : L"ICO_TERMINAL", wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16));
 
     int i = FromDIP(16);
     printf("%d", i);
@@ -27,7 +27,7 @@ Console::Console(wxWindow* parent, wxWindowID id, pt::UI::Models::TorrentListMod
     sizer->Add(new wxStaticBitmap(this, wxID_ANY, funnel), 0, wxALIGN_CENTER | wxLEFT, FromDIP(4));
     sizer->Add(m_input, 1, wxEXPAND | wxALL, FromDIP(4));
 
-    this->SetBackgroundColour(getBGCol());
+    this->SetBackgroundColour((cfg -> IsDarkMode()) ? wxColour(32,32,32) : wxColour(255,255,255));
     this->SetSizerAndFit(sizer);
 
     this->Bind(

diff --git a/src/picotorrent/ui/console.hpp b/src/picotorrent/ui/console.hpp
@@ -7,6 +7,8 @@
 
 #include <memory>
 
+#include "../core/configuration.hpp"
+
 wxDECLARE_EVENT(ptEVT_FILTER_CHANGED, wxCommandEvent);
 
 namespace pt::UI::Models { class TorrentListModel; }
@@ -16,7 +18,7 @@ namespace pt::UI
     class Console : public wxPanel
     {
     public:
-        Console(wxWindow* parent, wxWindowID id, Models::TorrentListModel* model);
+        Console(wxWindow* parent, wxWindowID id, Models::TorrentListModel* model, std::shared_ptr<pt::Core::Configuration> cfg);
         void SetText(std::string const& text);
 
     private:

diff --git a/src/picotorrent/ui/dialogs/preferencesgeneralpage.cpp b/src/picotorrent/ui/dialogs/preferencesgeneralpage.cpp
@@ -9,8 +9,6 @@
 #include "../../core/utils.hpp"
 #include "../translator.hpp"
 
-#include "../theming/theming.hpp"
-
 struct AutoRunKey
 {
     AutoRunKey()
@@ -149,15 +147,14 @@ PreferencesGeneralPage::PreferencesGeneralPage(wxWindow* parent, std::shared_ptr
             m_language->SetSelection(pos);
         }
     }
-
-    for (auto &theme : pt::UI::Theming::GetInstance().GetThemes())
+
+    m_theme->Append(i18n("follow_system_theme"), new ClientData<std::string>("system"));
+    m_theme->Append(i18n("light_theme"), new ClientData<std::string>("light"));
+    if (m_cfg->Get<std::string>("theme_id").value_or("system") == "light")
     {
-      int pos = m_theme->Append(i18n(theme.i18n_name), new ClientData<std::string>(theme.id));
-
-      if (theme.id == Theming::GetInstance().GetCurrentTheme())
-      {
-        m_theme->SetSelection(pos);
-      }
+        m_theme->SetSelection(1);
+    } else {
+        m_theme->SetSelection(0);
     }
 
     m_labelColor->SetValue(m_cfg->Get<bool>("use_label_as_list_bgcolor").value());

diff --git a/src/picotorrent/ui/mainframe.cpp b/src/picotorrent/ui/mainframe.cpp
@@ -67,7 +67,7 @@ MainFrame::MainFrame(std::shared_ptr<pt::Core::Environment> env, std::shared_ptr
     m_menuItemFilters(nullptr),
     m_ipc(std::make_unique<IPC::Server>(this))
 {
-    m_console = new Console(this, wxID_ANY, m_torrentListModel);
+    m_console = new Console(this, wxID_ANY, m_torrentListModel,m_cfg);
 
     m_splitter->SetWindowStyleFlag(
         m_splitter->GetWindowStyleFlag() | wxSP_LIVE_UPDATE);

diff --git a/src/picotorrent/ui/theming/theming.cpp b/src/picotorrent/ui/theming/theming.cpp
diff --git a/src/picotorrent/ui/theming/theming.hpp b/src/picotorrent/ui/theming/theming.hpp
diff --git a/src/picotorrent/ui/torrentdetailsoverviewpanel.cpp b/src/picotorrent/ui/torrentdetailsoverviewpanel.cpp
@@ -11,6 +11,7 @@
 #include "../bittorrent/torrenthandle.hpp"
 #include "../bittorrent/torrentstatus.hpp"
 #include "../core/utils.hpp"
+#include "../core/configuration.hpp"
 #include "translator.hpp"
 #include "widgets/pieceprogressbar.hpp"
 
@@ -84,7 +85,7 @@ class CopyableStaticText : public wxStaticText
     }
 };
 
-TorrentDetailsOverviewPanel::TorrentDetailsOverviewPanel(wxWindow* parent, wxWindowID id, int cols, bool showPieceProgress)
+TorrentDetailsOverviewPanel::TorrentDetailsOverviewPanel(wxWindow* parent, wxWindowID id, std::shared_ptr<pt::Core::Configuration> cfg, int cols, bool showPieceProgress)
     : wxScrolledWindow(parent, id),
     m_pieceProgress(nullptr),
     m_name(new CopyableStaticText(this)),
@@ -141,7 +142,7 @@ TorrentDetailsOverviewPanel::TorrentDetailsOverviewPanel(wxWindow* parent, wxWin
 
     if (showPieceProgress)
     {
-        m_pieceProgress = new Widgets::PieceProgressBar(this, wxID_ANY);
+        m_pieceProgress = new Widgets::PieceProgressBar(this, wxID_ANY, cfg);
         m_mainSizer->Add(m_pieceProgress, 0, wxEXPAND | wxTOP | wxRIGHT | wxLEFT, FromDIP(5));
     }
 
@@ -243,11 +244,11 @@ void TorrentDetailsOverviewPanel::Reset()
     m_totalUpload->SetLabel("-");
 }
 
-void TorrentDetailsOverviewPanel::UpdateView(int cols, bool showPieceProgress)
+void TorrentDetailsOverviewPanel::UpdateView(int cols, bool showPieceProgress, std::shared_ptr<pt::Core::Configuration> cfg)
 {
     if (showPieceProgress && m_pieceProgress == nullptr)
     {
-        m_pieceProgress = new Widgets::PieceProgressBar(this, wxID_ANY);
+        m_pieceProgress = new Widgets::PieceProgressBar(this, wxID_ANY, cfg);
         m_mainSizer->Insert(0, m_pieceProgress, 0, wxEXPAND | wxTOP | wxRIGHT | wxLEFT, FromDIP(5));
     }
     else if (!showPieceProgress && m_pieceProgress != nullptr)

diff --git a/src/picotorrent/ui/torrentdetailsoverviewpanel.hpp b/src/picotorrent/ui/torrentdetailsoverviewpanel.hpp
@@ -5,6 +5,8 @@
 #include <wx/wx.h>
 #endif
 
+#include "../core/configuration.hpp"
+
 class wxFlexGridSizer;
 
 namespace pt::UI::Widgets { class PieceProgressBar; }
@@ -20,11 +22,11 @@ namespace UI
     class TorrentDetailsOverviewPanel : public wxScrolledWindow
     {
     public:
-        TorrentDetailsOverviewPanel(wxWindow* parent, wxWindowID id, int cols = 2, bool showPieceProgress = true);
+        TorrentDetailsOverviewPanel(wxWindow* parent, wxWindowID id, std::shared_ptr<pt::Core::Configuration> cfg,int cols = 2, bool showPieceProgress = true);
 
         void Refresh(BitTorrent::TorrentHandle* torrent);
         void Reset();
-        void UpdateView(int cols, bool showPieceProgress);
+        void UpdateView(int cols, bool showPieceProgress, std::shared_ptr<pt::Core::Configuration> cfg);
 
     private:
         wxFlexGridSizer* m_sizer;