GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 15:35:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved text

Browse Source
This commit is contained in:
David Kocik 2024-06-20 17:51:08 +02:00 committed by Lukas Matena
parent bb64571751
commit c4bc5ef0b0
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/ConfigWizardWebViewPage.cpp
View File

@ -5,6 +5,7 @@
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include "Plater.hpp" #include "Plater.hpp"
#include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/I18N.hpp"
#include "format.hpp"
#include <wx/webview.h> #include <wx/webview.h>
@ -31,12 +32,17 @@ ConfigWizardWebViewPage::ConfigWizardWebViewPage(ConfigWizard *parent)
} }
if (logged) { if (logged) {
// TRN Config wizard page with a log in web. // TRN Config wizard page with a log in web.
m_text = new wxStaticText(this, wxID_ANY, format_wxstr("You are logged as %1%.", p_user_account->get_username())); m_text = new wxStaticText(this, wxID_ANY, format_wxstr("You are logged as %1%.", p_user_account->get_username()));
} else { } else {
// TRN Config wizard page with a log in web. // TRN Config wizard page with a log in web. first line of text.
m_text = new wxStaticText(this, wxID_ANY, _L("Please log into your Prusa Account. This step is not mandatory.")); m_text = new wxStaticText(this, wxID_ANY, _L("Please log into your Prusa Account."));
// TRN Config wizard page with a log in web. second line of text.
m_bold_text = new wxStaticText(this, wxID_ANY, _L("This step is optional."));
m_bold_text->SetFont(wxGetApp().bold_font());
m_bold_text->Wrap(WRAP_WIDTH);
} }
append(m_text); append(m_text);
append(m_bold_text);
m_browser_sizer->Add(m_browser, 1, wxEXPAND); m_browser_sizer->Add(m_browser, 1, wxEXPAND);
append(m_browser_sizer, 1, wxEXPAND); append(m_browser_sizer, 1, wxEXPAND);
@ -50,15 +56,16 @@ ConfigWizardWebViewPage::ConfigWizardWebViewPage(ConfigWizard *parent)
void ConfigWizardWebViewPage::login_changed() void ConfigWizardWebViewPage::login_changed()
{ {
assert(p_user_account && m_browser_sizer && m_text); assert(p_user_account && m_browser_sizer && m_text && m_bold_text);
bool logged = p_user_account->is_logged(); bool logged = p_user_account->is_logged();
m_browser_sizer->Show(!logged); m_browser_sizer->Show(!logged);
m_bold_text->Show(!logged);
if (logged) { if (logged) {
// TRN Config wizard page with a log in web. // TRN Config wizard page with a log in web.
m_text->SetLabel(format_wxstr("You are logged as %1%.", p_user_account->get_username())); m_text->SetLabel(format_wxstr("You are logged as %1%.", p_user_account->get_username()));
} else { } else {
// TRN Config wizard page with a log in web. // TRN Config wizard page with a log in web. first line of text.
m_text->SetLabel(_L("Please log into your Prusa Account. This step is not mandatory.")); m_text->SetLabel(_L("Please log into your Prusa Account."));
} }
} }

1
src/slic3r/GUI/ConfigWizardWebViewPage.hpp
View File

@ -57,6 +57,7 @@ private:
UserAccount *p_user_account{nullptr}; UserAccount *p_user_account{nullptr};
wxBoxSizer *m_browser_sizer{nullptr}; wxBoxSizer *m_browser_sizer{nullptr};
wxStaticText *m_text{nullptr}; wxStaticText *m_text{nullptr};
wxStaticText *m_bold_text{nullptr};
}; };
}} // namespace Slic3r::GUI }} // namespace Slic3r::GUI