mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 03:43:52 +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,8 +1 @@
|
||||
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M15.0019 23.6828C14.3544 23.9947 13.2907 23.9947 12.6432 23.6828L3.48563 19.3602C2.83812 19.0483 2.83812 18.5581 3.48563 18.2462L12.5969 14.0573C13.2444 13.7454 14.3082 13.7454 14.9557 14.0573L24.067 18.2462C24.7145 18.5581 24.7145 19.0483 24.067 19.3602L15.0019 23.6828Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7763 14.3234C13.3996 14.3234 13.0512 14.3934 12.8139 14.5078L12.8058 14.5117L3.69891 18.6984C3.61646 18.7385 3.56364 18.7754 3.53155 18.8032C3.56391 18.8312 3.61735 18.8685 3.70099 18.909L12.8566 23.2306L12.8602 23.2323C13.0975 23.3467 13.4459 23.4167 13.8225 23.4167C14.1992 23.4167 14.5476 23.3467 14.7849 23.2323L14.7867 23.2315L23.85 18.9098C23.8502 18.9096 23.8497 18.9099 23.85 18.9098C23.934 18.8692 23.9886 18.8313 24.021 18.8032C23.9889 18.7754 23.9361 18.7385 23.8537 18.6984L14.7386 14.5078C14.5013 14.3935 14.153 14.3234 13.7763 14.3234ZM15.1684 13.6048C14.7589 13.4087 14.2536 13.3234 13.7763 13.3234C13.299 13.3234 12.7937 13.4087 12.3842 13.6048L3.27677 17.7919L3.26862 17.7957C2.88732 17.9794 2.5 18.3093 2.5 18.8032C2.5 19.2972 2.88732 19.627 3.26862 19.8107L12.428 24.1341C12.8379 24.3311 13.3443 24.4167 13.8225 24.4167C14.3011 24.4167 14.8079 24.331 15.2179 24.1337C15.2183 24.1336 15.2186 24.1334 15.2189 24.1332L24.2822 19.8116L24.284 19.8107C24.6653 19.627 25.0526 19.2972 25.0526 18.8032C25.0526 18.3093 24.6653 17.9794 24.284 17.7957L15.1684 13.6048Z" fill="#36363C"/>
|
||||
<path d="M15.0019 19.2716C14.3544 19.5836 13.2907 19.5836 12.6432 19.2716L3.48563 14.9491C2.83812 14.6372 2.83812 14.147 3.48563 13.835L12.6432 9.69074C13.2907 9.3788 14.3544 9.3788 15.0019 9.69074L24.1132 13.8796C24.7607 14.1915 24.7607 14.6817 24.1132 14.9937L15.0019 19.2716Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.8225 9.95679C13.4459 9.95679 13.0975 10.0269 12.8602 10.1412L12.8494 10.1464L3.69769 14.2879C3.61594 14.3277 3.56348 14.3644 3.53155 14.3921C3.56391 14.4201 3.61735 14.4574 3.70099 14.4978L12.8566 18.8195L12.8602 18.8212C13.0975 18.9355 13.4459 19.0056 13.8225 19.0056C14.1992 19.0056 14.5476 18.9355 14.7849 18.8212L14.7894 18.819L23.8962 14.5432C23.8969 14.5429 23.8976 14.5426 23.8982 14.5422C23.9817 14.5019 24.035 14.4646 24.0673 14.4366C24.0352 14.4088 23.9824 14.3719 23.8999 14.3318L14.7849 10.1413C14.5476 10.0269 14.1992 9.95679 13.8225 9.95679ZM15.2146 9.23822C14.8052 9.04208 14.2998 8.95679 13.8225 8.95679C13.3458 8.95679 12.8411 9.04188 12.4319 9.23753L3.27948 13.3795L3.26862 13.3846C2.88732 13.5683 2.5 13.8981 2.5 14.3921C2.5 14.886 2.88732 15.2159 3.26862 15.3995L12.428 19.723C12.8378 19.92 13.3443 20.0056 13.8225 20.0056C14.3006 20.0056 14.8068 19.92 15.2166 19.7232C15.2174 19.7229 15.2181 19.7225 15.2189 19.7221L24.3257 15.4463L24.3302 15.4441C24.7115 15.2604 25.0988 14.9306 25.0988 14.4366C25.0988 13.9427 24.7115 13.6128 24.3302 13.4291L15.2146 9.23822Z" fill="#36363C"/>
|
||||
<path d="M15.0019 14.8594C14.3544 15.1714 13.2907 15.1714 12.6432 14.8594L3.48563 10.5369C2.83812 10.2249 2.83812 9.73475 3.48563 9.42281L12.5969 5.23395C13.2444 4.92202 14.3082 4.92202 14.9557 5.23395L24.067 9.42281C24.7145 9.73475 24.7145 10.2249 24.067 10.5369L15.0019 14.8594Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7763 5.5C13.3996 5.5 13.0512 5.57007 12.8139 5.68441L12.8058 5.68832L3.69893 9.87506C3.61647 9.91512 3.56364 9.95205 3.53155 9.97984C3.56391 10.0079 3.61735 10.0452 3.70099 10.0856L12.8566 14.4073L12.8602 14.409C13.0975 14.5233 13.4459 14.5934 13.8225 14.5934C14.1992 14.5934 14.5476 14.5233 14.7849 14.409L14.7867 14.4081L23.85 10.0864C23.8502 10.0863 23.8497 10.0866 23.85 10.0864C23.934 10.0458 23.9886 10.0079 24.021 9.97983C23.9889 9.95205 23.9361 9.91511 23.8537 9.87506L14.7386 5.68448C14.5013 5.57015 14.153 5.5 13.7763 5.5ZM15.1684 4.78142C14.7589 4.58529 14.2536 4.5 13.7763 4.5C13.299 4.5 12.7937 4.58529 12.3842 4.78142L3.27677 8.96852L3.26862 8.97236C2.88732 9.15605 2.5 9.48589 2.5 9.97984C2.5 10.4738 2.88732 10.8036 3.26862 10.9873L12.428 15.3108C12.8379 15.5077 13.3443 15.5934 13.8225 15.5934C14.3012 15.5934 14.8081 15.5076 15.2182 15.3102C15.2179 15.3104 15.2184 15.3101 15.2182 15.3102L24.2822 10.9882L24.284 10.9873C24.6653 10.8036 25.0526 10.4738 25.0526 9.97984C25.0526 9.48589 24.6653 9.15605 24.284 8.97236L15.1684 4.78142Z" fill="#36363C"/>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><path d="M26.812,5.647,15.625.675a4,4,0,0,0-3.25,0L1.188,5.647A2,2,0,0,0,0,7.475v13.05a2,2,0,0,0,1.188,1.828l11.187,4.972a4,4,0,0,0,3.25,0l11.187-4.972A2,2,0,0,0,28,20.525V7.475A2,2,0,0,0,26.812,5.647Z" style="fill:#414147"/><path d="M26.241,20.675,14.885,25.809a2.143,2.143,0,0,1-1.77,0L1.759,20.675a.741.741,0,0,1,0-1.35l3.323-1.5L12.5,21.176a3.648,3.648,0,0,0,3.006,0l7.415-3.353,3.323,1.5A.741.741,0,0,1,26.241,20.675Zm-24.482-12,11.356,5.134a2.143,2.143,0,0,0,1.77,0L26.241,8.675a.741.741,0,0,0,0-1.35L14.885,2.191a2.143,2.143,0,0,0-1.77,0L1.759,7.325A.741.741,0,0,0,1.759,8.675Zm24.482,4.65-3.323-1.5L15.5,15.176a3.648,3.648,0,0,1-3.006,0L5.082,11.823l-3.323,1.5a.741.741,0,0,0,0,1.35l11.356,5.134a2.143,2.143,0,0,0,1.77,0l11.356-5.134A.741.741,0,0,0,26.241,13.325Z" style="fill:#009688"/></svg>
|
||||
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 884 B |
Reference in New Issue
Block a user