mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 11:53:48 +00:00
Redesign of all icons / UI improvements (#4368)
* Changed Most of Icons * Updated Tab Bar icons Replaced with wider and a bit bigger ones • Used a bigger toolhead for printer icon on device tab * Tab Bar • Device icon > slightly increased nozzle size * Bed Plate images • Bed plate > Lock Enabled (Dark & Light Mode) > Hover > Used brighter background color • Bed plate > Settings (Changed status) (Dark & Light Mode) > Hover > Used brighter background color * Modifiers & Notification icons • Redesigned modifier icons • Added some of notification icons * Mixed imrovements • Added Sidebar collapse button with simpler design • Sidebar Printing Preset Section > Added "Advanced" Icon with atom like design • Sidebar Printing Preset Section > Improved "Support Filament" Icon .filaments tip supports an object now • Notifications > Corrected image sizes • Notifications > Corrected icon placements * Mixed improvements • Updated warning dialog icon • added plate stats images for multiple plate slicing • added icon for info dialog * Mixed improvements • updated volumetric speed icon • improved readability of preset compare button * Mixed improvements • Updated paint height range icon • Added paint triangle icon • Added multi material paint icon for toolbar * Mixed Improvements • updated titlebar file icon as square to increase similarity with other icons • redesigned toolbaar icons for painting (support, seam, color) they are sharing same design language now • updated sidebar icons wall, top/bottom shell, seam, support • added icons for compare window. (equal, not equal, spool, undefined, node_dot,cog,support) • Added confirm button icon for search boxes for toolbar popups * Mixed Improvements • Added new icons for project page • Added a loading icon to all sliced plates stats icon while slicing process continues • Updated lock and plate setting icons for plate buttons • Added new icons for cut modifier (cut_ / cut_connector) * Mixed • Updated notification icons (notification_preferences, notification_right, notification_eject_sd, notification_documentation) • Added missing original resources from my folder * Mixed improvements • Reworked network / wifi icon • Reworked bed adhension icon • Reworked raft icon • Reworked layer height and width icons • Added new icons to replace generic / missing icons on sidebar (param_overhang, param_bridge, param_wall_surface, param_overhang_speed, param_jerk) • Updated Edit, Save, Delete, Search icons on sidebar • Used a brighter color for all icons. they are more visible now on dark mode. #949494() color has better balance between dark / light theme • Sidebar > Improved readability of Support Material icon • Sidebar > Improved readability of compare icon. again * Mixed improvements • Added height_range_modifier.svg for context menu • Edited Placeholder > Lock icons. just increased heights to match with other icons • Edited slowdown for overhangs • Edited Object sinking icon • Reworked Add copies button • Updated add button * Mixed • Updated placeholder tempeture icon • Added new image for placeholder time icon - custom-gcode_time.svg . Added new one because i dont want to mess with other time icons • Restored original file model_time.svg * Mixed improvements • Updated Sidebar > Temperature icon • Reworked image of about page * Reworked about page • Updated orca slicer logo with custom made font * Readded Optimizsed PNG files Branch has not in sync with original branch. so i added manually Original commit https://github.com/SoftFever/OrcaSlicer/pull/4294 * Mixed Improvements • Updated Sidebar > Flush volumes icon • Updated Toolbar > Emboss & Measure icon (Shifted them 1 px to fixing minor placement mistake) * About Page • Minor change on L letter on logo • Slightly changed proportions on text * Mixed • Updated Tab bar > Device icon with added a tiny pixel for presenting fan. • Updated Sidebar > Device icon with bigger toolhead. added a tiny pixel for presenting fan. it matches with tab icon now • Updated Sidebar > Overhangs icon • Added new icons for missing placeholder items. Quality, Strenght, Other, Setting Overrides, Multi Material and many others. added them to tasklist * Mixed • Added new icons for missing filament setting items. Toolchange added to tasklist • Added new icons for missing printer setting items. Toolchange, Printable Space, Extruder Clearence, Adaptive Bed Mesh, Accesory, Multi Material, Size, Position, Lift Z Enforcement * Mixed • Reworked support enforcer and blocker icons. they are much better now • Slightly changed modifier icons • Updated Object sinking icon. added a wave intead of straight line. Will try too add waves more places to improve aqua effect • Used same revert icon for lock_normal.svg to increase UI constinency. added an cube icon as badge to indicate its spesific to object. Icon used in object list • Toolbar > Popup windows > Keyboard cheet sheet icon > Updated icon. changed resolution. tried many resolution but i couldnt fix blur on icon. So added it to task list for coding side fixes • Updated Sidebar > Compare icon • Updated Sidebar > Nozzle size icon * Removed misnamed files • Removed some unnecessary files caused by misnamed on illustrator * Mixed • Updated design of Context Menu > Reinforce support and Block support again • Updated design of Toolbar > Emboss > now it shares same design language with add object. Also using 3D shape for letter presents better emboss function • Updated design of Toolbar > Color paint > Added some waves and bubbles :) • Updated design of Toolbar > Paint > Brush types • Updated design of Toolbar > Auto Orient / Lay on Surface > Moved asteriks to middle of object and added an target icon for lay on surface. I choose target because lay on surface is selective function • Updated design of Toolbar > Auto Arrange > All shapes highlighted instead of one while hovering. this makes sense because it arranges all objects. Added different shapes to increase indication of works with multiple different objects / shapes. • Updated design of Toolbar > Add Plate > Added few plates to back to make it looks like a bit smaller. its now fit better with other icons • Updated design of Sidebar > Overhang Speed > Changes snail to turtle. its much more related with ocean • Updated design of Sidebar > Prime Tower > Used a light house to present tower • Updated design of Modifiers > Height range • Updated notification and dialog type icons. Added a wave and orca to improve branding • Updated Plate icons with new auto arrange and auto orient icons • Added 2 new images for object list to support lower resolutions. objlist_support_painting and objlist_seam_painting. added this change in tasklist • Many minor fixes * Updated object list icons • Updated object list icons for painting functions * Updated object list icons • Improved readability object list icons for painting functions * Mixed • Updated design of Toolbar > Emboss > Removed 3D design because its makes it hard to identify. Used a simplified 3D effect to present emboss function • Updated design of Toolbar > Add Plate > Removed + badge because it makes design a bit complicated and second/third plate on back already presents button related with multiple plates • Updated design of Toolbar > Auto Orient & Lay on Face > Changed bed shape to a single line. Icon fits better with other designs now • Updated design of Toolbar > Variable Layer Height > Used lines to present layer instead of rectangles. Icon fits better with other designs now. Also this change will improve design consistency with height range menu item icon • Updated design of Toolbar > Split to objects / parts > Increased gap between object to increase visibility of dashed line • Reduced opacity of edit, delete preset, search icon fot reducing contrast on sidebar • Updated icon of return icon (assemble_return.svg) • Updated all lock / Unlock icons • Updated Plate name edit icons. Used same line width with other plate icons and used same icon on other edit buttons • Found new icons to redesign in svg import popup. Updated files & designs > Refresh (refresh.svg) > Mirror on X (reflection_x.svg) > Mirror on Y (reflection_y) > Dropdown Menu > Bake / Forget the File Path (burn.svg) > Dropdown Menu > Change File (open.svg) • Found new icons to redesign in create printer. Updated files & designs > step_1.svg > step_2.svg > step_2_ready.svg > step_is_ok.svg > create_success.svg * Mixed • Updated Plate icons > Lock / Unlock > icon now shows opposite state while hover • Updated Plate icons > Auto orient > Changed bed shape to 1px line. now matches with toolbar icon • Fixed some opacity related issues on edit, delete, search buttons * Mixed • Found new icons to redesign on slided object > layer slider > im_slider_delete.svg > Used red color on this to reduce accidental usage > im_gcode_custom.svg > Changed backround to turquoise. Made icon pixel perfect and now easier to identify > im_gcode_pause.svg > Changed backround to turquoise. Made icon pixel perfect and now easier to identify • Reworked all plate normal and hover colors. Their background color not changes on hover. Only border and icon changes on hover now. Now it feel more naturally • Updated design of all preferences icons • Found new icon to redesign on SVG popup window. it appears when shape has not filled path > exclamation.svg > Made icon pixel perfect and now easier to identify. used filled shape like other dialog icons. Used orange color as warning color • Changed colors of object sinking to orange because its a warning * Mixed Logo Usages • Updated icons on dialogs. i will update all icons if design approved > OrcaSlicer.svg (Used on Most dialogs) > OrcaSlicer_192px_grayscale.png (Used on file not found error. connection error etc..) Bamboo Lab Related icons • Sidebar > Filament Titlebar > AMS Filament sync (ams_fila_sync.svg) > Made pixel perfect with minor changes • Bamboo Lap Printer > Print Plate > > print-time.svg > Made pixel perfect > print-weight.svg > Made pixel perfect and used a scale which fish are weighed. Orcas need fish not ingots :) > ams_editable.svg > Made pixel perfect and used same pen icon on other edit icons > ams_editable_light.svg > Made pixel perfect and used same pen icon on other edit icons > ams_arrow > Made pixel perfect > enable_ams.svg > Made pixel perfect and used same question mark on other related icons • Added Calibration Tab icon for Bamboo Lab printer. Thanks @KrisMorr for coding fixes * Mixed • Updated design of printer_in_lan.svg • Placeholders > Quality > Improved readability • Plate Icons > Used slightly lighter color for dark theme. It improves readability of preferences and lock button while they are at active status • Titlebar > Undo / Redo > Used slightly shorter arrow. This will make difference between revert icon and presents better function 1 step forward / backward. Revert icon is much more "Put back to original place" * Mixed • Preview > Layer Slider > Custom Code Icon > Used a / instead of G letter. Its easier to read now • Preview > Layer Mode Icon > Changed background color and changed single layer icon shape * Mixed • Re exported all images with better precision • Updated design of SVG modifiers • Notifications > Corrected preferences and next button resolution • Notifications > Expand / Collapse buttons > Fixed color usages between dark/light theme • Sidebar > Parameters > Minor change on speed / initial layer speed • Sidebar > Parameters > Minor change on bridging • Plate Setting > Filament order > Arrow > Made pixel perfect • Object List > Minor changes on Paint icons • Menubar > Increased size of all icons • Tab bar > Added icon for Debug tab • Added many icons related with bamboo lab monitor > Mostly corrected their resolution made them pixel perfect. This problem caused by they created an artboard on illustrator at 0,5px then it spreads to most of other artboards. Artboards exported as 17x17 intead of 16x16 while this problem exist in project > Matched design of some icons with designed ones to improve consistency on UI but keeped designs of Bamboo Lab spesific ones > Mostly used pictures that shared by people to identify correct resolutions but need a dummy account for further testing * Mixed • Removed delete/remove/export/import related icons on Context menu • Added new icon for printer settings > Extruder > Retraction when switching material • Added new icon for filament settings > Filament > Print Temperature • Added new icon for filament settings > Filament > Bed Temperature • Added new icon for filament settings > Cooling > Cooling specific layer • Added new icon for filament settings > Cooling > Part Cooling Fan • Added new icon for filament settings > Cooling > Auxiliary part cooling fan • Added new icon for filament settings > Cooling > Exhaust Fan • Added new icon for process settings > Quality > Wall Generator • Added new icon for question dialogs and used orange color for that because it mostly used critical dialogs (preset delete etc). Just found undefined icon on placeholder list uses this and added new icon for that • Changed info dialog icon fill color to turquase. because its mostly positive information • Updated design of Sidebar > Parameters > Overhangs and Overhang Speed • Fixed warning icon usage • Added new image for placeholders > undefined. this was sharing same icon with dialogs previously * Update ObjectDataViewModel.cpp Added new color and support painting icons for object list * Added new icons for Sidebar, Filament and Printer Settings • Added new icon for Sidebar > Process > Support > Tree Supports • Updated /src/slic3r/GUI/Tab.cpp > Process > Added new / missing icons • Updated /src/slic3r/GUI/Tab.cpp > Filament Settings > Added new / missing icons • Updated /src/slic3r/GUI/Tab.cpp > Printer Settings > Added new / missing icons Compiled from source and checked all changes * Updated Placeholder icons • Added new icons to placeholders window • Updated slic3r\GUI\EditGCodeDialog.cpp • Updated slic3r\GUI\Tab.cpp • Changed copy code icon to add.svg instead of add_copy.svg • Added new icon for Placeholders > Setting overrides * Update AboutDialog.cpp • Removed "Orca slicer" string to cleanup • Removed "Based on". already writes on bottom • Changed background color of version text to transparent • Changed github link color to turquoise • Aligned link text with other texts * Compare window - Update GUI\UnsavedChangesDialog.cpp • Updated icon for undefined category. question.svg is used for dialogs and not compatible with low res. used new icon undefined.svg • Also updated process > tab icons started to show up in compare window. blank images was used for tabs in original files * Added Height Range icons on Object List / Context Menu • Added new icon for Object list > Layers > Layer • Object list > Layers > Added Hight Range icon • Context menu > Height Range icon • Object list > Layers > Replaced icons of add / delete Height range buttons * Update imconfig.h • Fixes toolbar > measure > copy to clipboard icon uses "notification_arrow_right.svg" on dark theme instead of "copy_menu_dark.svg" * Context Menu Icons • Updated \GUI\GUI_Factories.cpp • Updated icons of split sub menu • Added new icons for modifier objects submenus. load, cube, cylinder, sphere, disc, torus, text, svg • Added new icons for mirror sub menu items * Fixed wrong warning icon usage on Emboss / SVG widgets • Emboss and SVG popups uses exclamation.svg instead of obj_warning.svg . exclamation.svg used for dialogs and not supports low resolution • Updated \GUI\Gizmos\GLGizmoEmboss.cpp • Updated \GUI\Gizmos\GLGizmoSVG.cpp * Toolbar > Emboss and Cut Emboss \GUI\Gizmos\GLGizmoEmboss.cpp • Added a small gap between vertical related and horizontal related text aligment buttons • Used style dropdown and its title in same line to reduce vertical usage. This will also improves visual consistency with other dropdowns • Used operation radio buttons and its title in same line \GUI\IconManager.cpp • Fixed blurry icons > Emboss > buttons near Style dropdown menu , bold / italic buttons and Text alignment buttons \GUI\ImGuiWrapper.cpp • Changed color of active radio button to turquoise. This will also improves visual consistency * Update GLGizmoEmboss.cpp * Fixed blurry tooltip icon on toolbar popup windows • Updated icon design on hover state. It looks like its pressed now • updated show_tooltip_information function in this. Set icon size as 30x22 intead of relative to font size and removed padding on icons \GUI\Gizmos\GLGizmoCut.cpp \GUI\Gizmos\GLGizmoFdmSupports.cpp \GUI\Gizmos\GLGizmoMeasure.cpp \GUI\Gizmos\GLGizmoMmuSegmentation.cpp \GUI\Gizmos\GLGizmoSeam.cpp \GUI\GLCanvas3D.cpp * Mixed Painting Tool / Brush icons • Made Dark mode icons a bit more darker \GUI\Gizmos\GLGizmoSeam.cpp \GUI\Gizmos\GLGizmoMmuSegmentation.cpp \GUI\Gizmos\GLGizmoFdmSupports.cpp • Updated button shapes of brush type icons (used square shape with more radius) • Updated margin between brush type buttons • Updated paddings of brush type buttons • Updated border color of brush type icons • Used brush / tool buttons bigger to make them easier to select • Fixed icons not uses colors on SVG files while using Light theme \GUI\Gizmos\GLGizmoMmuSegmentation.cpp • Fixed green border color on selected filament. now uses orca color • Used radio buttons for free / vertical / horizontal. Works better for options, reduces vertical height, Easier to understand \imgui\imgui_widgets.cpp > ImGui::ColorButton • Updated function for making sure drawing pixel perfect rectangles. It draws filament colors / borders on color painting gizmo \GUI\Gizmos\GLGizmoSeam.cpp • Used radio buttons for free / vertical / horizontal. Works better for options, reduces vertical height, Easier to understand \GUI\Gizmos\GLGizmoPainterBase.hpp • Added m_free_only variable for new radio buttons \GUI\ImGuiWrapper.cpp • Added darker and lighter versions of orca color as variable • Updated push_confirm_button_style for replacing BBS colors • Slightly reduced horizontal window padding for gizmos \GUI\IMSlider.cpp • Slice > Layer and move slider text is now using turquoise color • Fixed wrong resolution on some states of layer mode icon \GUI\Gizmos\GLGizmoSimplify.cpp • Object > Simplify model > Detail level slider is now using orca color • Object > Simplify model > Hover state of apply button is now using orca color \GUI\GLCanvas3D.cpp • Sliced Plates Toolbar > All Plate Stats > Changed color of "All plate stats" text to orca • Sliced Plates Toolbar > Changed button border color to Orca • Sliced Plates Toolbar > Changed position of plate number text to closer to edges so it will not overlaps with thumbnails * Mixed - Titlebar & Tabs & Search box \GUI\BBLTopbar.cpp > Titlebar • Updated icon background colors while hover / active states • Used same color on border and fill color for more modern look \GUI\Widgets\TabCtrl.cpp > Tabs on parameters / filament & machine window • Updated line color under selected tab to orca color \GUI\Tab.cpp • Fixed > Sidebar > Global > Delete button visible while using search box • Fixed > Sidebar > Global > Revert button visible while using search box • Tabs > Disabled using bold font for active tab. Advantages; tabs always stays at same position, makes switching between tabs a bit faster * \GUI\GUI_App.cpp > Splash Logo * Reworked Emboss Gizmo Reworked Icons • Simplified them as much as possible to give modernish look Reworked layout • Moved style to top. Fitted to window width. Used title and imput box on same line to reduce window height • Used height and depth at same line. Used icons for Height and Depth text to save some place • Moved alignment to top and used at same line with bold / italic icons • Used operation and its radio buttons on same line to recude window height • Made many changes how it scales on different languages Improvements • Surface related values only visible if embos used as modifier • Reworked stepper buttons. Looks more modern now • Reworked advanced expansion. Simplified and removed text • Hidden surface related settings if there is no relations with objects to save some vertical space UI consistency improvements • Used text > revert > input order for components line on sidebar • Revert icon and title used orange color if values edited like on sidebar • Used orca color on sliders, radio buttons • Removed border and other decorations on edit buttons of sliders Fixes • Moved warning icon a bit up to prevent overlapping with text preview box border Effects on other all widgets • Updated selected text background to orca color * Mixed Overall • All gizmos uses same paddings now. it will improve consistency between them. All uses padding value from push_toolbar_style Combobox • Removed paddings from combo box menu • Fixed frame background highlighting on hover • Used border for highlighting menu items instead of background color Combo Box with Filter • Now its shares very similar code with normal combo box. Used ImGui:ButtonBehavior in it to get hover effects properly • Added support for border highlighting on hover • Used border for highlighting menu items instead of background color Combo boxes • Made easier to manage styles for combo boxes Input box with step controls • Added support for border highlighting on hover or active Sliders • Added support for border highlighting on hover or active • Used fully rounded grab and frame. now it looks much more like slider Checkboxes • Made them a bit smaller. Old one is looks like giant and not matches with sidebar style • Updated hover effect to match with other components • Updated icons of checkboxes to match style Radio Buttons • Made them a bit smaller. Old one is looks like giant and not matches with sidebar style Gizmo > Painting tools • Updated all sliders with new one to improve UI consistency • Calculated slider start offset from maximum width of title of sliders to solve window width change between tool changes Gizmo > Simplify • Updated code for new radio buttons Gizmo > Measure • Used selection values with multiline. Window size highly reduced with this layout • Moved restart selection to bottom. like on other gizmos mostly at bottom. this will also reduce vertical spacing • Aligned measure type texts vertically to "copy to clipboard" button • Updated style of copy to clipboard button • Updated dimension value edit box on viewport. Values are much more readable now Color Fixes • Viewport > Plate Name / Number text colors > Updated them to orca color Icons • Updated keyboard cheat sheet icon on gizmos * Titlebar Remove icon from File and Dropdown menu * Sidebar and UI component improvements New Feature • Sidebar > Delete filament button only visible only if there is multi filaments Sidebar • Corrected most of aligment and spacing related problems. all icons has equal space between them and all elements has equal margin to frame • Updated style of Global/objects toggle to match style • Updated style of Advanced toggle. Updated SwitchButton.cpp and its not using vector images now • All combo boxes uses same height now • Slightly reduced vertical spaces on printer and filament sections. more vertical space for process section available now • Process > Global > Search Bar > added search icon UI component style updates • Updated style of most of UI components. All uses 4px corner rounding instead fully rounded • Updated some of old wxButtons with new buttons. still need too much work Added new icons for • param_default-pattern > Used for Support > Base Pattern Fixes • Converted these to step boxes ---- Sidebar > Support > Advanced > Top interface layers > this should not use drop down ---- Sidebar > Support > Advanced > Bottom interface layers > this should not use drop down Color Fixes • Dropdown focus / hold background color • Disabled element background color * Add missing side text for parameters * Gizmo Improvements All Gizmos • Updated button styles on all gizmos Arrange gizmo • Updated slider style Cut gizmo • Removed hexagon shapes for upper / lower part. Used colored text instead • Matched style of mode combo box Move & Rotate gizmo • Removed World axis text like on scale gizmo to reduce window size Variable Layer Height • Moved adaptive and smooth buttons to bottom • Changed name of smooth to smooth radius to improve relation with slider • Updated sliders style • Fixed gizmo not closing when other toolbar buttons clicked Assemble view • Updated slider and button styles • Used Assembly info window with vertical layout to reduce its size. This will also prevents overlapping with slider bar Mesh Boolean • Added new icons • Updated style of elements * Fix conflict * Update splash screen * Updated About Page * Mixed Sidebar • Updated style of Object list search bar • Updated Search list item background hover color Keyboard shortcuts window • Changed active tab color to orca color Color fixes • Disabled text color for UI components • "Slice" button disabled background and foreground color UI Component Styles • Matched style of more buttons --Progress dialog --Release Notes window * Update Toolbar icons * Update style of single choose dialog * Gizmo Improvements Cut Gizmo • Matched elements order with sidebar. Title > Revert button > Controller • Moved "Cut to Parts" checkbox to same line with "After Cut". This reduces vertical height and seems logical • Used slider for cut height controller • Used regular text color for build volume, groove, connector • Revert buttons only visible if value changed like on other UI sections • Removed shapes for "Upper Part" and "Lower Part". Used colored text instead • Matched radio button styles • Matched slider styles • Moved "Add Connector" and "Reset Cut" buttons to bottom to reduce vertical height • Connectors > Used icons for shapes • Connectors > Used regular button for "Remove connectors" • Connectors > Used radio buttons for connector style instead combo box SVG Gizmo • Matched elements order with sidebar. Title > Revert button > Controller • Slightly decreased preview size • Used Combo box for filename related dropdown • Surface related features will not show if there is no surface relation • Matched radio button styles • Matched slider styles Gizmos Combo Box • Fixed rendered with wrong width • Fixed drowpdown menu paddings * fix build with gcc13 Fix compilation error produced by GCC 13: /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp:306: error: no match for call to ‘(Slic3r::GUI::GLGizmoMeshBoolean::on_render_input_window(float, float, float)::<lambda(wchar_t, bool, ImVec2, ImVec2, std::string&)>) (const wchar_t&, bool, ImVec2&, ImVec2&, std::string)’ 306 | if (tab_button( | ~~~~~~~~~~~~~~~ 307 | m_is_dark_mode ? ImGui::MeshBooleanUnionDark : ImGui::MeshBooleanUnion, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 308 | m_operation_mode == MeshBooleanOperation::Union, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 309 | tab_size, | ~~~~~~~~~ 310 | tab_padding, | ~~~~~~~~~~~~ 311 | _u8L("Union") | ~~~~~~~~~~~~~ 312 | )){ | /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp:214: note: candidate: ‘Slic3r::GUI::GLGizmoMeshBoolean::on_render_input_window(float, float, float)::<lambda(wchar_t, bool, ImVec2, ImVec2, std::string&)>’ (near match) 214 | auto tab_button = [this](const wchar_t icon, bool selected, ImVec2 size, ImVec2 tab_padding, std::string& tooltip) { | /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp:214: note: conversion of argument 5 would be ill-formed: In file included from /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp:11, from /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp:4: /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/I18N.hpp:7:54: error: cannot bind non-const lvalue reference of type ‘std::string&’ {aka ‘std::__cxx11::basic_string<char>&’} to an rvalue of type ‘std::string’ {aka ‘std::__cxx11::basic_string<char>’} 7 | #define _u8L(s) Slic3r::GUI::I18N::translate_utf8((s)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ /home/dbuzdyk/packages/3d/OrcaSlicer/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp:311: note: in expansion of macro ‘_u8L’ 311 | _u8L("Union") | * revert some icon changes * Add back missing menu icons --------- Co-authored-by: SoftFever <softfeverever@gmail.com> Co-authored-by: Dima Buzdyk <dima.buzdyk@gmail.com>
This commit is contained in:
@@ -1,16 +1 @@
|
||||
<svg width="128" height="149" viewBox="0 0 128 149" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M82.7793 43.5141L79.8925 40.6274L82.7793 37.7406L85.666 40.6274L82.7793 43.5141ZM127.994 92.228L125.107 95.1148L122.221 92.228L125.107 89.3413L127.994 92.228ZM82.2793 40.6274V36.1917H83.2793V40.6274H82.2793ZM85.7793 32.6917H112.531V33.6917H85.7793V32.6917ZM116.031 36.1917V89.228H115.031V36.1917H116.031ZM118.531 91.728H125.107V92.728H118.531V91.728ZM116.031 89.228C116.031 90.6087 117.15 91.728 118.531 91.728V92.728C116.598 92.728 115.031 91.161 115.031 89.228H116.031ZM112.531 32.6917C114.464 32.6917 116.031 34.2587 116.031 36.1917H115.031C115.031 34.811 113.912 33.6917 112.531 33.6917V32.6917ZM82.2793 36.1917C82.2793 34.2587 83.8463 32.6917 85.7793 32.6917V33.6917C84.3986 33.6917 83.2793 34.811 83.2793 36.1917H82.2793Z" fill="#828280"/>
|
||||
<path d="M41.979 43.0337L39.0923 40.147L41.979 37.2602L44.8658 40.147L41.979 43.0337ZM127.994 3.65353L125.108 6.54028L122.221 3.65353L125.108 0.766776L127.994 3.65353ZM41.479 40.147V6.65353H42.479V40.147H41.479ZM44.979 3.15353H125.108V4.15353H44.979V3.15353ZM41.479 6.65353C41.479 4.72053 43.046 3.15353 44.979 3.15353V4.15353C43.5983 4.15353 42.479 5.27282 42.479 6.65353H41.479Z" fill="#828280"/>
|
||||
<path d="M0.76416 54.0911L0.76416 45.126C0.76416 44.5737 1.21188 44.126 1.76416 44.126L69.2315 44.126C69.7838 44.126 70.2315 44.5737 70.2315 45.126L70.2315 55.3035" stroke="#009688" stroke-width="1.5" stroke-linecap="round"/>
|
||||
<path d="M73.7192 55.3035L73.7192 45.126C73.7192 44.5737 74.167 44.126 74.7192 44.126L96.1852 44.126C96.7374 44.126 97.1852 44.5737 97.1852 45.126L97.1852 55.3035" stroke="#009688" stroke-width="1.5" stroke-linecap="round"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M53.8234 68.1978C50.7459 68.1978 48.2511 70.6926 48.2511 73.7701V111.82L46.8593 112.481C41.3628 115.092 37.571 120.691 37.571 127.17C37.571 136.146 44.8474 143.423 53.8234 143.423C62.7993 143.423 70.0757 136.146 70.0757 127.17C70.0757 120.691 66.2839 115.092 60.7874 112.481L59.3956 111.82V73.7701C59.3956 70.6926 56.9008 68.1978 53.8234 68.1978ZM43.3755 73.7701C43.3755 67.9999 48.0532 63.3223 53.8234 63.3223C59.5935 63.3223 64.2712 67.9999 64.2712 73.7701V108.803C70.6464 112.437 74.9513 119.299 74.9513 127.17C74.9513 138.839 65.492 148.298 53.8234 148.298C42.1547 148.298 32.6954 138.839 32.6954 127.17C32.6954 119.299 37.0003 112.437 43.3755 108.803V73.7701Z" fill="#898989"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.546 77.9488C15.9131 77.6886 16.5964 77.283 17.4922 77.283C18.4249 77.2831 19.1237 77.7247 19.4862 77.9963C19.8951 78.3027 20.2496 78.6782 20.5447 79.0328C21.1408 79.7491 21.7489 80.6916 22.339 81.7202C23.5319 83.7997 24.8404 86.5665 26.0477 89.4434C27.2588 92.3291 28.3955 95.3907 29.2342 98.0802C30.04 100.664 30.6719 103.211 30.6719 104.915C30.6719 107.942 29.7247 111.525 27.6384 114.413C25.4972 117.377 22.1188 119.63 17.4921 119.63C12.995 119.63 9.522 117.707 7.22741 114.825C4.98372 112.008 3.93772 108.377 3.93772 104.915C3.93772 103.001 4.58779 100.359 5.43962 97.7004C6.31841 94.9576 7.50745 91.9128 8.76947 89.0746C10.028 86.2443 11.3881 83.5543 12.6224 81.5392C13.2332 80.5421 13.8603 79.6319 14.4717 78.9412C14.7748 78.5987 15.1352 78.2399 15.546 77.9488ZM10.0827 99.188C9.2405 101.817 8.81327 103.826 8.81327 104.915C8.81327 107.461 9.59314 109.969 11.0415 111.788C12.439 113.543 14.5243 114.755 17.4921 114.755C20.3302 114.755 22.3227 113.445 23.6864 111.558C25.1049 109.594 25.7963 107.039 25.7963 104.915C25.7963 104.045 25.3977 102.155 24.5797 99.5317C23.7947 97.0144 22.7142 94.0994 21.5521 91.3302C20.3862 88.5523 19.1653 85.9861 18.1099 84.1463C17.8706 83.7291 17.6489 83.3655 17.4473 83.0554C17.2441 83.3491 17.021 83.6924 16.78 84.0859C15.6957 85.8561 14.4327 88.3383 13.2244 91.0556C12.0196 93.7652 10.8979 96.6436 10.0827 99.188Z" fill="#898989"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9403 99.4588C15.2653 99.6973 16.146 100.965 15.9075 102.29C15.7929 102.926 15.7611 104.097 16.0986 105.249C16.4227 106.355 17.0363 107.301 18.1215 107.889C19.3053 108.53 19.745 110.01 19.1037 111.194C18.4624 112.377 16.9829 112.817 15.7991 112.176C13.2953 110.819 12.0105 108.636 11.4197 106.62C10.8423 104.649 10.8789 102.704 11.1091 101.426C11.3477 100.101 12.6152 99.2202 13.9403 99.4588Z" fill="#898989"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M56.4827 116.827C61.0891 118.012 64.4927 122.194 64.4927 127.17C64.4927 133.069 59.7111 137.851 53.8127 137.851C47.9142 137.851 43.1326 133.069 43.1326 127.17C43.1326 122.194 46.5362 118.012 51.1426 116.827L51.1426 76.4401C51.1426 74.9655 52.338 73.7701 53.8127 73.7701C55.2873 73.7701 56.4827 74.9655 56.4827 76.4401L56.4827 116.827Z" fill="#C2C2C2"/>
|
||||
<path d="M64.4927 127.17C64.4927 133.069 59.7111 137.85 53.8127 137.85C47.9142 137.85 43.1326 133.069 43.1326 127.17C43.1326 121.272 47.9142 116.49 53.8127 116.49C59.7111 116.49 64.4927 121.272 64.4927 127.17Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 137.851C97.1825 136.504 96.0911 135.413 94.7447 135.413H81.6524C80.306 135.413 79.2146 136.504 79.2146 137.851C79.2146 139.197 80.306 140.289 81.6524 140.289H94.7447C96.0911 140.289 97.1825 139.197 97.1825 137.851Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 121.831C97.1825 120.485 96.0911 119.393 94.7447 119.393H83.8344C82.4881 119.393 81.3967 120.485 81.3967 121.831C81.3967 123.177 82.4881 124.269 83.8344 124.269H94.7447C96.0911 124.269 97.1825 123.177 97.1825 121.831Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 105.81C97.1825 107.157 96.0911 108.248 94.7447 108.248L79.4703 108.248C78.124 108.248 77.0326 107.157 77.0326 105.81C77.0326 104.464 78.124 103.373 79.4703 103.373L94.7447 103.373C96.0911 103.373 97.1825 104.464 97.1825 105.81Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 89.7905C97.1825 91.1368 96.0911 92.2283 94.7447 92.2283L79.4703 92.2283C78.124 92.2283 77.0326 91.1368 77.0326 89.7905C77.0326 88.4442 78.124 87.3527 79.4703 87.3527L94.7447 87.3527C96.0911 87.3527 97.1825 88.4442 97.1825 89.7905Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 73.7704C97.1825 72.424 96.0911 71.3326 94.7447 71.3326H79.4703C78.124 71.3326 77.0326 72.424 77.0326 73.7704C77.0326 75.1167 78.124 76.2081 79.4703 76.2081H94.7447C96.0911 76.2081 97.1825 75.1167 97.1825 73.7704Z" fill="#C2C2C2"/>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="74" viewBox="0 0 64 74"><line x1="23" y1="39" x2="23" y2="63" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-width:2px;opacity:0.5"/><path d="M1,47c0-2.886,4.629-12,6-12s6,9.526,6,12a6,6,0,0,1-6,6A5.767,5.767,0,0,1,1,47Z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-width:2px"/><path d="M5,45c0,2,0,4,2,4" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-width:2px"/><path d="M45,69H39" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-miterlimit:10;stroke-width:2px"/><path d="M45,61H39" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-miterlimit:10;stroke-width:2px"/><path d="M45,53H39" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-miterlimit:10;stroke-width:2px"/><path d="M45,45H39" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-miterlimit:10;stroke-width:2px"/><path d="M45,37H39" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-width:2px"/><path d="M27,53.844V37a4,4,0,0,0-4-4h0a4,4,0,0,0-4,4V53.844a10,10,0,1,0,8,0Z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-width:2px"/><line x1="23" y1="55" x2="23" y2="63" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2px"/><circle cx="23" cy="63" r="5" style="fill:#009688"/><polyline points="1.5 27.5 1.5 23.5 33.5 23.5 33.5 27.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><polyline points="36.5 27.5 36.5 23.5 47.5 23.5 47.5 27.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><polyline points="61.5 7.5 17.5 7.5 17.5 19.5" style="fill:none;stroke:#949494;stroke-linecap:round"/><polyline points="61.5 49.5 55.5 49.5 55.5 17.5 41.5 17.5 41.5 19.5" style="fill:none;stroke:#949494;stroke-linecap:round"/></svg>
|
||||
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 1.8 KiB |
Reference in New Issue
Block a user