diff --git a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp index d237ad1f2b..73d205a655 100644 --- a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp +++ b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp @@ -1,7 +1,7 @@ //**********************************************************/ /* File: uiDeviceUpdateVersion.cpp * Description: The panel with firmware info -* +* * \n class uiDeviceUpdateVersion //**********************************************************/ @@ -71,33 +71,40 @@ void uiDeviceUpdateVersion::CreateWidgets() wxStaticText* serial_text = new wxStaticText(this, wxID_ANY, _L(SERIAL_STR)); wxStaticText* version_text = new wxStaticText(this, wxID_ANY, _L(VERSION_STR)); - // The main sizer - wxFlexGridSizer* main_sizer = new wxFlexGridSizer(3, 3, 0, 0); - main_sizer->AddGrowableCol(1); - main_sizer->SetFlexibleDirection(wxHORIZONTAL); - main_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + // Use bold font + wxFont font = this->GetFont(); + font.SetWeight(wxFONTWEIGHT_BOLD); + m_dev_name->SetFont(font); + serial_text->SetFont(font); + version_text->SetFont(font); - main_sizer->Add(m_dev_name, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); - main_sizer->Add(0, 0, wxALL, wxEXPAND); - main_sizer->Add(0, 0, wxALL, wxEXPAND); + // The grid sizer + wxFlexGridSizer* grid_sizer = new wxFlexGridSizer(2, 3, 0, 0); + //grid_sizer->AddGrowableCol(1); + grid_sizer->SetFlexibleDirection(wxHORIZONTAL); + grid_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); - main_sizer->Add(serial_text, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); - main_sizer->Add(m_dev_snl, 0, wxALIGN_LEFT | wxALL, FromDIP(5)); - main_sizer->Add(0, 0, wxALL, wxEXPAND); + grid_sizer->Add(serial_text, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); + grid_sizer->Add(m_dev_snl, 0, wxALIGN_LEFT | wxALL, FromDIP(5)); + grid_sizer->Add(0, 0, wxALL, wxEXPAND); m_dev_upgrade_indicator = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(5), FromDIP(5))); m_dev_upgrade_indicator->SetBitmap(ScalableBitmap(this, "monitor_upgrade_online", 5).bmp()); wxBoxSizer* version_hsizer = new wxBoxSizer(wxHORIZONTAL); - version_hsizer->Add(m_dev_upgrade_indicator, 0, wxALIGN_CENTER_VERTICAL); - version_hsizer->AddSpacer(FromDIP(5)); - version_hsizer->Add(version_text, 0); + version_hsizer->Add(m_dev_upgrade_indicator, 0, wxALL, FromDIP(5)); + version_hsizer->Add(version_text, 0, wxLEFT | wxBOTTOM|wxALIGN_RIGHT, FromDIP(5)); - main_sizer->Add(version_hsizer, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); - main_sizer->Add(m_dev_version, 0, wxALIGN_LEFT | wxALL, FromDIP(5)); - main_sizer->Add(0, 0, wxALL, wxEXPAND); + grid_sizer->Add(version_hsizer, 0, wxALIGN_RIGHT | wxALL, FromDIP(5)); + grid_sizer->Add(m_dev_version, 0, wxALIGN_LEFT | wxALL, FromDIP(5)); + grid_sizer->Add(0, 0, wxALL, wxEXPAND); // Updating + wxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); + main_sizer->AddSpacer(FromDIP(20)); + main_sizer->Add(m_dev_name, 0, wxALIGN_LEFT | wxALL, FromDIP(5)); + main_sizer->Add(grid_sizer, 0, wxALIGN_LEFT, FromDIP(5)); + SetSizer(main_sizer); Layout(); } \ No newline at end of file