diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index e46274071f..99769d4655 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3132,7 +3132,7 @@ bool GUI_App::may_switch_to_SLA_preset(const wxString& caption) bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage start_page) { wxCHECK_MSG(mainframe != nullptr, false, "Internal error: Main frame not created / null"); - +#if 0 if (!plater()->get_user_account()->is_logged()) { m_login_dialog = std::make_unique(mainframe, plater()->get_user_account()); m_login_dialog->ShowModal(); @@ -3141,7 +3141,7 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage // Destructor does not call Destroy m_login_dialog.reset(); } - +#endif // 0 if (reason == ConfigWizard::RR_USER) { // Cancel sync before starting wizard to prevent two downloads at same time preset_updater->cancel_sync(); @@ -3171,6 +3171,7 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage return res; } +#if 0 void GUI_App::update_login_dialog() { if (!m_login_dialog) { @@ -3178,6 +3179,7 @@ void GUI_App::update_login_dialog() } m_login_dialog->update_account(); } +#endif // 0 void GUI_App::show_desktop_integration_dialog() { diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 6eb67b47ee..0a04eef05e 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -371,7 +371,9 @@ public: void open_web_page_localized(const std::string &http_address); bool may_switch_to_SLA_preset(const wxString& caption); bool run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage start_page = ConfigWizard::SP_WELCOME); +#if 0 void update_login_dialog(); +#endif // 0 void show_desktop_integration_dialog(); void show_downloader_registration_dialog(); @@ -446,8 +448,9 @@ private: // change to vector of items when adding more items that require update //wxMenuItem* m_login_config_menu_item { nullptr }; std::map< ConfigMenuIDs, wxMenuItem*> m_config_menu_updatable_items; - +#if 0 std::unique_ptr m_login_dialog; +#endif // 0 }; DECLARE_APP(GUI_App) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 3ba7588d34..3062ff81cb 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -887,7 +887,9 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) this->main_frame->refresh_account_menu(true); // Update sidebar printer status sidebar->update_printer_presets_combobox(); +#if 0 wxGetApp().update_login_dialog(); +#endif // 0 this->show_action_buttons(this->ready_to_slice); }); @@ -902,7 +904,9 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) this->main_frame->add_connect_webview_tab(); // Update User name in TopBar this->main_frame->refresh_account_menu(); +#if 0 wxGetApp().update_login_dialog(); +#endif // 0 this->show_action_buttons(this->ready_to_slice); } else { // data were corrupt and username was not retrieved @@ -953,7 +957,9 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) fwrite(evt.data.c_str(), 1, evt.data.size(), file); fclose(file); this->main_frame->refresh_account_menu(true); +#if 0 wxGetApp().update_login_dialog(); +#endif // 0 }); wxGetApp().other_instance_message_handler()->init(this->q);