From ccda2ef716eef877ef27c4edac52518ff02f0b8c Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Wed, 19 Jun 2024 16:28:25 +0200
Subject: [PATCH] TopBarMenus: Remove "Remember me" item

---
 src/slic3r/GUI/MainFrame.cpp   | 2 --
 src/slic3r/GUI/TopBar.cpp      | 6 ------
 src/slic3r/GUI/TopBarMenus.cpp | 4 ----
 src/slic3r/GUI/TopBarMenus.hpp | 7 +------
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index e2fcf399e1..6b6151dd16 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -623,7 +623,6 @@ void MainFrame::set_callbacks_for_topbar_menus()
     );
 
     m_bar_menus.set_account_menu_callbacks(
-        []() -> void { wxGetApp().plater()->toggle_remember_user_account_session(); },
         []() -> void { wxGetApp().plater()->act_with_user_account(); },
         [this]() -> void {
             wxString preferences_item = _L("Show \"Log in\" button in application top bar");
@@ -642,7 +641,6 @@ void MainFrame::set_callbacks_for_topbar_menus()
         []() -> TopBarMenus::UserAccountInfo {
             if (auto user_account = wxGetApp().plater()->get_user_account())
                 return { user_account->is_logged(),
-                         user_account->get_remember_session(),
                          user_account->get_username(),
                          user_account->get_avatar_path(true) };
             return TopBarMenus::UserAccountInfo();
diff --git a/src/slic3r/GUI/TopBar.cpp b/src/slic3r/GUI/TopBar.cpp
index 83786ebb83..bed2e15fec 100644
--- a/src/slic3r/GUI/TopBar.cpp
+++ b/src/slic3r/GUI/TopBar.cpp
@@ -492,12 +492,6 @@ TopBarItemsCtrl::TopBarItemsCtrl(wxWindow *parent, TopBarMenus* menus/* = nullpt
 
     m_sizer->SetItemMinSize(1, wxSize(42 * wxGetApp().em_unit(), -1));
 
-    this->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
-        auto user_account = m_menus->get_user_account_info();
-        evt.Enable(user_account.is_logged);
-        evt.Check (user_account.remember_session);
-    }, m_menus->remember_me_item_id);
-
     update_btns_width();
 }
 
diff --git a/src/slic3r/GUI/TopBarMenus.cpp b/src/slic3r/GUI/TopBarMenus.cpp
index 7d04cb5aac..bb88ddd383 100644
--- a/src/slic3r/GUI/TopBarMenus.cpp
+++ b/src/slic3r/GUI/TopBarMenus.cpp
@@ -83,10 +83,6 @@ void TopBarMenus::ApplyWorkspacesMenu()
 
 void TopBarMenus::CreateAccountMenu()
 {
-    remember_me_item_id = wxWindow::NewControlId();
-    append_menu_check_item(&account, remember_me_item_id, _L("Remember me"), "" , 
-        [this](wxCommandEvent&) { if (m_cb_toggle_remember_session) m_cb_toggle_remember_session(); }, nullptr);
-
     m_login_item = append_menu_item(&account, wxID_ANY, "", "",
         [this](wxCommandEvent&) { if (m_cb_act_with_user_account) m_cb_act_with_user_account(); }, "login");
 
diff --git a/src/slic3r/GUI/TopBarMenus.hpp b/src/slic3r/GUI/TopBarMenus.hpp
index 1cac5883f4..bfbea4f146 100644
--- a/src/slic3r/GUI/TopBarMenus.hpp
+++ b/src/slic3r/GUI/TopBarMenus.hpp
@@ -12,7 +12,6 @@ class TopBarMenus
 public:
     struct UserAccountInfo {
         bool                    is_logged       { false };
-        bool                    remember_session{ false };
         std::string             user_name;
         boost::filesystem::path avatar_path;
     };
@@ -29,7 +28,6 @@ private:
     std::function<void(int)>        m_cb_save_mode                  { nullptr };
     std::function<std::string(int)> m_cb_get_mode_btn_color         { nullptr };
 
-    std::function<void()>           m_cb_toggle_remember_session    { nullptr };
     std::function<void()>           m_cb_act_with_user_account      { nullptr };
     std::function<void()>           m_cb_hide_user_account          { nullptr };
     std::function<UserAccountInfo()>m_cb_get_user_account_info      { nullptr };
@@ -38,7 +36,6 @@ public:
     wxMenu          main;
     wxMenu          workspaces;
     wxMenu          account;
-    wxWindowID      remember_me_item_id        { wxID_ANY };
 
     TopBarMenus();
     ~TopBarMenus() = default;
@@ -71,12 +68,10 @@ public:
         ApplyWorkspacesMenu();
     }
 
-    void set_account_menu_callbacks(std::function<void()>               cb_toggle_remember_session,
-                                    std::function<void()>               cb_act_with_user_account  ,
+    void set_account_menu_callbacks(std::function<void()>               cb_act_with_user_account  ,
                                     std::function<void()>               cb_hide_user_account      ,
                                     std::function<UserAccountInfo()>    cb_get_user_account_info   )
     {
-        m_cb_toggle_remember_session = cb_toggle_remember_session;
         m_cb_act_with_user_account   = cb_act_with_user_account;
         m_cb_hide_user_account       = cb_hide_user_account;
         m_cb_get_user_account_info   = cb_get_user_account_info;