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

Merge branch 'main' into extruder-variants-ui-2

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Tab.cpp
This commit is contained in:
SoftFever
2026-10-07 19:40:01 +08:00
parent 0dbd9f01fd 6d02a945e0
commit 27418cea0f
472 changed files with 214518 additions and 40587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/UnsavedChangesDialog.cpp
+8 -11
View File
@@ -1,6 +1,5 @@
#include "UnsavedChangesDialog.hpp"
#include <boost/optional/optional.hpp>
#include <cmath>
#include <boost/algorithm/string/replace.hpp>
#include <cassert>
@@ -26,7 +25,6 @@
#include <string>
#include <vector>
#include <boost/algorithm/string.hpp>
#include <boost/optional.hpp>
#include <wx/colour.h>
#include <wx/dataview.h>
@@ -66,8 +64,6 @@
#include "Widgets/DialogButtons.hpp"
#include "Widgets/HyperLink.hpp"
using boost::optional;
#ifdef __linux__
#define wxLinux true
#else
@@ -622,6 +618,7 @@ DiffViewCtrl::DiffViewCtrl(wxWindow* parent, wxSize size)
),
m_em_unit(em_unit(parent))
{
SetBackgroundColour(wxColour("#FFFFFF"));
wxGetApp().UpdateDVCDarkUI(this);
model = new DiffModel(parent);
@@ -896,7 +893,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
m_action_line = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, UNSAVE_CHANGE_DIALOG_ACTION_LINE_SIZE, 0);
m_action_line->SetFont(::Label::Body_13);
m_action_line->SetForegroundColour(GREY900);
m_action_line->SetForegroundColour(wxColour("#363636"));
m_action_line->Wrap(-1);
m_sizer_main->Add(m_action_line, 0, wxLEFT | wxRIGHT, 20);
@@ -909,11 +906,11 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
}
m_panel_tab = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(UNSAVE_CHANGE_DIALOG_SCROLL_WINDOW_SIZE.x, -1), wxTAB_TRAVERSAL);
m_panel_tab->SetBackgroundColour(GREY200);
m_panel_tab->SetBackgroundColour(wxColour("#D9D9D9"));
wxBoxSizer *m_sizer_tab = new wxBoxSizer(wxVERTICAL);
m_table_top = new wxPanel(m_panel_tab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
m_table_top->SetBackgroundColour(wxColour(107, 107, 107));
m_table_top->SetBackgroundColour(wxColour("#D9D9D9"));
wxBoxSizer *m_sizer_top = new wxBoxSizer(wxHORIZONTAL);
@@ -925,7 +922,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
static_temp_title = new wxStaticText(m_panel_temp, wxID_ANY, _L("Settings"), wxDefaultPosition, wxDefaultSize, 0);
static_temp_title->SetFont(::Label::Body_13);
static_temp_title->Wrap(-1);
static_temp_title->SetForegroundColour(*wxWHITE);
static_temp_title->SetForegroundColour(wxColour("#363636"));
top_title_temp_h->Add(static_temp_title, 0, wxALIGN_CENTER | wxBOTTOM | wxTOP, 5);
top_title_temp_v->Add(top_title_temp_h, 1, wxALIGN_CENTER, 0);
m_panel_temp->SetSizer(top_title_temp_v);
@@ -944,7 +941,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
static_oldv_title = new wxStaticText(m_panel_oldv, wxID_ANY, params ? _L(DevPrinterConfigUtil::get_toolhead_display_name(ucd_pt, DEPUTY_EXTRUDER_ID, ToolHeadComponent::Nozzle, ToolHeadNameCase::SentenceCase)) + ": " + get_nozzle_volume_type_name(params->nozzle) : _L("Old Value"), wxDefaultPosition, wxDefaultSize, 0);
static_oldv_title->SetFont(::Label::Body_13);
static_oldv_title->Wrap(-1);
static_oldv_title->SetForegroundColour(params && params->left_to_right ? wxGetApp().get_label_clr_modified() : *wxWHITE);
static_oldv_title->SetForegroundColour(params && params->left_to_right ? wxGetApp().get_label_clr_modified() : wxColour("#363636"));
top_title_oldv_h->Add(static_oldv_title, 0, wxALIGN_CENTER | wxBOTTOM | wxTOP, 5);
top_title_oldv->Add(top_title_oldv_h, 1, wxALIGN_CENTER, 0);
m_panel_oldv->SetSizer(top_title_oldv);
@@ -964,7 +961,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
wxDefaultPosition, wxDefaultSize, 0);
static_newv_title->SetFont(::Label::Body_13);
static_newv_title->Wrap(-1);
static_newv_title->SetForegroundColour(params && !params->left_to_right ? wxGetApp().get_label_clr_modified() : *wxWHITE);
static_newv_title->SetForegroundColour(params && !params->left_to_right ? wxGetApp().get_label_clr_modified() : wxColour("#363636"));
top_title_newv_h->Add(static_newv_title, 0, wxALIGN_CENTER | wxBOTTOM | wxTOP, 5);
@@ -1014,7 +1011,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
checkbox_sizer->Show(bool(m_buttons & REMEMBER_CHOISE));
if (dependent_presets != nullptr) {
auto wiki = new HyperLink(this, _L("Help"), "https://www.orcaslicer.com/wiki/transfer_discard_changes");
auto wiki = new HyperLink(this, _L("Wiki Guide"), "https://www.orcaslicer.com/wiki/transfer_discard_changes");
m_sizer_button->Add(wiki, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(22));
}