mirror of
https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git
synced 2025-08-05 18:10:39 +08:00
ENH: update some GUI styles
jira: [STUDIO-12074] Change-Id: I01bbf66577040d837c1768749b43500221e54fcb
This commit is contained in:
xin.zhang
lane.wei
parent
d32c42348d
commit
b813cb04dd
@ -1,12 +1,12 @@
|
||||
<svg width="18" height="18" xmlns="http://www.w3.org/2000/svg" fill="none">
|
||||
|
||||
<g>
|
||||
<title>background</title>
|
||||
<rect fill="none" id="canvas_background" height="548" width="1226" y="-1" x="-1"/>
|
||||
</g>
|
||||
<g>
|
||||
<title>Layer 1</title>
|
||||
<path id="svg_1" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m14.0513,15.4949c-1.3458,1.039 -3.0323,1.6575 -4.86377,1.6575c-4.39862,0 -7.96487,-3.5663 -7.96487,-7.96487c0,-4.39862 3.56625,-7.96487 7.96487,-7.96487c4.39857,0 7.96487,3.56625 7.96487,7.96487c0,1.26727 -0.296,2.46447 -0.8227,3.52877"/>
|
||||
<path id="svg_2" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m8.56641,4.36328l0,4.99662c0,0.22349 0.18121,0.4047 0.4047,0.4047l4.44209,0"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M15.8651 9.50696C15.8651 5.76656 12.843 2.73438 9.11511 2.73438V9.50696L13.8782 14.3058C15.1055 13.0794 15.8651 11.3822 15.8651 9.50696Z" fill="#DEDEDE"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.11551 3.37556C5.74263 3.37556 3.00837 6.10982 3.00837 9.4827C3.00837 12.8556 5.74263 15.5898 9.11551 15.5898C12.4884 15.5898 15.2227 12.8556 15.2227 9.4827C15.2227 6.10982 12.4884 3.37556 9.11551 3.37556ZM1.72266 9.4827C1.72266 5.39974 5.03255 2.08984 9.11551 2.08984C13.1985 2.08984 16.5084 5.39974 16.5084 9.4827C16.5084 13.5657 13.1985 16.8756 9.11551 16.8756C5.03255 16.8756 1.72266 13.5657 1.72266 9.4827Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.11551 6.91016C9.47055 6.91016 9.75837 7.19797 9.75837 7.55301V9.48158C9.75837 9.83662 9.47055 10.1244 9.11551 10.1244C8.76047 10.1244 8.47266 9.83662 8.47266 9.48158V7.55301C8.47266 7.19797 8.76047 6.91016 9.11551 6.91016Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.66094 9.02813C8.912 8.77708 9.31903 8.77708 9.57008 9.02813L11.4987 10.9567C11.7497 11.2078 11.7497 11.6148 11.4987 11.8658C11.2476 12.1169 10.8406 12.1169 10.5895 11.8658L8.66094 9.93727C8.40989 9.68622 8.40989 9.27918 8.66094 9.02813Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.72363 9.4827C1.72363 9.12766 2.01145 8.83984 2.36649 8.83984H3.81292C4.16796 8.83984 4.45578 9.12766 4.45578 9.4827C4.45578 9.83774 4.16796 10.1256 3.81292 10.1256H2.36649C2.01145 10.1256 1.72363 9.83774 1.72363 9.4827Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7764 9.4827C13.7764 9.12766 14.0642 8.83984 14.4192 8.83984H15.8657C16.2207 8.83984 16.5085 9.12766 16.5085 9.4827C16.5085 9.83774 16.2207 10.1256 15.8657 10.1256H14.4192C14.0642 10.1256 13.7764 9.83774 13.7764 9.4827Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.11649 16.875C8.76145 16.875 8.47363 16.5872 8.47363 16.2321L8.47363 14.7857C8.47363 14.4307 8.76145 14.1429 9.11649 14.1429C9.47153 14.1429 9.75935 14.4307 9.75935 14.7857L9.75935 16.2321C9.75935 16.5872 9.47153 16.875 9.11649 16.875Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.11649 4.82031C8.76145 4.82031 8.47363 4.5325 8.47363 4.17746L8.47363 2.73103C8.47363 2.37599 8.76145 2.08817 9.11649 2.08817C9.47153 2.08817 9.75935 2.37599 9.75935 2.73103L9.75935 4.17746C9.75935 4.5325 9.47153 4.82031 9.11649 4.82031Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.26553 1.31329C4.51659 1.56434 4.51659 1.97137 4.26553 2.22243L2.81911 3.66885C2.56805 3.91991 2.16102 3.91991 1.90997 3.66885C1.65892 3.4178 1.65892 3.01077 1.90997 2.75972L3.3564 1.31329C3.60745 1.06224 4.01448 1.06224 4.26553 1.31329Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9642 1.31329C13.7131 1.56434 13.7131 1.97137 13.9642 2.22243L15.4106 3.66885C15.6617 3.91991 16.0687 3.91991 16.3197 3.66885C16.5708 3.4178 16.5708 3.01077 16.3197 2.75972L14.8733 1.31329C14.6223 1.06224 14.2152 1.06224 13.9642 1.31329Z" fill="#686868"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 731 B After Width: | Height: | Size: 3.1 KiB |
@ -1,17 +1,9 @@
|
||||
<svg width="19" height="19" xmlns="http://www.w3.org/2000/svg" fill="none">
|
||||
|
||||
<g>
|
||||
<title>background</title>
|
||||
<rect fill="none" id="canvas_background" height="548" width="1226" y="-1" x="-1"/>
|
||||
</g>
|
||||
<g>
|
||||
<title>Layer 1</title>
|
||||
<path id="svg_1" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m16.1736,7.57227l1.1828,0.67566c0.2932,0.1675 0.5329,0.58452 0.5329,0.92748l0,3.01829c0,0.343 -0.2386,0.7634 -0.5295,0.9343l-7.87405,4.6192c-0.29097,0.1709 -0.76811,0.1731 -1.06131,0.0057l-6.67001,-3.8228c-0.2932,-0.1674 -0.53177,-0.5856 -0.53177,-0.9286l0,-2.9898c0,-0.34293 0.23857,-0.76223 0.52954,-0.932l0.87402,-0.50932"/>
|
||||
<path id="svg_2" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m1.98438,9.79102l2.3913,1.39808c0.29097,0.1697 0.52954,0.5902 0.53066,0.9331l0.00446,2.7973"/>
|
||||
<path id="svg_3" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m5.91406,12.002l2.39131,1.398c0.29097,0.1698 0.52954,0.5902 0.53065,0.9332l0.00446,2.7972"/>
|
||||
<path id="svg_4" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m3.76865,10.8092c-0.29543,-0.163 -0.53623,-0.5777 -0.53623,-0.92068l0,-2.9898c0,-0.34296 0.23857,-0.76226 0.52954,-0.93203l7.91304,-4.61231c0.291,-0.16978 0.7715,-0.17661 1.0669,-0.01368l2.5987,1.42654c0.2954,0.16179 0.5373,0.5754 0.5373,0.91836l0,3.01828c0,0.34297 -0.2386,0.76341 -0.5295,0.93432l-7.87295,4.6191c-0.29097,0.171 -0.77034,0.1767 -1.06577,0.0137l-2.64103,-1.4618z"/>
|
||||
<path id="svg_5" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m3.99219,6.67773l2.3913,1.39806c0.29097,0.16977 0.52955,0.59021 0.53066,0.93317l0.00446,2.79724"/>
|
||||
<path id="svg_6" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m15.1985,3.38672l-7.68678,4.64422"/>
|
||||
<path id="svg_7" stroke-linecap="round" stroke-miterlimit="10" stroke="#00AE42" d="m17.0324,8.82227l-7.6867,4.64423"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.91925 4.87329C3.36815 5.89677 3.00758 7.35483 3.00758 9.00056C3.00758 10.6463 3.36815 12.1043 3.91925 13.1278C4.48445 14.1775 5.15755 14.6256 5.73972 14.6256C6.32189 14.6256 6.99499 14.1775 7.56019 13.1278C8.11129 12.1043 8.47186 10.6463 8.47186 9.00056C8.47186 7.35483 8.11129 5.89677 7.56019 4.87329C6.99499 3.82363 6.32189 3.37556 5.73972 3.37556C5.15755 3.37556 4.48445 3.82363 3.91925 4.87329ZM2.78722 4.26374C3.44352 3.04488 4.45793 2.08984 5.73972 2.08984C7.02151 2.08984 8.03592 3.04488 8.69222 4.26374C9.36263 5.50878 9.75758 7.18465 9.75758 9.00056C9.75758 10.8165 9.36263 12.4923 8.69222 13.7374C8.03592 14.9562 7.02151 15.9113 5.73972 15.9113C4.45793 15.9113 3.44352 14.9562 2.78722 13.7374C2.11681 12.4923 1.72186 10.8165 1.72186 9.00056C1.72186 7.18465 2.11681 5.50878 2.78722 4.26374Z" fill="#686868"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.22183 12.8588C5.42321 12.8582 4.77588 11.4358 4.77588 9.00167C4.77588 6.56711 5.42347 5.14453 6.22231 5.14453C6.22626 5.14453 6.23021 5.14457 6.23416 5.14464H12.9718V12.8589H6.22183V12.8588Z" fill="#DEDEDE"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.79714 6.39547C5.57583 6.95347 5.41877 7.82937 5.41877 9C5.41877 10.1704 5.57576 11.0462 5.79701 11.6042C5.90781 11.8837 6.02207 12.0512 6.11157 12.1399C6.15434 12.1823 6.18523 12.2006 6.20116 12.208C6.21476 12.2143 6.22043 12.2143 6.22216 12.2143L12.329 12.2144V5.78582H6.22285C6.2211 5.78581 6.21479 5.78568 6.20123 5.79196C6.18533 5.79934 6.15447 5.81756 6.11172 5.8599C6.02225 5.94853 5.90797 6.11602 5.79714 6.39547ZM5.57901 13.3364C5.11652 13.0845 4.80014 12.5783 4.60181 12.0781C4.29973 11.3162 4.13306 10.2637 4.13306 9C4.13306 7.73607 4.2998 6.6834 4.60199 5.92146C4.88151 5.2167 5.39553 4.5 6.22234 4.5L6.2342 4.5001H13.6147V13.5001H5.57901V13.3364Z" fill="#686868"/>
|
||||
<path d="M15.8657 9.00223C15.8657 12.4639 14.3547 15.2701 12.4907 15.2701C10.6268 15.2701 9.11572 12.4639 9.11572 9.00223C9.11572 5.54059 10.6268 2.73438 12.4907 2.73438C14.3547 2.73438 15.8657 5.54059 15.8657 9.00223Z" fill="#F8F8F8"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6703 4.87329C10.1192 5.89677 9.75861 7.35483 9.75861 9.00056C9.75861 10.6463 10.1192 12.1043 10.6703 13.1278C11.2355 14.1775 11.9086 14.6256 12.4908 14.6256C13.0729 14.6256 13.746 14.1775 14.3112 13.1278C14.8623 12.1043 15.2229 10.6463 15.2229 9.00056C15.2229 7.35483 14.8623 5.89677 14.3112 4.87329C13.746 3.82363 13.0729 3.37556 12.4908 3.37556C11.9086 3.37556 11.2355 3.82363 10.6703 4.87329ZM9.53826 4.26374C10.1946 3.04488 11.209 2.08984 12.4908 2.08984C13.7725 2.08984 14.787 3.04488 15.4433 4.26374C16.1137 5.50878 16.5086 7.18465 16.5086 9.00056C16.5086 10.8165 16.1137 12.4923 15.4433 13.7374C14.787 14.9562 13.7725 15.9113 12.4908 15.9113C11.209 15.9113 10.1946 14.9562 9.53826 13.7374C8.86785 12.4923 8.4729 10.8165 8.4729 9.00056C8.4729 7.18465 8.86785 5.50878 9.53826 4.26374Z" fill="#686868"/>
|
||||
<path d="M13.4541 8.99888C13.4541 10.064 13.0224 10.9275 12.4898 10.9275C11.9572 10.9275 11.5255 10.064 11.5255 8.99888C11.5255 7.93376 11.9572 7.07031 12.4898 7.07031C13.0224 7.07031 13.4541 7.93376 13.4541 8.99888Z" fill="#DEDEDE"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.383 7.9249C12.2619 8.16712 12.1684 8.54672 12.1684 9.00112C12.1684 9.45552 12.2619 9.83512 12.383 10.0773C12.4258 10.163 12.4625 10.2159 12.4898 10.248C12.5171 10.2159 12.5539 10.163 12.5967 10.0773C12.7178 9.83512 12.8113 9.45552 12.8113 9.00112C12.8113 8.54672 12.7178 8.16712 12.5967 7.9249C12.5539 7.83924 12.5171 7.78635 12.4898 7.75421C12.4625 7.78635 12.4258 7.83924 12.383 7.9249ZM12.5415 7.70735C12.5415 7.7074 12.5408 7.70779 12.5394 7.70837L12.5415 7.70735ZM12.4403 7.70837C12.4389 7.70779 12.4382 7.7074 12.4382 7.70735L12.4403 7.70837ZM12.4382 10.2949C12.4382 10.2948 12.4389 10.2944 12.4403 10.2939L12.4382 10.2949ZM12.5394 10.2939C12.5408 10.2944 12.5415 10.2948 12.5415 10.2949L12.5394 10.2939ZM11.233 7.34992C11.4417 6.93257 11.8489 6.42969 12.4898 6.42969C13.1308 6.42969 13.538 6.93257 13.7467 7.34992C13.9746 7.80571 14.097 8.3904 14.097 9.00112C14.097 9.61184 13.9746 10.1965 13.7467 10.6523C13.538 11.0697 13.1308 11.5725 12.4898 11.5725C11.8489 11.5725 11.4417 11.0697 11.233 10.6523C11.0051 10.1965 10.8827 9.61184 10.8827 9.00112C10.8827 8.3904 11.0051 7.80571 11.233 7.34992Z" fill="#686868"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 4.4 KiB |
21
resources/images/print_options_bg_disabled.svg
Normal file
21
resources/images/print_options_bg_disabled.svg
Normal file
@ -0,0 +1,21 @@
|
||||
<svg width="44" height="22" viewBox="0 0 44 22" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_224_2378)">
|
||||
<mask id="mask0_224_2378" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="44" height="22">
|
||||
<path d="M44 0H0V22H44V0Z" fill="white"/>
|
||||
</mask>
|
||||
<g mask="url(#mask0_224_2378)">
|
||||
<mask id="mask1_224_2378" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="44" height="22">
|
||||
<path d="M44 0H0V22H44V0Z" fill="white"/>
|
||||
</mask>
|
||||
<g mask="url(#mask1_224_2378)">
|
||||
<path d="M40.8572 0.5H3.14288C1.6241 0.5 0.392883 2.067 0.392883 4V18C0.392883 19.933 1.6241 21.5 3.14288 21.5H40.8572C42.376 21.5 43.6072 19.933 43.6072 18V4C43.6072 2.067 42.376 0.5 40.8572 0.5Z" fill="white"/>
|
||||
<path d="M40.8572 0.5H3.14288C1.6241 0.5 0.392883 2.067 0.392883 4V18C0.392883 19.933 1.6241 21.5 3.14288 21.5H40.8572C42.376 21.5 43.6072 19.933 43.6072 18V4C43.6072 2.067 42.376 0.5 40.8572 0.5Z" stroke="#CECECE"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_224_2378">
|
||||
<rect width="44" height="22" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
@ -177,7 +177,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
|
||||
rename_sizer_h = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
m_rename_text = new wxStaticText(m_rename_normal_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
|
||||
m_rename_text->SetFont(::Label::Head_13);
|
||||
m_rename_text->SetFont(::Label::Head_14);
|
||||
m_rename_text->SetBackgroundColour(*wxWHITE);
|
||||
m_rename_text->SetMaxSize(wxSize(FromDIP(340), -1));
|
||||
rename_editable = new ScalableBitmap(m_scroll_area, "rename_edit", 20);
|
||||
@ -252,7 +252,8 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
|
||||
|
||||
m_sizer_basic_weight_time->Add(timeimg, 0, wxALIGN_CENTER, 0);
|
||||
m_sizer_basic_weight_time->Add(m_stext_time, 0, wxALIGN_CENTER|wxLEFT, FromDIP(6));
|
||||
m_sizer_basic_weight_time->Add(weightimg, 0, wxALIGN_CENTER|wxLEFT, FromDIP(30));
|
||||
m_sizer_basic_weight_time->AddSpacer(FromDIP(30));
|
||||
m_sizer_basic_weight_time->Add(weightimg, 0, wxALIGN_CENTER, 0);
|
||||
m_sizer_basic_weight_time->Add(m_stext_weight, 0, wxALIGN_CENTER|wxLEFT, FromDIP(6));
|
||||
|
||||
/*last & next page*/
|
||||
@ -312,7 +313,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
|
||||
wxBoxSizer* sizer_split_filament = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
auto m_stext_filament_title = new Label(m_scroll_area, _L("Filament"));
|
||||
m_stext_filament_title->SetFont(::Label::Body_14);
|
||||
m_stext_filament_title->SetFont(::Label::Head_13);
|
||||
m_stext_filament_title->SetForegroundColour(0x909090);
|
||||
|
||||
auto m_split_line_filament = new wxPanel(m_scroll_area, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
|
||||
@ -322,7 +323,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
|
||||
|
||||
m_sizer_autorefill = new wxBoxSizer(wxHORIZONTAL);
|
||||
m_ams_backup_tip = new Label(m_scroll_area, _L("Auto Refill"));
|
||||
m_ams_backup_tip->SetFont(::Label::Head_12);
|
||||
m_ams_backup_tip->SetFont(::Label::Head_13);
|
||||
m_ams_backup_tip->SetForegroundColour(wxColour(0x00AE42));
|
||||
m_ams_backup_tip->SetBackgroundColour(*wxWHITE);
|
||||
img_ams_backup = new wxStaticBitmap(m_scroll_area, wxID_ANY, create_scaled_bitmap("automatic_material_renewal", this, 16), wxDefaultPosition, wxSize(FromDIP(16), FromDIP(16)), 0);
|
||||
@ -678,11 +679,11 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
|
||||
m_scroll_sizer->Add(m_filament_panel, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(15));
|
||||
m_scroll_sizer->Add(m_sizer_filament_2extruder, 0, wxEXPAND|wxLEFT|wxRIGHT, FromDIP(15));
|
||||
m_scroll_sizer->Add(0, 0, 0, wxTOP, FromDIP(6));
|
||||
m_scroll_sizer->Add(m_statictext_ams_msg, 0, wxLEFT|wxRIGHT, FromDIP(18));
|
||||
m_scroll_sizer->Add(m_statictext_ams_msg, 0, wxLEFT|wxRIGHT, FromDIP(15));
|
||||
m_scroll_sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
||||
m_scroll_sizer->Add(m_mapping_sugs_sizer, 0, wxLEFT|wxRIGHT, FromDIP(18));
|
||||
m_scroll_sizer->Add(m_change_filament_times_sizer, 0,wxLEFT|wxRIGHT, FromDIP(18));
|
||||
m_scroll_sizer->Add(m_link_edit_nozzle, 0, wxLEFT|wxRIGHT, FromDIP(18));
|
||||
m_scroll_sizer->Add(m_mapping_sugs_sizer, 0, wxLEFT|wxRIGHT, FromDIP(15));
|
||||
m_scroll_sizer->Add(m_change_filament_times_sizer, 0,wxLEFT|wxRIGHT, FromDIP(15));
|
||||
m_scroll_sizer->Add(m_link_edit_nozzle, 0, wxLEFT|wxRIGHT, FromDIP(15));
|
||||
m_scroll_sizer->Add(sizer_split_options, 1, wxEXPAND|wxLEFT|wxRIGHT, FromDIP(15));
|
||||
m_scroll_sizer->Add(0, 0, 0, wxTOP, FromDIP(10));
|
||||
m_scroll_sizer->Add(m_options_other, 0, wxEXPAND|wxLEFT|wxRIGHT, FromDIP(15));
|
||||
@ -3598,8 +3599,8 @@ void SelectMachineDialog::Enable_Send_Button(bool en)
|
||||
if (!en) {
|
||||
if (m_button_ensure->IsEnabled()) {
|
||||
m_button_ensure->Disable();
|
||||
m_button_ensure->SetBackgroundColor(wxColour(0x90, 0x90, 0x90));
|
||||
m_button_ensure->SetBorderColor(wxColour(0x90, 0x90, 0x90));
|
||||
m_button_ensure->SetBackgroundColor(wxColour(200, 200, 200));
|
||||
m_button_ensure->SetBorderColor(wxColour(200, 200, 200));
|
||||
}
|
||||
} else {
|
||||
if (!m_button_ensure->IsEnabled()) {
|
||||
@ -4228,9 +4229,9 @@ void SelectMachineDialog::set_default_normal(const ThumbnailData &data)
|
||||
|
||||
char weight[64];
|
||||
if (wxGetApp().app_config->get("use_inches") == "1") {
|
||||
::sprintf(weight, " %.2f oz", aprint_stats.total_weight * 0.035274);
|
||||
::sprintf(weight, "%.2f oz", aprint_stats.total_weight * 0.035274);
|
||||
} else {
|
||||
::sprintf(weight, " %.2f g", aprint_stats.total_weight);
|
||||
::sprintf(weight, "%.2f g", aprint_stats.total_weight);
|
||||
}
|
||||
|
||||
m_stext_time->SetLabel(time);
|
||||
@ -4602,7 +4603,7 @@ SelectMachineDialog::~SelectMachineDialog()
|
||||
wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
m_printoption_title = new Label(this, title);
|
||||
m_printoption_title->SetFont(Label::Head_13);
|
||||
m_printoption_title->SetFont(Label::Body_13);
|
||||
|
||||
m_printoption_item = new PrintOptionItem(this, m_ops, param);
|
||||
m_printoption_item->SetFont(Label::Body_13);
|
||||
@ -4653,6 +4654,20 @@ void PrintOption::doRender(wxDC &dc)
|
||||
dc.DrawRoundedRectangle(0, 0, size.x, size.y, FromDIP(3));
|
||||
}
|
||||
|
||||
void PrintOption::enable(bool en)
|
||||
{
|
||||
if (m_printoption_item->is_enabled() != en)
|
||||
{
|
||||
m_printoption_item->enable(en);
|
||||
|
||||
if (en) {
|
||||
m_printoption_title->SetForegroundColour("#262E30");
|
||||
} else {
|
||||
m_printoption_title->SetForegroundColour(wxColour(144, 144, 144));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void PrintOption::setValue(std::string value)
|
||||
{
|
||||
m_printoption_item->setValue(value); }
|
||||
@ -4721,6 +4736,7 @@ PrintOptionItem::PrintOptionItem(wxWindow* parent, std::vector<POItem> ops, std:
|
||||
Bind(wxEVT_LEFT_DOWN, &PrintOptionItem::on_left_down, this);
|
||||
|
||||
m_selected_bk = ScalableBitmap(this, "print_options_bg", 22);
|
||||
m_selected_disbabled_bk = ScalableBitmap(this, "print_options_bg_disabled", 22);
|
||||
|
||||
// update the options
|
||||
update_options(ops);
|
||||
@ -4806,7 +4822,11 @@ void PrintOptionItem::doRender(wxDC& dc)
|
||||
|
||||
/*selected*/
|
||||
auto selected_left = selected * PRINT_OPT_WIDTH + FromDIP(4);
|
||||
dc.DrawBitmap(m_selected_bk.bmp(), selected_left, (size.y - m_selected_bk.GetBmpHeight()) / 2);
|
||||
if (m_enable) {
|
||||
dc.DrawBitmap(m_selected_bk.bmp(), selected_left, (size.y - m_selected_bk.GetBmpHeight()) / 2);
|
||||
} else {
|
||||
dc.DrawBitmap(m_selected_disbabled_bk.bmp(), selected_left, (size.y - m_selected_disbabled_bk.GetBmpHeight()) / 2);
|
||||
}
|
||||
|
||||
for (auto it = m_ops.begin(); it != m_ops.end(); ++it)
|
||||
{
|
||||
@ -4819,7 +4839,7 @@ void PrintOptionItem::doRender(wxDC& dc)
|
||||
dc.SetPen(wxPen(clr));
|
||||
dc.SetTextForeground(clr);
|
||||
|
||||
dc.SetFont(::Label::Head_13);
|
||||
dc.SetFont(::Label::Body_13);
|
||||
auto text_size = dc.GetTextExtent(text_value);
|
||||
auto text_left = left + (PRINT_OPT_WIDTH - text_size.x) / 2;
|
||||
auto text_top = (size.y - text_size.y) / 2;
|
||||
@ -4827,7 +4847,7 @@ void PrintOptionItem::doRender(wxDC& dc)
|
||||
}
|
||||
else
|
||||
{
|
||||
const wxColour& clr = m_enable ? StateColor::darkModeColorFor(*wxBLACK) : StateColor::darkModeColorFor(wxColour(144, 144, 144));
|
||||
const wxColour& clr = m_enable ? StateColor::darkModeColorFor("#262E30") : StateColor::darkModeColorFor(wxColour(144, 144, 144));
|
||||
dc.SetPen(wxPen(clr));
|
||||
dc.SetTextForeground(clr);
|
||||
|
||||
@ -5096,7 +5116,7 @@ void PrinterInfoBox::Create()
|
||||
/*printer combobox*/
|
||||
wxBoxSizer* sizer_split_printer = new wxBoxSizer(wxHORIZONTAL);
|
||||
m_stext_printer_title = new Label(this, _L("Printer"), wxALIGN_TOP);
|
||||
m_stext_printer_title->SetFont(::Label::Body_14);
|
||||
m_stext_printer_title->SetFont(::Label::Head_13);
|
||||
m_stext_printer_title->SetForegroundColour(0x909090);
|
||||
|
||||
m_button_question = new ScalableButton(this, wxID_ANY, "icon_qusetion", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true);
|
||||
@ -5147,7 +5167,7 @@ void PrinterInfoBox::Create()
|
||||
auto bed_staticbox = new StaticBox(this);
|
||||
bed_staticbox->SetMinSize(wxSize(FromDIP(98), FromDIP(68)));
|
||||
bed_staticbox->SetMaxSize(wxSize(FromDIP(98), FromDIP(68)));
|
||||
bed_staticbox->SetBorderColor(wxColour(0xCECECE));
|
||||
bed_staticbox->SetBorderColor(wxColour("#EEEEEE"));
|
||||
|
||||
m_bed_image = new wxStaticBitmap(bed_staticbox, wxID_ANY, create_scaled_bitmap("bed_cool", this, 32));
|
||||
m_bed_image->SetBackgroundColour(*wxWHITE);
|
||||
@ -5155,11 +5175,13 @@ void PrinterInfoBox::Create()
|
||||
m_bed_image->SetMaxSize(wxSize(FromDIP(32), FromDIP(32)));
|
||||
|
||||
m_text_bed_type = new Label(bed_staticbox);
|
||||
m_text_bed_type->SetForegroundColour(0xCECECE);
|
||||
m_text_bed_type->SetForegroundColour(wxColour(144, 144, 144));
|
||||
m_text_bed_type->SetMaxSize(wxSize(FromDIP(80), FromDIP(24)));
|
||||
m_text_bed_type->SetFont(Label::Body_13);
|
||||
|
||||
sizer_bed_staticbox->Add(0, 0, 0, wxTOP, FromDIP(16));
|
||||
sizer_bed_staticbox->Add(0, 0, 0, wxTOP, FromDIP(10));
|
||||
sizer_bed_staticbox->Add(m_bed_image, 0, wxALIGN_CENTER, 0);
|
||||
sizer_bed_staticbox->AddSpacer(FromDIP(6));
|
||||
sizer_bed_staticbox->Add(m_text_bed_type, 0, wxALIGN_CENTER, 0);
|
||||
|
||||
bed_staticbox->SetSizer(sizer_bed_staticbox);
|
||||
|
||||
@ -158,6 +158,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
bool is_enabled() const { return m_enable; }
|
||||
void enable(bool able) {
|
||||
if (m_enable != able)
|
||||
{
|
||||
@ -176,6 +177,7 @@ private:
|
||||
|
||||
private:
|
||||
ScalableBitmap m_selected_bk;
|
||||
ScalableBitmap m_selected_disbabled_bk;
|
||||
std::vector<POItem> m_ops;
|
||||
std::string selected_key;
|
||||
std::string m_param;
|
||||
@ -196,7 +198,7 @@ public:
|
||||
~PrintOption(){};
|
||||
|
||||
public:
|
||||
void enable(bool en) { m_printoption_item->enable(en); }
|
||||
void enable(bool en);
|
||||
|
||||
void setValue(std::string value);
|
||||
std::string getValue();
|
||||
|
||||
@ -293,7 +293,10 @@ void TextInput::render(wxDC& dc)
|
||||
}
|
||||
|
||||
dc.SetTextForeground(wxColour(144, 144, 144));
|
||||
dc.SetFont(GetFont());
|
||||
|
||||
wxFont font = GetFont();
|
||||
font.SetPointSize(font.GetPointSize() - 1);// use smaller font
|
||||
dc.SetFont(font);
|
||||
dc.DrawText(static_tips, pt);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user