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

WifiConfigDialog: MSW: Fixed color mode + Used new controls

Browse Source 
+ Tab: Fixed color mode update for Extruder combobox
This commit is contained in:
YuSanka 2023-10-20 15:30:41 +02:00
parent c1219c45b7
commit fc64b01e3f
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/Tab.cpp
View File

@ -2435,6 +2435,7 @@ void TabFilament::msw_rescale()
void TabFilament::sys_color_changed()
{
wxGetApp().UpdateDarkUI(m_extruders_cb);
m_extruders_cb->Clear();
update_extruder_combobox();

14
src/slic3r/GUI/WifiConfigDialog.cpp
View File

@ -13,6 +13,8 @@
#include <boost/log/trivial.hpp>
#include <boost/filesystem.hpp>
#include "Widgets/ComboBox.hpp"
namespace Slic3r {
namespace GUI {
@ -40,20 +42,20 @@ WifiConfigDialog::WifiConfigDialog(wxWindow* parent, std::string& file_path, Rem
auto* ssid_sizer = new wxBoxSizer(wxHORIZONTAL);
// TRN SSID of WiFi network.
wxStaticText* ssid_label = new wxStaticText(panel, wxID_ANY, GUI::format_wxstr("%1%:", _L("SSID")));
m_ssid_combo = new wxComboBox(panel, wxID_ANY);
m_ssid_combo = new ::ComboBox(panel, wxID_ANY);
#if __APPLE__
m_ssid_combo->SetToolTip(_L("On some versions of MacOS, this only loads SSID of connected network."));
#endif // __APPLE__
rescan_networks(false);
// TRN Text of button to rescan visible networks in Wifi Config dialog.
wxButton* ssid_button = new wxButton(panel, wxID_ANY, _(L("Rescan")));
ssid_sizer->Add(m_ssid_combo, 1, wxALIGN_CENTER_VERTICAL, 10);
ssid_sizer->Add(m_ssid_combo, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, 10);
ssid_sizer->Add(ssid_button, 0);
auto* pass_sizer = new wxBoxSizer(wxHORIZONTAL);
// TRN Password of WiFi network.
wxStaticText* password_label = new wxStaticText(panel, wxID_ANY, GUI::format_wxstr("%1%:", _L("Password")));
m_pass_textctrl = new wxTextCtrl(panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize);
m_pass_textctrl = new ::TextInput(panel, "", "", "", wxDefaultPosition, wxDefaultSize);
pass_sizer->Add(m_pass_textctrl, 1, wxALIGN_CENTER_VERTICAL, 10);
#if __APPLE__
// TRN Text of button to retrieve password from keychain in Wifi Config dialog. Only on Mac.
@ -67,11 +69,11 @@ WifiConfigDialog::WifiConfigDialog(wxWindow* parent, std::string& file_path, Rem
auto* drive_sizer = new wxBoxSizer(wxHORIZONTAL);
// TRN description of Combo Box with path to USB drive.
wxStaticText* drive_label = new wxStaticText(panel, wxID_ANY, GUI::format_wxstr("%1%:", _L("Drive")));
m_drive_combo = new wxComboBox(panel, wxID_ANY);
m_drive_combo = new ::ComboBox(panel, wxID_ANY);
rescan_drives();
// TRN Text of button to rescan connect usb drives in Wifi Config dialog.
wxButton* drive_button = new wxButton(panel, wxID_ANY, _(L("Rescan")));
drive_sizer->Add(m_drive_combo, 1, wxALIGN_CENTER_VERTICAL, 10);
drive_sizer->Add(m_drive_combo, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, 10);
drive_sizer->Add(drive_button, 0);
// TRN Text of button to write config file in Wifi Config dialog.
@ -111,6 +113,8 @@ WifiConfigDialog::WifiConfigDialog(wxWindow* parent, std::string& file_path, Rem
m_ssid_combo->Bind(wxEVT_TEXT, &WifiConfigDialog::on_combo, this);
drive_button->Bind(wxEVT_BUTTON, &WifiConfigDialog::on_rescan_drives, this);
ssid_button->Bind(wxEVT_BUTTON, &WifiConfigDialog::on_rescan_networks, this);
wxGetApp().UpdateDlgDarkUI(this);
}
WifiConfigDialog::~WifiConfigDialog()

9
src/slic3r/GUI/WifiConfigDialog.hpp
View File

@ -10,6 +10,9 @@
#include <wx/combobox.h>
#include <wx/textctrl.h>
#include "Widgets/ComboBox.hpp"
#include "Widgets/TextInput.hpp"
namespace Slic3r {
namespace GUI {
@ -20,9 +23,9 @@ public:
WifiConfigDialog(wxWindow* parent, std::string& file_path, RemovableDriveManager* removable_manager);
~WifiConfigDialog();
private:
wxComboBox* m_ssid_combo {nullptr};
wxTextCtrl* m_pass_textctrl {nullptr};
wxComboBox* m_drive_combo {nullptr};
::ComboBox* m_ssid_combo {nullptr};
::TextInput* m_pass_textctrl {nullptr};
::ComboBox* m_drive_combo {nullptr};
void on_ok(wxCommandEvent& e);
void on_combo(wxCommandEvent& e);