GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-09-17 12:43:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

TopBarMenus: Remove "Remember me" item

Browse Source
This commit is contained in:
YuSanka 2024-06-19 16:28:25 +02:00 committed by Lukas Matena
parent 7ec2f3439a
commit ccda2ef716
4 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/MainFrame.cpp
View File

@ -623,7 +623,6 @@ void MainFrame::set_callbacks_for_topbar_menus()
); );
m_bar_menus.set_account_menu_callbacks( m_bar_menus.set_account_menu_callbacks(
[]() -> void { wxGetApp().plater()->toggle_remember_user_account_session(); },
[]() -> void { wxGetApp().plater()->act_with_user_account(); }, []() -> void { wxGetApp().plater()->act_with_user_account(); },
[this]() -> void { [this]() -> void {
wxString preferences_item = _L("Show \"Log in\" button in application top bar"); 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 { []() -> TopBarMenus::UserAccountInfo {
if (auto user_account = wxGetApp().plater()->get_user_account()) if (auto user_account = wxGetApp().plater()->get_user_account())
return { user_account->is_logged(), return { user_account->is_logged(),
user_account->get_remember_session(),
user_account->get_username(), user_account->get_username(),
user_account->get_avatar_path(true) }; user_account->get_avatar_path(true) };
return TopBarMenus::UserAccountInfo(); return TopBarMenus::UserAccountInfo();

6
src/slic3r/GUI/TopBar.cpp
View File

@ -492,12 +492,6 @@ TopBarItemsCtrl::TopBarItemsCtrl(wxWindow *parent, TopBarMenus* menus/* = nullpt
m_sizer->SetItemMinSize(1, wxSize(42 * wxGetApp().em_unit(), -1)); 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(); update_btns_width();
} }

4
src/slic3r/GUI/TopBarMenus.cpp
View File

@ -83,10 +83,6 @@ void TopBarMenus::ApplyWorkspacesMenu()
void TopBarMenus::CreateAccountMenu() 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, "", "", 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"); [this](wxCommandEvent&) { if (m_cb_act_with_user_account) m_cb_act_with_user_account(); }, "login");

7
src/slic3r/GUI/TopBarMenus.hpp
View File

@ -12,7 +12,6 @@ class TopBarMenus
public: public:
struct UserAccountInfo { struct UserAccountInfo {
bool is_logged { false }; bool is_logged { false };
bool remember_session{ false };
std::string user_name; std::string user_name;
boost::filesystem::path avatar_path; boost::filesystem::path avatar_path;
}; };
@ -29,7 +28,6 @@ private:
std::function<void(int)> m_cb_save_mode { nullptr }; std::function<void(int)> m_cb_save_mode { nullptr };
std::function<std::string(int)> m_cb_get_mode_btn_color { 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_act_with_user_account { nullptr };
std::function<void()> m_cb_hide_user_account { nullptr }; std::function<void()> m_cb_hide_user_account { nullptr };
std::function<UserAccountInfo()>m_cb_get_user_account_info { nullptr }; std::function<UserAccountInfo()>m_cb_get_user_account_info { nullptr };
@ -38,7 +36,6 @@ public:
wxMenu main; wxMenu main;
wxMenu workspaces; wxMenu workspaces;
wxMenu account; wxMenu account;
wxWindowID remember_me_item_id { wxID_ANY };
TopBarMenus(); TopBarMenus();
~TopBarMenus() = default; ~TopBarMenus() = default;
@ -71,12 +68,10 @@ public:
ApplyWorkspacesMenu(); ApplyWorkspacesMenu();
} }
void set_account_menu_callbacks(std::function<void()> cb_toggle_remember_session, void set_account_menu_callbacks(std::function<void()> cb_act_with_user_account ,
std::function<void()> cb_act_with_user_account ,
std::function<void()> cb_hide_user_account , std::function<void()> cb_hide_user_account ,
std::function<UserAccountInfo()> cb_get_user_account_info ) 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_act_with_user_account = cb_act_with_user_account;
m_cb_hide_user_account = cb_hide_user_account; m_cb_hide_user_account = cb_hide_user_account;
m_cb_get_user_account_info = cb_get_user_account_info; m_cb_get_user_account_info = cb_get_user_account_info;