juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:some UI optimizations

Browse Source 
Change-Id: I3395ab87552d6beb3481bf2049bfd1096933f36d
(cherry picked from commit 66a783d126e55360cbbc35503c03f0366aacdf68)
This commit is contained in:
tao wang
2025-01-17 11:14:51 +08:00
committed by Noisyfox
parent b4c9477732
commit 8267224756
10 changed files with 578 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/slic3r/GUI/BBLStatusBarSend.cpp
View File

@@ -16,10 +16,10 @@
namespace Slic3r {
wxDEFINE_EVENT(EVT_SHOW_ERROR_INFO, wxCommandEvent);
wxDEFINE_EVENT(EVT_SHOW_ERROR_INFO_SEND, wxCommandEvent);
BBLStatusBarSend::BBLStatusBarSend(wxWindow *parent, int id)
: m_self{new wxPanel(parent, id == -1 ? wxID_ANY : id)}
: m_self{new wxPanel(parent, id == -1 ? wxID_ANY : id)}
, m_sizer(new wxBoxSizer(wxHORIZONTAL))
{
m_self->SetBackgroundColour(wxColour(255,255,255));
@@ -57,7 +57,7 @@ BBLStatusBarSend::BBLStatusBarSend(wxWindow *parent, int id)
m_cancelbutton->SetBorderColor(btn_bd_white);
m_cancelbutton->SetTextColor(btn_txt_white);
m_cancelbutton->SetCornerRadius(m_self->FromDIP(12));
m_cancelbutton->Bind(wxEVT_BUTTON,
m_cancelbutton->Bind(wxEVT_BUTTON,
[this](wxCommandEvent &evt) {
m_was_cancelled = true;
if (m_cancel_cb_fina)
@@ -83,10 +83,10 @@ BBLStatusBarSend::BBLStatusBarSend(wxWindow *parent, int id)
m_link_show_error->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {
if (!m_show_error_info_state) { m_show_error_info_state = true; m_static_bitmap_show_error->SetBitmap(m_bitmap_show_error_close); }
else { m_show_error_info_state = false; m_static_bitmap_show_error->SetBitmap(m_bitmap_show_error_open); }
wxCommandEvent* evt = new wxCommandEvent(EVT_SHOW_ERROR_INFO);
wxQueueEvent(this->m_self->GetParent(), evt);
wxCommandEvent* evt = new wxCommandEvent(EVT_SHOW_ERROR_INFO_SEND);
wxQueueEvent(this->m_self->GetParent(), evt);
});
m_link_show_error->Hide();
m_static_bitmap_show_error->Hide();
@@ -97,7 +97,7 @@ BBLStatusBarSend::BBLStatusBarSend(wxWindow *parent, int id)
m_static_bitmap_show_error->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {
if (!m_show_error_info_state) {m_show_error_info_state = true;m_static_bitmap_show_error->SetBitmap(m_bitmap_show_error_close);}
else {m_show_error_info_state = false;m_static_bitmap_show_error->SetBitmap(m_bitmap_show_error_open);}
wxCommandEvent* evt = new wxCommandEvent(EVT_SHOW_ERROR_INFO);
wxCommandEvent* evt = new wxCommandEvent(EVT_SHOW_ERROR_INFO_SEND);
wxQueueEvent(this->m_self->GetParent(), evt);
});
@@ -143,7 +143,7 @@ void BBLStatusBarSend::set_progress(int val)
}
m_prog->SetValue(val);
set_percent_text(wxString::Format("%d%%", val));
m_sizer->Layout();
}
@@ -206,9 +206,9 @@ void BBLStatusBarSend::stop_busy()
m_busy = false;
}
void BBLStatusBarSend::set_cancel_callback_fina(BBLStatusBarSend::CancelFn ccb)
{
m_cancel_cb_fina = ccb;
void BBLStatusBarSend::set_cancel_callback_fina(BBLStatusBarSend::CancelFn ccb)
{
m_cancel_cb_fina = ccb;
if (ccb) {
m_sizer->Show(m_cancelbutton);
} else {
@@ -307,18 +307,18 @@ void BBLStatusBarSend::set_percent_text(const wxString &txt)
}
void BBLStatusBarSend::set_status_text(const std::string& txt)
{
{
this->set_status_text(txt.c_str());
}
void BBLStatusBarSend::set_status_text(const char *txt)
{
{
this->set_status_text(wxString::FromUTF8(txt));
get_panel()->GetParent()->Layout();
get_panel()->GetParent()->Update();
}
void BBLStatusBarSend::msw_rescale() {
void BBLStatusBarSend::msw_rescale() {
//set_prog_block();
m_cancelbutton->SetMinSize(wxSize(m_self->FromDIP(56), m_self->FromDIP(24)));
}
@@ -372,7 +372,7 @@ void BBLStatusBarSend::hide_cancel_button()
m_sizer->Layout();
}
void BBLStatusBarSend::change_button_label(wxString name)
void BBLStatusBarSend::change_button_label(wxString name)
{
m_cancelbutton->SetLabel(name);
}