Fix: Use correct scaling of logo and update logo

ifexception · Feb 18, 2023 · e3f2918 · e3f2918
1 parent d872689
commit e3f2918
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 14 deletions.
diff --git a/logo2.png b/logo2.png
diff --git a/res/taskable.ico b/res/taskable.ico
diff --git a/src/dialogs/categoriesdlg.cpp b/src/dialogs/categoriesdlg.cpp
@@ -83,7 +83,10 @@ bool CategoriesDialog::Create(wxWindow* parent,
 
         GetSizer()->Fit(this);
         GetSizer()->SetSizeHints(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
     }
 

diff --git a/src/dialogs/categorydlg.cpp b/src/dialogs/categorydlg.cpp
@@ -79,7 +79,10 @@ bool CategoryDialog::Create(wxWindow* parent,
 
         GetSizer()->Fit(this);
         GetSizer()->SetSizeHints(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
     }
 
@@ -210,7 +213,7 @@ void CategoryDialog::DataToControls()
     std::unique_ptr<model::CategoryModel> category = nullptr;
 
     try {
-        category =mCategoryData.GetById(mCategoryId);
+        category = mCategoryData.GetById(mCategoryId);
     } catch (const sqlite::sqlite_exception& e) {
         pLogger->error("Error occured in get_category_by_id() - {0:d} : {1}", e.get_code(), e.what());
     }

diff --git a/src/dialogs/checkforupdatedlg.cpp b/src/dialogs/checkforupdatedlg.cpp
@@ -128,7 +128,10 @@ void CheckForUpdateDialog::Create(wxWindow* parent,
         CreateControls();
 
         GetSizer()->Fit(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
     }
 }

diff --git a/src/dialogs/clientdlg.cpp b/src/dialogs/clientdlg.cpp
@@ -105,7 +105,10 @@ bool ClientDialog::Create(wxWindow* parent,
 
         GetSizer()->Fit(this);
         GetSizer()->SetSizeHints(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
     }
 

diff --git a/src/dialogs/editlistdlg.cpp b/src/dialogs/editlistdlg.cpp
@@ -86,7 +86,10 @@ bool EditListDialog::Create(wxWindow* parent,
         DataToControls();
 
         GetSizer()->Fit(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
     }
 

diff --git a/src/dialogs/employerdlg.cpp b/src/dialogs/employerdlg.cpp
@@ -87,7 +87,10 @@ bool EmployerDialog::Create(wxWindow* parent,
         }
 
         GetSizer()->Fit(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Centre();
     }
 

diff --git a/src/dialogs/exporttocsvdlg.cpp b/src/dialogs/exporttocsvdlg.cpp
@@ -59,7 +59,10 @@ bool ExportToCsvDialog::Create(wxWindow* parent,
         FillControls();
 
         GetSizer()->Fit(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Centre();
     }
     return created;

diff --git a/src/dialogs/preferencesdlg.cpp b/src/dialogs/preferencesdlg.cpp
@@ -67,6 +67,10 @@ bool PreferencesDialog::Create(wxWindow* parent,
     bool created = wxPropertySheetDialog::Create(parent, windowId, title, position, size, style, name);
     if (created) {
         CreateControls();
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
     }
     return created;
 }

diff --git a/src/dialogs/projectdlg.cpp b/src/dialogs/projectdlg.cpp
@@ -114,7 +114,10 @@ bool ProjectDialog::Create(wxWindow* parent,
 
         GetSizer()->Fit(this);
         GetSizer()->SetSizeHints(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
     }
 

diff --git a/src/dialogs/stopwatchtaskdlg.cpp b/src/dialogs/stopwatchtaskdlg.cpp
@@ -182,7 +182,10 @@ bool StopwatchTaskDialog::Create(wxWindow* parent,
 
         GetSizer()->Fit(this);
         GetSizer()->SetSizeHints(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
 
         if (cfg::ConfigurationProvider::Get().Configuration->IsShowInTray()) {

diff --git a/src/dialogs/taskitemdlg.cpp b/src/dialogs/taskitemdlg.cpp
@@ -190,7 +190,10 @@ bool TaskItemDialog::Create(wxWindow* parent,
 
         GetSizer()->Fit(this);
         GetSizer()->SetSizeHints(this);
-        SetIcon(rc::GetProgramIcon());
+
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
     }
 

diff --git a/src/dialogs/weeklytaskviewdlg.cpp b/src/dialogs/weeklytaskviewdlg.cpp
@@ -89,7 +89,9 @@ bool WeeklyTaskViewDialog::Create(wxWindow* parent,
         ConfigureEventBindings();
         FillControls();
 
-        SetIcon(rc::GetProgramIcon());
+        wxIconBundle iconBundle("AppIcon", 0);
+        SetIcons(iconBundle);
+
         Center();
     }
 

diff --git a/src/frame/mainframe.cpp b/src/frame/mainframe.cpp
@@ -162,7 +162,9 @@ bool MainFrame::CreateFrame()
 
     bool success = Create();
     SetMinSize(wxSize(850, 580));
-    SetIcon(rc::GetProgramIcon());
+
+    wxIconBundle iconBundle("AppIcon", 0);
+    SetIcons(iconBundle);
 
     if (cfg::ConfigurationProvider::Get().Configuration->IsBackupEnabled()) {
         svc::DatabaseBackupDeleter dbBackupDeleter;

diff --git a/src/frame/taskbaricon.cpp b/src/frame/taskbaricon.cpp
@@ -47,7 +47,9 @@ TaskBarIcon::TaskBarIcon(wxFrame* parent,
 
 void TaskBarIcon::SetTaskBarIcon()
 {
-    SetIcon(wxIcon(rc::GetProgramIcon()), common::GetProgramName());
+    wxIconBundle iconBundle("AppIcon", 0);
+
+    SetIcon(iconBundle.GetIcon(wxDefaultSize), common::GetProgramName());
 }
 
 wxMenu* TaskBarIcon::CreatePopupMenu()