diff options
author | YuSanka <yusanka@gmail.com> | 2018-10-01 16:09:31 +0300 |
---|---|---|
committer | YuSanka <yusanka@gmail.com> | 2018-10-01 17:31:36 +0300 |
commit | 08c69057516dfb90a83ec17099c545748855dbc8 (patch) | |
tree | 789eb4c7f73883d47b94b50c8baab0c7e61029ec /src/slic3r/GUI/FirmwareDialog.cpp | |
parent | 342b584399cb14d648599bd7e950ac87bff6f9b1 (diff) |
Moved functions and variables (for fonts and labels color) to GUI_App
+ corrected Sidebar layouts
+ deleted get_preset_bundle
+ actions with tabs_list moved to GUI_App
Diffstat (limited to 'src/slic3r/GUI/FirmwareDialog.cpp')
-rw-r--r-- | src/slic3r/GUI/FirmwareDialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp index d5ac64d90..b836b8e65 100644 --- a/src/slic3r/GUI/FirmwareDialog.cpp +++ b/src/slic3r/GUI/FirmwareDialog.cpp @@ -35,6 +35,7 @@ #include <wx/collpane.h> #include <wx/msgdlg.h> #include <wx/filefn.h> +#include "GUI_App.hpp" namespace fs = boost::filesystem; @@ -213,7 +214,7 @@ void FirmwareDialog::priv::flashing_start(unsigned tasks) modal_response = wxID_NONE; txt_stdout->Clear(); set_txt_status(label_status_flashing); - txt_status->SetForegroundColour(GUI::get_label_clr_modified()); + txt_status->SetForegroundColour(GUI::wxGetApp().get_label_clr_modified()); port_picker->Disable(); btn_rescan->Disable(); hex_picker->Disable(); |