QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-31 07:58:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "icons update"

Browse Source 
This reverts commit a192c86e57.
This commit is contained in:
76Octane
2023-08-18 13:52:43 +08:00
parent a192c86e57
commit bbc4409f8c
6 changed files with 3 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
resources/icons/param_default.svg
View File

@@ -1,66 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1.0"
width="300.000000pt"
height="300.000000pt"
viewBox="0 0 300.000000 300.000000"
preserveAspectRatio="xMidYMid meet"
id="svg1"
sodipodi:docname="param_rectilinear.svg"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs1" />
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="pt"
inkscape:zoom="2.0325"
inkscape:cx="200"
inkscape:cy="200"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g1" />
<metadata
id="metadata1">&#10;Created by potrace 1.10, written by Peter Selinger 2001-2011&#10;</metadata>
<g
transform="translate(0.000000,300.000000) scale(0.100000,-0.100000)"
fill="#4479FB"
stroke="none"
id="g1">
<path
style="display:inline;fill:#4479fb;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:0.80000001"
d="M 4.0590406,4.0590406 295.20295,295.20295"
id="path2"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
transform="matrix(9.9999998,0,0,-9.9999998,0,3000)" />
<path
style="display:inline;fill:#4479fb;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:99.99999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:0.80000001"
d="M 1367.962,2912.7852 2937.9972,1342.75"
id="path2-8"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0" />
<path
style="display:inline;fill:#4479fb;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:100;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:0.80000001"
d="M 74.460566,1654.6539 1644.4958,84.618725"
id="path2-8-1"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0" />
<path
d="M13 2984 c-2 -7 -5 -680 -6 -1495 l-2 -1484 1492 0 1492 0 3 1490 c2 820 3 1491 2 1492 0 2 -670 4 -1489 5 -1113 2 -1489 0 -1492 -8z m1147 -117 c0 -1 -232 -234 -515 -517 l-515 -515 0 518 0 517 515 0 c283 0 515 -1 515 -3z m1620 0 c0 -1 -596 -598 -1325 -1327 l-1325 -1325 0 729 0 730 597 598 598 598 727 0 c401 0 728 -1 728 -3z m-507 -2139 l-597 -598 -731 0 -730 0 1325 1325 1325 1325 3 -727 2 -727 -597 -598z m597 -83 l0 -515 -517 0 -518 0 515 515 c283 283 516 515 517 515 2 0 3 -232 3 -515z"
id="path1" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.0 KiB

20
resources/icons/param_monotonic lines.svg
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="300.000000pt" height="300.000000pt" viewBox="0 0 300.000000 300.000000"
preserveAspectRatio="xMidYMid meet">
<metadata>
Created by potrace 1.10, written by Peter Selinger 2001-2011
</metadata>
<g transform="translate(0.000000,300.000000) scale(0.100000,-0.100000)"
fill="#4479FB" stroke="none">
<path d="M13 2984 c-2 -7 -5 -680 -6 -1495 l-2 -1484 1492 0 1492 0 3 1490 c2
820 3 1491 2 1492 0 2 -670 4 -1489 5 -1113 2 -1489 0 -1492 -8z m1147 -117
c0 -1 -232 -234 -515 -517 l-515 -515 0 518 0 517 515 0 c283 0 515 -1 515 -3z
m1620 0 c0 -1 -596 -598 -1325 -1327 l-1325 -1325 0 729 0 730 597 598 598
598 727 0 c401 0 728 -1 728 -3z m-507 -2139 l-597 -598 -731 0 -730 0 1325
1325 1325 1325 3 -727 2 -727 -597 -598z m597 -83 l0 -515 -517 0 -518 0 515
515 c283 283 516 515 517 515 2 0 3 -232 3 -515z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1021 B

20
resources/icons/param_monotonic.svg
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="300.000000pt" height="300.000000pt" viewBox="0 0 300.000000 300.000000"
preserveAspectRatio="xMidYMid meet">
<metadata>
Created by potrace 1.10, written by Peter Selinger 2001-2011
</metadata>
<g transform="translate(0.000000,300.000000) scale(0.100000,-0.100000)"
fill="#4479fb" stroke="none">
<path d="M13 2984 c-2 -7 -5 -680 -6 -1495 l-2 -1484 1492 0 1492 0 3 1490 c2
820 3 1491 2 1492 0 2 -670 4 -1489 5 -1113 2 -1489 0 -1492 -8z m1147 -117
c0 -1 -232 -234 -515 -517 l-515 -515 0 518 0 517 515 0 c283 0 515 -1 515 -3z
m1183 -2069 l-527 -528 -731 0 -730 0 1255 1255 1255 1255 3 -727 2 -726 -527
-529z m297 1929 c0 -1 -565 -567 -1255 -1257 l-1255 -1255 0 729 0 729 527
528 527 529 728 0 c400 0 728 -1 728 -3z m230 -2082 l0 -515 -517 0 -518 0
515 515 c283 283 516 515 517 515 2 0 3 -232 3 -515z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

32
resources/icons/param_rectilinear grid.svg
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="300.000000pt" height="300.000000pt" viewBox="0 0 300.000000 300.000000"
preserveAspectRatio="xMidYMid meet">
<metadata>
Created by potrace 1.10, written by Peter Selinger 2001-2011
</metadata>
<g transform="translate(0.000000,300.000000) scale(0.100000,-0.100000)"
fill="#4479FB" stroke="none">
<path d="M10 2988 c0 -5 0 -677 0 -1494 l-1 -1485 1488 1 c818 0 1488 2 1490
4 2 2 4 672 6 1490 l2 1486 -25 0 c-14 0 -685 1 -1493 3 -807 1 -1467 -1
-1467 -5z m917 -355 l-237 -238 -237 238 -238 237 475 0 475 0 -238 -237z
m749 222 c16 -8 147 -133 291 -277 l263 -263 -365 -365 -365 -365 -365 365
-365 365 278 278 278 277 160 0 c122 0 168 -4 190 -15z m871 -222 l-237 -238
-237 238 -238 237 475 0 475 0 -238 -237z m-2180 -560 l-237 -238 0 475 0 475
237 -238 238 -237 -238 -237z m2503 235 l0 -473 -237 237 -238 238 235 235
c129 129 236 235 237 235 2 0 3 -213 3 -472z m-1820 -1173 l-365 -365 -267
267 c-148 148 -268 263 -268 258 0 -6 -5 -3 -10 5 -13 20 -13 331 0 367 6 15
131 148 278 296 l267 267 365 -365 365 -365 -365 -365z m1807 544 c10 -12 13
-58 13 -185 l0 -169 -278 -278 -277 -277 -365 365 -365 365 365 365 365 365
264 -267 c145 -148 270 -275 278 -284z m-990 -631 l363 -363 -277 -278 -277
-277 -157 0 c-87 0 -170 5 -185 10 -15 6 -148 131 -296 278 l-269 266 363 363
c200 200 365 363 368 363 3 0 168 -163 367 -362z m-1500 -595 l-237 -238 0
475 0 475 237 -238 238 -237 -238 -237z m2503 235 l0 -473 -237 237 -238 238
235 235 c129 129 236 235 237 235 2 0 3 -213 3 -472z m-1940 -323 l235 -235
-475 0 -475 0 235 235 c129 129 237 235 240 235 3 0 111 -106 240 -235z m1620
0 l235 -235 -475 0 -475 0 235 235 c129 129 237 235 240 235 3 0 111 -106 240
-235z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

6
src/libslic3r/PrintConfig.cpp
View File

@@ -2893,9 +2893,9 @@ void PrintConfigDef::init_fff_params()
"will create more stable supports, while snug support towers will save material and reduce " "will create more stable supports, while snug support towers will save material and reduce "
"object scarring."); "object scarring.");
def->set_enum<SupportMaterialStyle>({ def->set_enum<SupportMaterialStyle>({
{ "grid", L("Grid ") }, { "grid", L("Grid") },
{ "snug", L("Snug ") }, { "snug", L("Snug") },
{ "organic", L("Organic ") } { "organic", L("Organic") }
}); });
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<SupportMaterialStyle>(smsGrid)); def->set_default_value(new ConfigOptionEnum<SupportMaterialStyle>(smsGrid));

77
src/slic3r/GUI/Widgets/TextInput.hpp
View File

@@ -1,77 +0,0 @@
#ifndef slic3r_GUI_TextInput_hpp_
#define slic3r_GUI_TextInput_hpp_
#include <wx/textctrl.h>
#include "StaticBox.hpp"
class TextInput : public wxNavigationEnabled<StaticBox>
{
wxSize labelSize;
ScalableBitmap icon;
StateColor label_color;
StateColor text_color;
wxTextCtrl * text_ctrl;
static const int TextInputWidth = 200;
static const int TextInputHeight = 50;
public:
TextInput();
TextInput(wxWindow * parent,
wxString text,
wxString label = "",
wxString icon = "",
const wxPoint &pos = wxDefaultPosition,
const wxSize & size = wxDefaultSize,
long style = 0);
public:
void Create(wxWindow * parent,
wxString text,
wxString label = "",
wxString icon = "",
const wxPoint &pos = wxDefaultPosition,
const wxSize & size = wxDefaultSize,
long style = 0);
void SetCornerRadius(double radius);
void SetLabel(const wxString& label);
void SetIcon(const wxBitmapBundle &icon);
void SetLabelColor(StateColor const &color);
void SetTextColor(StateColor const &color);
virtual void Rescale();
virtual bool Enable(bool enable = true) override;
virtual void SetMinSize(const wxSize& size) override;
wxTextCtrl *GetTextCtrl() { return text_ctrl; }
wxTextCtrl const *GetTextCtrl() const { return text_ctrl; }
protected:
virtual void OnEdit() {}
virtual void DoSetSize(
int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void DoSetToolTipText(wxString const &tip) override;
private:
void paintEvent(wxPaintEvent& evt);
void render(wxDC& dc);
void messureSize();
DECLARE_EVENT_TABLE()
};
#endif // !slic3r_GUI_TextInput_hpp_