mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 20:03:47 +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,6 +1 @@
|
||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.54156 4.72495C7.32505 5.50922 7.18694 6.61633 7.18694 7.8555C7.18694 9.09467 7.32505 10.2018 7.54156 10.986C7.65064 11.3811 7.77318 11.6704 7.89182 11.8511C7.9619 11.9579 8.01129 11.9995 8.03554 12.0152C8.03969 12.0125 8.0445 12.009 8.04996 12.0048C8.08868 11.9746 8.14128 11.9181 8.19342 11.829C8.30988 11.63 8.56558 11.5631 8.76456 11.6796C8.96353 11.796 9.03043 12.0518 8.91398 12.2507C8.81947 12.4122 8.70098 12.5561 8.56251 12.6638C8.42695 12.7692 8.24739 12.8582 8.04044 12.8582C7.64645 12.8582 7.36927 12.5765 7.19384 12.3092C7.00772 12.0257 6.85684 11.6431 6.73678 11.2082C6.49502 10.3325 6.35205 9.147 6.35205 7.8555C6.35205 6.564 6.49502 5.37847 6.73678 4.50277C6.85684 4.06788 7.00772 3.68531 7.19384 3.40175C7.36927 3.13445 7.64645 2.85278 8.04044 2.85278C8.424 2.85278 8.70476 3.12518 8.87921 3.39344C9.0049 3.58671 8.95011 3.84528 8.75684 3.97097C8.56356 4.09666 8.30499 4.04187 8.1793 3.84859C8.12564 3.76608 8.07955 3.72108 8.04978 3.6996C8.04606 3.69692 8.0428 3.69474 8.04 3.69298C8.0177 3.70628 7.9665 3.74607 7.89182 3.85986C7.77318 4.04061 7.65064 4.32987 7.54156 4.72495Z" fill="#C4C4C4"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.12945 4.60703C4.91294 5.3913 4.77483 6.49841 4.77483 7.73758C4.77483 8.97675 4.91294 10.0839 5.12945 10.8681C5.23853 11.2632 5.36108 11.5525 5.47971 11.7332C5.54979 11.84 5.59918 11.8816 5.62343 11.8973C5.62758 11.8945 5.63239 11.8911 5.63785 11.8868C5.67657 11.8567 5.72917 11.8002 5.78131 11.7111C5.89777 11.5121 6.15348 11.4452 6.35245 11.5617C6.55143 11.6781 6.61832 11.9338 6.50187 12.1328C6.40736 12.2943 6.28887 12.4382 6.1504 12.5459C6.01484 12.6513 5.83528 12.7403 5.62833 12.7403C5.23435 12.7403 4.95716 12.4586 4.78173 12.1913C4.59561 11.9078 4.44473 11.5252 4.32467 11.0903C4.08291 10.2146 3.93994 9.02908 3.93994 7.73758C3.93994 6.44608 4.08291 5.26055 4.32467 4.38485C4.44473 3.94996 4.59561 3.56739 4.78173 3.28383C4.95716 3.01653 5.23435 2.73486 5.62833 2.73486C6.01189 2.73486 6.29265 3.00726 6.46711 3.27552C6.59279 3.46879 6.538 3.72736 6.34473 3.85305C6.15145 3.97874 5.89288 3.92395 5.76719 3.73067C5.71353 3.64816 5.66744 3.60316 5.63767 3.58168C5.63395 3.579 5.63069 3.57682 5.62789 3.57506C5.60559 3.58836 5.5544 3.62815 5.47971 3.74194C5.36108 3.92269 5.23853 4.21195 5.12945 4.60703Z" fill="#C4C4C4"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1283 4.12035C9.87089 5.05906 9.70647 6.37948 9.70647 7.85462C9.70647 9.32977 9.87089 10.6502 10.1283 11.5889C10.2578 12.0612 10.4045 12.4133 10.5499 12.6374C10.6221 12.7489 10.6841 12.8132 10.7291 12.8468C10.7506 12.8628 10.7651 12.8695 10.7725 12.8723C10.7761 12.8736 10.7783 12.8741 10.7791 12.8742L10.7799 12.8744L10.7799 12.8744L10.7799 12.8744L10.7799 12.8744L10.78 12.8744L10.7808 12.8742C10.7816 12.8741 10.7838 12.8736 10.7874 12.8723C10.7947 12.8695 10.8093 12.8628 10.8307 12.8468C10.8757 12.8132 10.9378 12.7489 11.01 12.6374C11.1553 12.4133 11.3021 12.0612 11.4316 11.5889C11.689 10.6502 11.8534 9.32977 11.8534 7.85462C11.8534 6.37948 11.689 5.05906 11.4316 4.12035C11.3021 3.64802 11.1553 3.29599 11.01 3.07181C10.9378 2.96039 10.8757 2.89605 10.8307 2.86247C10.8093 2.84648 10.7947 2.8397 10.7874 2.83698C10.7838 2.83563 10.7816 2.83517 10.7808 2.83501L10.78 2.8349L10.7799 2.83489L10.7799 2.83489L10.7799 2.83489L10.7799 2.8349L10.7791 2.83501C10.7783 2.83517 10.7761 2.83563 10.7725 2.83698C10.7651 2.8397 10.7506 2.84648 10.7291 2.86247C10.6841 2.89605 10.6221 2.96039 10.5499 3.07181C10.4045 3.29599 10.2578 3.64802 10.1283 4.12035ZM9.84933 2.61764C10.0489 2.30973 10.3541 2 10.7799 2C11.2058 2 11.5109 2.30973 11.7105 2.61764C11.9219 2.94374 12.0965 3.38796 12.2368 3.89957C12.519 4.92873 12.6883 6.3269 12.6883 7.85462C12.6883 9.38235 12.519 10.7805 12.2368 11.8097C12.0965 12.3213 11.9219 12.7655 11.7105 13.0916C11.5109 13.3995 11.2058 13.7092 10.7799 13.7092C10.3541 13.7092 10.0489 13.3995 9.84933 13.0916C9.63793 12.7655 9.46341 12.3213 9.32312 11.8097C9.04092 10.7805 8.87158 9.38235 8.87158 7.85462C8.87158 6.3269 9.04092 4.92873 9.32312 3.89957C9.46341 3.38796 9.63793 2.94374 9.84933 2.61764Z" fill="#C4C4C4"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.26534 4.10905C2.00338 5.04001 1.83489 6.3532 1.83489 7.82957C1.83489 9.3071 1.9975 10.6275 2.25395 11.5656C2.38298 12.0376 2.52942 12.3889 2.67478 12.6124C2.74698 12.7235 2.80907 12.7876 2.8543 12.8211C2.87585 12.8371 2.8907 12.844 2.89855 12.8468C2.90244 12.8483 2.90492 12.8488 2.90614 12.8491C2.90733 12.8493 2.90797 12.8493 2.90835 12.8493H2.90847C2.91216 12.8493 2.96513 12.8497 3.06709 12.7299C3.17083 12.6081 3.28495 12.4059 3.39934 12.1128C3.48315 11.898 3.72519 11.7918 3.93997 11.8756C4.15475 11.9594 4.26093 12.2015 4.17713 12.4162C4.04711 12.7495 3.89238 13.0485 3.70282 13.2711C3.51271 13.4944 3.248 13.6842 2.90835 13.6842C2.48203 13.6842 2.17586 13.3767 1.97487 13.0676C1.76277 12.7414 1.58842 12.2972 1.44861 11.7858C1.16735 10.7569 1 9.35876 1 7.82957C1 6.2992 1.17368 4.90633 1.46166 3.88291C1.60483 3.37409 1.78273 2.93292 1.99773 2.60928C2.20189 2.30195 2.5096 2 2.9328 2C3.28967 2 3.56218 2.22163 3.74971 2.46002C3.94226 2.70478 4.10133 3.03449 4.23133 3.40764C4.30717 3.62535 4.19217 3.86333 3.97445 3.93918C3.75673 4.01503 3.51875 3.90002 3.44291 3.6823C3.32849 3.35389 3.20649 3.11983 3.09352 2.97622C2.99547 2.85157 2.93923 2.83649 2.93147 2.83496C2.92979 2.83512 2.9265 2.83569 2.92101 2.83768C2.91248 2.84077 2.89707 2.84791 2.87507 2.86396C2.829 2.89755 2.76618 2.96134 2.69316 3.07126C2.54612 3.29259 2.39713 3.64068 2.26534 4.10905Z" fill="#C4C4C4"/>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><path d="M11.32,12.5H1.68a1,1,0,0,1-.986-1.164l.667-4A1,1,0,0,1,2.347,6.5h8.306a1,1,0,0,1,.986.836l.667,4A1,1,0,0,1,11.32,12.5Z" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><circle cx="6.5" cy="9.5" r="3" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="5.5" y1="4.5" x2="5.5" y2="6.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="7.5" y1="4.5" x2="7.5" y2="6.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="6.5" y1="9.5" x2="7.5" y2="8.5" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M12.5,2.5v1a1,1,0,0,1-1,1H1.5a1,1,0,0,1-1-1v-1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M10.562,2C9.5,1.25,9.5.5,6.438.5A5.134,5.134,0,0,0,3.751,1.813L2.5.5v3L3.751,2.187A5.134,5.134,0,0,0,6.438,3.5C9.5,3.5,9.5,2.75,10.562,2Z" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.5" y1="2.5" x2="7.5" y2="3.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><circle cx="8.5" cy="1.5" r="0.5" style="fill:#009688"/><line x1="10.5" y1="2.5" x2="10.5" y2="2.5" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-miterlimit:10"/></svg>
|
||||
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 1.4 KiB |
Reference in New Issue
Block a user