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

Merge branch 'main' into dev/bbl-network-upd

Browse Source
This commit is contained in:
Noisyfox
2025-06-01 22:51:13 +08:00
committed by GitHub
parent 9444d61bb6 340da6fa85
commit b01ccc8def
9 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1083,6 +1083,7 @@ void AuxiliaryPanel::update_all_cover()
wxBoxSizer *m_sizer_license = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_license = new wxBoxSizer(wxHORIZONTAL);
auto m_text_license = new wxStaticText(this, wxID_ANY, _L("License"), wxDefaultPosition, wxSize(180, -1), 0); auto m_text_license = new wxStaticText(this, wxID_ANY, _L("License"), wxDefaultPosition, wxSize(180, -1), 0);
m_text_license->SetForegroundColour(*wxBLACK);
m_text_license->Wrap(-1); m_text_license->Wrap(-1);
m_sizer_license->Add(m_text_license, 0, wxALIGN_CENTER, 0); m_sizer_license->Add(m_text_license, 0, wxALIGN_CENTER, 0);
m_combo_license = new ComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(450), -1), 0, NULL, wxCB_READONLY); m_combo_license = new ComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(450), -1), 0, NULL, wxCB_READONLY);

2
src/slic3r/GUI/ImageGrid.cpp
View File

@@ -12,7 +12,7 @@
wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent); wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);
BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxPanel) BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxWindow)
EVT_MOTION(Slic3r::GUI::ImageGrid::mouseMoved) EVT_MOTION(Slic3r::GUI::ImageGrid::mouseMoved)
EVT_ENTER_WINDOW(Slic3r::GUI::ImageGrid::mouseEnterWindow) EVT_ENTER_WINDOW(Slic3r::GUI::ImageGrid::mouseEnterWindow)

2
src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
View File

@@ -14,7 +14,7 @@ static const wxColour text_num_color = wxColour(0x898989);
static const wxColour BUTTON_PRESS_COL = wxColour(172, 172, 172); static const wxColour BUTTON_PRESS_COL = wxColour(172, 172, 172);
static const double sqrt2 = std::sqrt(2); static const double sqrt2 = std::sqrt(2);
BEGIN_EVENT_TABLE(AxisCtrlButton, wxPanel) BEGIN_EVENT_TABLE(AxisCtrlButton, wxWindow)
EVT_LEFT_DOWN(AxisCtrlButton::mouseDown) EVT_LEFT_DOWN(AxisCtrlButton::mouseDown)
EVT_LEFT_UP(AxisCtrlButton::mouseReleased) EVT_LEFT_UP(AxisCtrlButton::mouseReleased)
EVT_MOTION(AxisCtrlButton::mouseMoving) EVT_MOTION(AxisCtrlButton::mouseMoving)

2
src/slic3r/GUI/Widgets/ProgressBar.cpp
View File

@@ -7,7 +7,7 @@
wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent); wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent);
BEGIN_EVENT_TABLE(ProgressBar, wxPanel) BEGIN_EVENT_TABLE(ProgressBar, wxWindow)
EVT_PAINT(ProgressBar::paintEvent) EVT_PAINT(ProgressBar::paintEvent)
END_EVENT_TABLE() END_EVENT_TABLE()

2
src/slic3r/GUI/Widgets/RoundedRectangle.cpp
View File

@@ -3,7 +3,7 @@
#include <wx/dcgraph.h> #include <wx/dcgraph.h>
#include <wx/dcclient.h> #include <wx/dcclient.h>
BEGIN_EVENT_TABLE(RoundedRectangle, wxPanel) BEGIN_EVENT_TABLE(RoundedRectangle, wxWindow)
EVT_PAINT(RoundedRectangle::OnPaint) EVT_PAINT(RoundedRectangle::OnPaint)
END_EVENT_TABLE() END_EVENT_TABLE()

2
src/slic3r/GUI/Widgets/SideButton.cpp
View File

@@ -4,7 +4,7 @@
#include <wx/dcclient.h> #include <wx/dcclient.h>
#include <wx/dcgraph.h> #include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(SideButton, wxPanel) BEGIN_EVENT_TABLE(SideButton, wxWindow)
EVT_LEFT_DOWN(SideButton::mouseDown) EVT_LEFT_DOWN(SideButton::mouseDown)
EVT_LEFT_UP(SideButton::mouseReleased) EVT_LEFT_UP(SideButton::mouseReleased)
EVT_PAINT(SideButton::paintEvent) EVT_PAINT(SideButton::paintEvent)

2
src/slic3r/GUI/Widgets/SpinInput.cpp
View File

@@ -5,7 +5,7 @@
#include <wx/dcgraph.h> #include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(SpinInput, wxPanel) BEGIN_EVENT_TABLE(SpinInput, StaticBox)
EVT_KEY_DOWN(SpinInput::keyPressed) EVT_KEY_DOWN(SpinInput::keyPressed)
//EVT_MOUSEWHEEL(SpinInput::mouseWheelMoved) //EVT_MOUSEWHEEL(SpinInput::mouseWheelMoved)

2
src/slic3r/GUI/Widgets/TempInput.cpp
View File

@@ -8,7 +8,7 @@
wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent); wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent);
BEGIN_EVENT_TABLE(TempInput, wxPanel) BEGIN_EVENT_TABLE(TempInput, StaticBox)
EVT_MOTION(TempInput::mouseMoved) EVT_MOTION(TempInput::mouseMoved)
EVT_ENTER_WINDOW(TempInput::mouseEnterWindow) EVT_ENTER_WINDOW(TempInput::mouseEnterWindow)
EVT_LEAVE_WINDOW(TempInput::mouseLeaveWindow) EVT_LEAVE_WINDOW(TempInput::mouseLeaveWindow)

2
src/slic3r/GUI/Widgets/TextInput.cpp
View File

@@ -6,7 +6,7 @@
#include <wx/dcclient.h> #include <wx/dcclient.h>
#include <wx/dcgraph.h> #include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(TextInput, wxPanel) BEGIN_EVENT_TABLE(TextInput, StaticBox)
EVT_PAINT(TextInput::paintEvent) EVT_PAINT(TextInput::paintEvent)