mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-09 08:41:14 +00:00
UI Fixes / Improvements (#15074)
* plates-toolbar-scrollbar-size * update * filament grouping dialog * mixed filament list * Update StepMeshDialog.cpp * moves plot scrollbar * fix position of popups * printer agent combo box width * match multiline text control background * add dots to configure button * also correct label color for multiline input * side tools connecting text color * recenter dialog text color * preferences experimental features * upgrade panel hyperlink color + right margin * fix position of + sign on printer selector * speed control popup * bbl fan control window * AMS materials setting * monitor > ams section * match background color of multiline text editor on project page * Fix SwitchButton colors * bbl camera popup * BBL > Send print dialog * Revert "BBL > Send print dialog" This reverts commit128e145897. * Revert "bbl fan control window" This reverts commit4a0db62790. * Revert "bbl camera popup" This reverts commite2301e3237. * Revert "monitor > ams section" This reverts commit66e6894eb1. * Revert "fix position of + sign on printer selector" This reverts commit1523ba24c0. * Revert "upgrade panel hyperlink color + right margin" This reverts commit541f2514c5. * Revert "side tools connecting text color" This reverts commita9ab074247. * Revert "recenter dialog text color" This reverts commitf4670d32b2. * Revert "AMS materials setting" This reverts commitb12827f9b5. * Revert "Fix SwitchButton colors" This reverts commit2d4f1d1fe9. * match object list background color * match compare dialog wxDataViewCtrl background color * fix centering of iconized buttons on linux * fix compare dialog background color not applied on linux * edit gcode dialog components background color * Update Plater.cpp * fix dev button font size * Fix scaling issue on SwitchButton while using 150% * transfer or discard changes dialog wiki label * "Transfer or Discard changes" / "Unsaved Changes" dialog header color * object table colors & header spacing * progress dialog * fix progressbar look on linux * fix build * fix build * fix centering of iconized icon again * fix header background color * revert bbl fan control * add includes --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
This commit is contained in:
@@ -622,6 +622,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 +897,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 +910,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 +926,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 +945,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 +965,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 +1015,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));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user