mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-21 12:15:21 +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,10 +1 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M23.2663 3.91593C23.3639 4.05627 23.3242 4.24849 23.1815 4.34262C23.0388 4.43674 22.8472 4.39713 22.7494 4.25691C21.9148 3.05981 20.8695 2.02435 19.6646 1.20105C19.5234 1.10462 19.482 0.913359 19.5748 0.769791C19.6675 0.626223 19.8594 0.584732 20.0006 0.680989C21.2774 1.55103 22.3842 2.64742 23.2663 3.91593Z" fill="#009688"/>
|
||||
<path d="M22.2591 6.29213C22.3385 6.45943 22.2609 6.6575 22.0914 6.73194C21.9218 6.80637 21.7244 6.72897 21.6447 6.56182C20.9669 5.14095 19.9823 3.88802 18.762 2.89347C18.6185 2.77647 18.5899 2.56643 18.7024 2.41926C18.8148 2.27208 19.0256 2.24352 19.1694 2.36026C20.4796 3.42403 21.5353 4.76751 22.2591 6.29213Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1296 14.4004C11.124 14.0634 10.6958 13.6619 10.1535 13.1533C9.55529 12.5925 8.81114 11.8945 8.29694 10.9378C7.47187 9.40337 5.65118 8.33247 4.4379 8.2198C4.37183 8.21365 4.30781 8.21058 4.24738 8.21058C3.94829 8.21058 3.72294 8.28638 3.6118 8.42363C2.97367 9.21593 2.53475 10.4635 2.46715 11.6799C2.39084 13.0504 2.7852 14.1684 3.57647 14.828C4.41383 15.5261 5.86321 15.923 7.45548 15.8892C8.96427 15.8575 10.2825 15.457 10.8961 14.8434C11.0554 14.6841 11.1317 14.5392 11.1296 14.4004ZM10.026 14.5464C9.44262 14.8813 8.45161 15.1031 7.4396 15.1246C7.38429 15.1256 7.32847 15.1261 7.27367 15.1261C5.93132 15.1261 4.73238 14.7948 4.0671 14.2401C3.46584 13.7392 3.16931 12.845 3.23179 11.7224C3.28454 10.7667 3.61078 9.75624 4.08298 9.08584L4.1639 8.97061L4.30474 8.97778C4.59052 8.99212 4.97873 9.10274 5.36899 9.28148C6.33951 9.72602 7.18199 10.4804 7.62295 11.3004C7.941 11.8919 8.35532 12.4409 8.92586 13.0284C9.09989 13.2077 9.49035 13.5795 9.76871 13.8446L9.92453 13.9931C9.99401 14.0592 10.039 14.1021 10.0572 14.1203L10.3117 14.382L10.026 14.5464Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9231 15.7892C11.8798 15.275 12.5779 14.5308 13.1387 13.9326L13.1424 13.9287C13.6492 13.3887 14.0496 12.9621 14.3853 12.957L14.3837 12.8546L14.3914 12.957C14.5287 12.957 14.6716 13.0333 14.8288 13.1905C15.4423 13.8041 15.8428 15.1224 15.8746 16.6311C15.9084 18.2229 15.5115 19.6728 14.8134 20.5102C14.1538 21.3014 13.0357 21.6958 11.6652 21.6195C10.4489 21.5519 9.20129 21.113 8.409 20.4743C8.24306 20.3406 8.1688 20.0395 8.20516 19.6482C8.31784 18.4344 9.38874 16.6142 10.9231 15.7892ZM15.11 16.6465C15.0884 15.6345 14.8672 14.6435 14.5317 14.0602L14.3704 13.779L14.1343 14.0023C14.1246 14.011 14.1149 14.0207 14.1057 14.0299C14.079 14.0565 14.0022 14.137 13.8859 14.2594L13.8721 14.2737C13.6058 14.5539 13.2027 14.9769 13.0137 15.1608C12.4263 15.7318 11.8768 16.1456 11.2857 16.4637C10.4658 16.9046 9.71139 17.7471 9.26685 18.7176C9.08811 19.1079 8.97748 19.4961 8.96314 19.7819L8.95597 19.9227L9.07121 20.0036C9.74161 20.4753 10.7516 20.8016 11.7077 20.8548C11.8056 20.8605 11.9029 20.863 11.9981 20.863C12.9815 20.863 13.7727 20.5634 14.226 20.0195C14.8001 19.3302 15.1391 18.038 15.11 16.6465Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.6636 3.62735C14.8708 2.9887 13.6232 2.54979 12.4074 2.48219C12.2963 2.47604 12.1851 2.47297 12.0776 2.47297C10.8612 2.47297 9.86049 2.8704 9.25923 3.5915C8.56117 4.42887 8.16477 5.87927 8.19805 7.47052C8.22981 8.97931 8.63031 10.2976 9.24386 10.9111C9.40263 11.0699 9.54705 11.1452 9.68789 11.1447C10.0244 11.139 10.4259 10.7109 10.9345 10.1685C11.4952 9.57096 12.1937 8.82648 13.15 8.31198C14.6844 7.48691 15.7553 5.66673 15.868 4.45294C15.9038 4.06217 15.8296 3.76102 15.6636 3.62735ZM15.11 4.31978C15.0957 4.60556 14.985 4.99377 14.8063 5.38402C14.3618 6.35455 13.6074 7.19703 12.7874 7.63799C12.1959 7.95603 11.6469 8.37036 11.0594 8.9409C10.8715 9.12322 10.4689 9.54626 10.2031 9.82589C10.1309 9.9022 10.0741 9.96161 10.0331 10.0041L10.0341 10.0051L9.97931 10.0599L9.95831 10.1014H9.9368L9.70275 10.3211L9.54142 10.0405C9.20596 9.45714 8.98471 8.46613 8.9632 7.45413C8.93401 6.06313 9.27305 4.77047 9.84717 4.08112C10.3486 3.47934 11.2428 3.18281 12.3649 3.2458C13.3206 3.29855 14.331 3.62479 15.0014 4.09699L15.1167 4.17843L15.11 4.31978Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6145 8.2125C18.2016 8.17921 19.6623 8.58073 20.4935 9.27367C21.2852 9.93332 21.6791 11.0513 21.6033 12.4224C21.5357 13.6387 21.0968 14.8863 20.4581 15.6786C20.3245 15.8445 20.0233 15.9188 19.632 15.8824C18.4182 15.7698 16.5981 14.6989 15.773 13.1645C15.2588 12.2078 14.5146 11.5097 13.9165 10.9489C13.3741 10.4403 12.9459 10.0388 12.9403 9.70183C12.9383 9.56252 13.0146 9.41759 13.1738 9.25831C13.7874 8.64475 15.1057 8.24425 16.6145 8.2125ZM19.988 15.0159C20.4602 14.3455 20.7864 13.3355 20.8392 12.3793C20.9017 11.2567 20.6046 10.3625 20.0049 9.86111C19.316 9.2875 18.0234 8.94846 16.6319 8.97714C15.6199 8.99865 14.6289 9.2199 14.0455 9.55535L13.7644 9.71719L13.9866 9.95329C13.9943 9.96148 14.0025 9.96966 14.0142 9.98142C14.0404 10.0075 14.1244 10.088 14.2591 10.216L14.2802 10.2362C14.5601 10.5027 14.9668 10.8901 15.1451 11.0739C15.7156 11.6613 16.13 12.2103 16.448 12.8019C16.889 13.6213 17.7315 14.3762 18.702 14.8208C19.0922 15 19.4804 15.1106 19.7662 15.1245L19.9071 15.1311L19.988 15.0159Z" fill="#009688"/>
|
||||
<path d="M1.90829 17.2677C1.73871 17.3421 1.66111 17.5402 1.74054 17.7075C2.46432 19.2321 3.52006 20.5756 4.83028 21.6394C4.97406 21.7561 5.18486 21.7276 5.29728 21.5804C5.40971 21.4332 5.38117 21.2232 5.23761 21.1062C4.01731 20.1116 3.03273 18.8587 2.35495 17.4378C2.27521 17.2707 2.07788 17.1933 1.90829 17.2677Z" fill="#009688"/>
|
||||
<path d="M0.733373 20.0835C0.635785 19.9431 0.675464 19.7509 0.818149 19.6568C0.960834 19.5627 1.15248 19.6023 1.25024 19.7425C2.08488 20.9396 3.13017 21.9751 4.3351 22.7984C4.47623 22.8948 4.51765 23.086 4.42488 23.2296C4.3321 23.3732 4.14027 23.4147 3.99901 23.3184C2.72223 22.4484 1.61543 21.352 0.733373 20.0835Z" fill="#009688"/>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><circle cx="11.5" cy="11.5" r="11" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><circle cx="11.5" cy="11.5" r="3" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M10.5,3.5c3-2,6,2,2,5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M12.5,19.5c-3,2-5.964-2-2-5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M4.076,8.373c-.232-3.6,4.732-4.2,5.33.768" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M18.932,14.641c.232,3.6-4.714,4.165-5.33-.768" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M5.084,16.373c-3.232-1.6-1.268-6.2,3.33-4.232" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><path d="M17.94,6.641c3.232,1.6,1.25,6.165-3.33,4.232" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/></svg>
|
||||
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 1.0 KiB |
Reference in New Issue
Block a user