diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs index 0d2ed9180..8407aad0f 100644 --- a/ActionBar/PrintStatusRow.cs +++ b/ActionBar/PrintStatusRow.cs @@ -234,10 +234,7 @@ namespace MatterHackers.MatterControl.ActionBar { ImageButtonFactory imageButtonFactory = new ImageButtonFactory(); imageButtonFactory.InvertImageColor = false; - ImageBuffer levelingImage = StaticData.Instance.LoadIcon("leveling_32x32.png"); - levelingImage.SetRecieveBlender(new BlenderPreMultBGRA()); - int iconSize = (int)(16 * GuiWidget.DeviceScale); - levelingImage = ImageBuffer.CreateScaledImage(levelingImage, iconSize, iconSize); + ImageBuffer levelingImage = StaticData.Instance.LoadIcon("leveling_32x32.png", 16, 16); Button autoLevelButton = imageButtonFactory.Generate(levelingImage, levelingImage); autoLevelButton.Cursor = Cursors.Hand; autoLevelButton.Margin = new Agg.BorderDouble(top: 3); diff --git a/ActionBar/PrinterSelector.cs b/ActionBar/PrinterSelector.cs index 3e44b2af7..bbdff22a3 100644 --- a/ActionBar/PrinterSelector.cs +++ b/ActionBar/PrinterSelector.cs @@ -27,12 +27,15 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using MatterHackers.Agg; +using MatterHackers.Agg.Image; using MatterHackers.Agg.ImageProcessing; using MatterHackers.Agg.PlatformAbstract; using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterControls.PrinterConnections; using MatterHackers.MatterControl.SlicerConfiguration; +using MatterHackers.VectorMath; using System; namespace MatterHackers.MatterControl @@ -54,7 +57,8 @@ namespace MatterHackers.MatterControl this.SelectedValue = ActiveSliceSettings.Instance.Id(); } - this.AddItem(InvertLightness.DoInvertLightness(StaticData.Instance.LoadIcon("icon_circle_plus.png")), "Add New Printer...", "new"); + ImageBuffer plusImage = StaticData.Instance.LoadIcon("icon_plus.png", 32, 32); + this.AddItem(plusImage, "Add New Printer...", "new"); this.SelectionChanged += (s, e) => { diff --git a/ApplicationView/AdvancedControlsPanel.cs b/ApplicationView/AdvancedControlsPanel.cs index a4e540ba6..18122ad44 100644 --- a/ApplicationView/AdvancedControlsPanel.cs +++ b/ApplicationView/AdvancedControlsPanel.cs @@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using MatterHackers.Agg; +using MatterHackers.Agg.PlatformAbstract; using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; @@ -98,7 +99,7 @@ namespace MatterHackers.MatterControl TextImageButtonFactory advancedControlsButtonFactory = new TextImageButtonFactory(); advancedControlsButtonFactory.fontSize = 14; advancedControlsButtonFactory.invertImageLocation = false; - backButton = advancedControlsButtonFactory.Generate(LocalizedString.Get("Back"), "icon_arrow_left_32x32.png"); + backButton = advancedControlsButtonFactory.Generate(LocalizedString.Get("Back"), StaticData.Instance.LoadIcon("icon_arrow_left_32x32.png", 32,32)); backButton.ToolTipText = "Switch to Queue, Library and History".Localize(); backButton.Margin = new BorderDouble(right: 3); backButton.VAnchor = VAnchor.ParentBottom; diff --git a/ApplicationView/CompactSlidePanel.cs b/ApplicationView/CompactSlidePanel.cs index 9f674bf17..63f44d79a 100644 --- a/ApplicationView/CompactSlidePanel.cs +++ b/ApplicationView/CompactSlidePanel.cs @@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project. */ using MatterHackers.Agg; +using MatterHackers.Agg.PlatformAbstract; using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; @@ -83,7 +84,7 @@ namespace MatterHackers.MatterControl invertImageLocation = true }; - Button advancedControlsLinkButton = advancedControlsButtonFactory.Generate(LocalizedString.Get("Settings\n& Controls"), "icon_arrow_right_32x32.png"); + Button advancedControlsLinkButton = advancedControlsButtonFactory.Generate(LocalizedString.Get("Settings\n& Controls"), StaticData.Instance.LoadIcon("icon_arrow_right_32x32.png", 32,32)); advancedControlsLinkButton.Name = "SettingsAndControls"; advancedControlsLinkButton.ToolTipText = "Switch to Settings, Controls and Options".Localize(); advancedControlsLinkButton.Margin = new BorderDouble(right: 3); diff --git a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs index f5b8ef22b..e49da382c 100644 --- a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs +++ b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs @@ -48,7 +48,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage buttonRow.HAnchor = HAnchor.ParentLeftRight; buttonRow.Margin = new BorderDouble(0, 4); - Button editButton = textImageButtonFactory.GenerateEditButton(); + Button editButton = TextImageButtonFactory.GetThemedEditButton(); + editButton.Margin = new BorderDouble(2, 2, 2, 0); + editButton.VAnchor = Agg.UI.VAnchor.ParentTop; + editButton.VAnchor = VAnchor.ParentCenter; editButton.Click += (sender, e) => { @@ -77,10 +80,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage UiThread.RunOnIdle(() => LevelWizardBase.ShowPrintLevelWizard(LevelWizardBase.RuningState.UserRequestedCalibration)); }; - ImageBuffer levelingImage = StaticData.Instance.LoadIcon("leveling_32x32.png"); - levelingImage.SetRecieveBlender(new BlenderPreMultBGRA()); - int iconSize = (int)(24 * GuiWidget.DeviceScale); - levelingImage = ImageBuffer.CreateScaledImage(levelingImage, iconSize, iconSize); + ImageBuffer levelingImage = StaticData.Instance.LoadIcon("leveling_32x32.png", 24, 24); if (!ActiveTheme.Instance.IsDarkTheme) { diff --git a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs index 435fff260..8f299e00e 100644 --- a/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs +++ b/ConfigurationPage/PrinterSettings/PrinterSettingsView.cs @@ -168,10 +168,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage notificationSettingsLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor; notificationSettingsLabel.VAnchor = VAnchor.ParentCenter; - ImageBuffer levelingImage = StaticData.Instance.LoadIcon("leveling_32x32.png"); - levelingImage.SetRecieveBlender(new BlenderPreMultBGRA()); - int iconSize = (int)(24 * GuiWidget.DeviceScale); - levelingImage = ImageBuffer.CreateScaledImage(levelingImage, iconSize, iconSize); + ImageBuffer levelingImage = StaticData.Instance.LoadIcon("leveling_32x32.png", 24, 24); if (!ActiveTheme.Instance.IsDarkTheme) { diff --git a/ControlElements/TextImageButtonFactory.cs b/ControlElements/TextImageButtonFactory.cs index 6757d252c..e01b2547f 100644 --- a/ControlElements/TextImageButtonFactory.cs +++ b/ControlElements/TextImageButtonFactory.cs @@ -188,27 +188,6 @@ namespace MatterHackers.MatterControl return textImageButton; } - private ImageBuffer LoadUpButtonImage(string imageName) - { - ImageBuffer buffer = new ImageBuffer(10, 10, 32, new BlenderBGRA()); - StaticData.Instance.LoadIcon(imageName, buffer); - - if (!ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage) - { - InvertLightness.DoInvertLightness(buffer); - } - return buffer; - } - - public Button GenerateEditButton() - { - Button editButton = GetThemedEditButton(); - - editButton.Margin = new BorderDouble(2, 2, 2, 0); - editButton.VAnchor = Agg.UI.VAnchor.ParentTop; - return editButton; - } - public GuiWidget GenerateGroupBoxLabelWithEdit(TextWidget textWidget, out Button editButton) { FlowLayoutWidget groupLableAndEditControl = new FlowLayoutWidget(); @@ -226,22 +205,20 @@ namespace MatterHackers.MatterControl public static Button GetThemedEditButton() { - ImageBuffer normalImage = StaticData.Instance.LoadIcon("icon_edit_32x32.png"); - int iconSize = (int)(16 * GuiWidget.DeviceScale); - normalImage = ImageBuffer.CreateScaledImage(normalImage, iconSize, iconSize); + ImageBuffer normalImage = StaticData.Instance.LoadIcon("icon_edit_32x32.png", 16, 16); Button editButton; - if (!ActiveTheme.Instance.IsDarkTheme) + if (ActiveTheme.Instance.IsDarkTheme) { - editButton = new Button(0, 0, new ButtonViewThreeImage(WhiteToColor.CreateWhiteToColor(normalImage, RGBA_Bytes.Black), - WhiteToColor.CreateWhiteToColor(normalImage, RGBA_Bytes.Gray), + editButton = new Button(0, 0, new ButtonViewThreeImage(SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.Black), + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.Gray), normalImage)); } else { editButton = new Button(0, 0, new ButtonViewThreeImage(normalImage, - WhiteToColor.CreateWhiteToColor(normalImage, RGBA_Bytes.Gray), - WhiteToColor.CreateWhiteToColor(normalImage, RGBA_Bytes.Black))); + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.Gray), + SetToColor.CreateSetToColor(normalImage, RGBA_Bytes.Black))); } return editButton; @@ -280,7 +257,7 @@ namespace MatterHackers.MatterControl return textImageCheckBoxButton; } - public Button GenerateFromImages(string label, ImageBuffer normalImage, ImageBuffer hoverImage = null, ImageBuffer pressedImage = null, ImageBuffer disabledImage = null, bool centerText = false) + public Button Generate(string label, ImageBuffer normalImage, ImageBuffer hoverImage = null, ImageBuffer pressedImage = null, ImageBuffer disabledImage = null, bool centerText = false) { //Create button based on view container widget ButtonViewStates buttonViewWidget = getButtonView(label, normalImage, hoverImage, pressedImage, disabledImage, centerText); @@ -382,7 +359,7 @@ namespace MatterHackers.MatterControl disabledImage = new ImageBuffer(normalImage); } - if (!ActiveTheme.Instance.IsDarkTheme + if (ActiveTheme.Instance.IsDarkTheme && AllowThemeToAdjustImage) { if (normalImage != null) InvertLightness.DoInvertLightness(normalImage); diff --git a/CustomWidgets/PopOutTextTab.cs b/CustomWidgets/PopOutTextTab.cs index 98212a213..40e75be7c 100644 --- a/CustomWidgets/PopOutTextTab.cs +++ b/CustomWidgets/PopOutTextTab.cs @@ -99,9 +99,7 @@ namespace MatterHackers.Agg.UI tabTitle.AutoExpandBoundsToText = true; leftToRight.AddChild(tabTitle); - ImageBuffer popOutImageClick = StaticData.Instance.LoadIcon("icon_pop_out_32x32.png"); - int iconSize = (int)(16 * GuiWidget.DeviceScale); - popOutImageClick = ImageBuffer.CreateScaledImage(popOutImageClick, iconSize, iconSize); + ImageBuffer popOutImageClick = StaticData.Instance.LoadIcon("icon_pop_out_32x32.png", 16, 16); if (ActiveTheme.Instance.IsDarkTheme) { InvertLightness.DoInvertLightness(popOutImageClick); diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index fe6cbb52f..01a024e76 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -212,16 +212,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow addButton.Enabled = false; } - ImageBuffer normalImage = StaticData.Instance.LoadIcon("icon_edit_32x32.png"); - int iconSize = (int)(14 * GuiWidget.DeviceScale); - normalImage = ImageBuffer.CreateScaledImage(normalImage, iconSize, iconSize); + ImageBuffer normalImage = StaticData.Instance.LoadIcon("icon_edit_32x32.png", 14, 14); if (!ActiveTheme.Instance.IsDarkTheme) { InvertLightness.DoInvertLightness(normalImage); } - Button enterEdittingButton = textImageButtonFactory.GenerateFromImages("Edit".Localize(), normalImage); + Button enterEdittingButton = textImageButtonFactory.Generate("Edit".Localize(), normalImage); enterEdittingButton.Name = "3D View Edit"; enterEdittingButton.Margin = new BorderDouble(right: 4); enterEdittingButton.Click += (sender, e) => @@ -1148,7 +1146,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow FlowLayoutWidget rotateButtonContainer = new FlowLayoutWidget(FlowDirection.LeftToRight); rotateButtonContainer.HAnchor = HAnchor.ParentLeftRight; - Button rotateXButton = textImageButtonFactory.Generate("", "icon_rotate_32x32.png"); + ImageBuffer rotateImage = StaticData.Instance.LoadIcon("icon_rotate_32x32.png", 32, 32); + Button rotateXButton = textImageButtonFactory.Generate("", rotateImage); TextWidget centeredX = new TextWidget("X", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor); centeredX.Margin = new BorderDouble(3, 0, 0, 0); centeredX.AnchorCenter(); rotateXButton.AddChild(centeredX); rotateButtonContainer.AddChild(rotateXButton); rotateControls.Add(rotateXButton); @@ -1166,7 +1165,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } }; - Button rotateYButton = textImageButtonFactory.Generate("", "icon_rotate_32x32.png"); + Button rotateYButton = textImageButtonFactory.Generate("", rotateImage); TextWidget centeredY = new TextWidget("Y", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor); centeredY.Margin = new BorderDouble(3, 0, 0, 0); centeredY.AnchorCenter(); rotateYButton.AddChild(centeredY); rotateButtonContainer.AddChild(rotateYButton); rotateControls.Add(rotateYButton); @@ -1184,7 +1183,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } }; - Button rotateZButton = textImageButtonFactory.Generate("", "icon_rotate_32x32.png"); + Button rotateZButton = textImageButtonFactory.Generate("", rotateImage); TextWidget centeredZ = new TextWidget("Z", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor); centeredZ.Margin = new BorderDouble(3, 0, 0, 0); centeredZ.AnchorCenter(); rotateZButton.AddChild(centeredZ); rotateButtonContainer.AddChild(rotateZButton); rotateControls.Add(rotateZButton); diff --git a/Queue/QueueDataWidget.cs b/Queue/QueueDataWidget.cs index dea41882a..dff7b73b1 100644 --- a/Queue/QueueDataWidget.cs +++ b/Queue/QueueDataWidget.cs @@ -43,6 +43,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using MatterHackers.Agg.PlatformAbstract; namespace MatterHackers.MatterControl.PrintQueue { @@ -175,7 +176,7 @@ namespace MatterHackers.MatterControl.PrintQueue buttonPanel1.Padding = new BorderDouble(0, 3); buttonPanel1.MinimumSize = new Vector2(0, 46); { - addToQueueButton = textImageButtonFactory.Generate(LocalizedString.Get("Add"), "icon_circle_plus.png"); + addToQueueButton = textImageButtonFactory.Generate(LocalizedString.Get("Add"), StaticData.Instance.LoadIcon("icon_plus.png", 32, 32)); addToQueueButton.ToolTipText = "Add an .stl, .amf, .gcode or .zip file to the Queue".Localize(); buttonPanel1.AddChild(addToQueueButton); addToQueueButton.Margin = new BorderDouble(0, 0, 3, 0); @@ -184,7 +185,7 @@ namespace MatterHackers.MatterControl.PrintQueue // put in the creator button { - createButton = textImageButtonFactory.Generate(LocalizedString.Get("Create"), "icon_creator_white_32x32.png"); + createButton = textImageButtonFactory.Generate(LocalizedString.Get("Create"), StaticData.Instance.LoadIcon("icon_creator.png", 32, 32)); createButton.ToolTipText = "Choose a Create Tool to generate custom designs".Localize(); createButton.Name = "Design Tool Button"; buttonPanel1.AddChild(createButton); @@ -199,7 +200,7 @@ namespace MatterHackers.MatterControl.PrintQueue if (OemSettings.Instance.ShowShopButton) { - shopButton = textImageButtonFactory.Generate(LocalizedString.Get("Buy Materials"), "icon_shopping_cart_32x32.png"); + shopButton = textImageButtonFactory.Generate(LocalizedString.Get("Buy Materials"), StaticData.Instance.LoadIcon("icon_shopping_cart_32x32.png", 32,32)); shopButton.ToolTipText = "Shop online for printing materials".Localize(); shopButton.Name = "Buy Materials Button"; buttonPanel1.AddChild(shopButton); diff --git a/SlicerConfiguration/SettingsControlSelectors.cs b/SlicerConfiguration/SettingsControlSelectors.cs index eb55e2ba6..3f5455996 100644 --- a/SlicerConfiguration/SettingsControlSelectors.cs +++ b/SlicerConfiguration/SettingsControlSelectors.cs @@ -239,7 +239,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration menuItem.Selected += MenuItem_Selected; } - MenuItem addNewPreset = dropDownList.AddItem(InvertLightness.DoInvertLightness(StaticData.Instance.LoadIcon("icon_circle_plus.png")), "Add New Setting...", "new"); + MenuItem addNewPreset = dropDownList.AddItem(StaticData.Instance.LoadIcon("icon_plus.png", 32, 32), "Add New Setting...", "new"); addNewPreset.Selected += onNewItemSelect; if (false) diff --git a/StaticData/Icons/406.png b/StaticData/Icons/406.png deleted file mode 100644 index f8f6739e1..000000000 Binary files a/StaticData/Icons/406.png and /dev/null differ diff --git a/StaticData/Icons/424.png b/StaticData/Icons/424.png new file mode 100644 index 000000000..e2a012c2f Binary files /dev/null and b/StaticData/Icons/424.png differ diff --git a/StaticData/Icons/Android/power_48x48.png b/StaticData/Icons/Android/power_48x48.png index 57c92bf9d..6608b9464 100644 Binary files a/StaticData/Icons/Android/power_48x48.png and b/StaticData/Icons/Android/power_48x48.png differ diff --git a/StaticData/Icons/FileDialog/Warning.png b/StaticData/Icons/FileDialog/Warning.png index b7b8bce6f..996f6579a 100644 Binary files a/StaticData/Icons/FileDialog/Warning.png and b/StaticData/Icons/FileDialog/Warning.png differ diff --git a/StaticData/Icons/TouchScreen/power_48x48.png b/StaticData/Icons/TouchScreen/power_48x48.png index 57c92bf9d..746c1aa33 100644 Binary files a/StaticData/Icons/TouchScreen/power_48x48.png and b/StaticData/Icons/TouchScreen/power_48x48.png differ diff --git a/StaticData/Icons/gear_icon.png b/StaticData/Icons/gear_icon.png index cc89959c5..57f71c050 100644 Binary files a/StaticData/Icons/gear_icon.png and b/StaticData/Icons/gear_icon.png differ diff --git a/StaticData/Icons/icon_arrow_left_32x32.png b/StaticData/Icons/icon_arrow_left_32x32.png index a298830c7..caec38ceb 100644 Binary files a/StaticData/Icons/icon_arrow_left_32x32.png and b/StaticData/Icons/icon_arrow_left_32x32.png differ diff --git a/StaticData/Icons/icon_arrow_right_32x32.png b/StaticData/Icons/icon_arrow_right_32x32.png index c2f56976a..2a6411086 100644 Binary files a/StaticData/Icons/icon_arrow_right_32x32.png and b/StaticData/Icons/icon_arrow_right_32x32.png differ diff --git a/StaticData/Icons/icon_creator.png b/StaticData/Icons/icon_creator.png new file mode 100644 index 000000000..180bd84b2 Binary files /dev/null and b/StaticData/Icons/icon_creator.png differ diff --git a/StaticData/Icons/icon_creator_white_32x32.png b/StaticData/Icons/icon_creator_white_32x32.png deleted file mode 100644 index dd4e5f247..000000000 Binary files a/StaticData/Icons/icon_creator_white_32x32.png and /dev/null differ diff --git a/StaticData/Icons/icon_edit_32x32.png b/StaticData/Icons/icon_edit_32x32.png index e705bcbec..c54eb2911 100644 Binary files a/StaticData/Icons/icon_edit_32x32.png and b/StaticData/Icons/icon_edit_32x32.png differ diff --git a/StaticData/Icons/icon_gear_64x64.png b/StaticData/Icons/icon_gear_64x64.png deleted file mode 100755 index 44d6c7f38..000000000 Binary files a/StaticData/Icons/icon_gear_64x64.png and /dev/null differ diff --git a/StaticData/Icons/icon_gear_dot.png b/StaticData/Icons/icon_gear_dot.png new file mode 100644 index 000000000..35474e887 Binary files /dev/null and b/StaticData/Icons/icon_gear_dot.png differ diff --git a/StaticData/Icons/icon_insert_32x32.png b/StaticData/Icons/icon_insert_32x32.png index 17d451a6a..1ebb0ea01 100644 Binary files a/StaticData/Icons/icon_insert_32x32.png and b/StaticData/Icons/icon_insert_32x32.png differ diff --git a/StaticData/Icons/icon_plus.png b/StaticData/Icons/icon_plus.png new file mode 100644 index 000000000..ffb923bf1 Binary files /dev/null and b/StaticData/Icons/icon_plus.png differ diff --git a/StaticData/Icons/icon_pop_out_32x32.png b/StaticData/Icons/icon_pop_out_32x32.png index 991bf5430..f45016c0d 100644 Binary files a/StaticData/Icons/icon_pop_out_32x32.png and b/StaticData/Icons/icon_pop_out_32x32.png differ diff --git a/StaticData/Icons/icon_power_32x32.png b/StaticData/Icons/icon_power_32x32.png index 3bb071808..7db55a391 100644 Binary files a/StaticData/Icons/icon_power_32x32.png and b/StaticData/Icons/icon_power_32x32.png differ diff --git a/StaticData/Icons/icon_rotate_32x32.png b/StaticData/Icons/icon_rotate_32x32.png index 03c71941c..5cab82914 100644 Binary files a/StaticData/Icons/icon_rotate_32x32.png and b/StaticData/Icons/icon_rotate_32x32.png differ diff --git a/StaticData/Icons/icon_sd_card_115x115.png b/StaticData/Icons/icon_sd_card_115x115.png index 2f7e7391c..c2b207946 100644 Binary files a/StaticData/Icons/icon_sd_card_115x115.png and b/StaticData/Icons/icon_sd_card_115x115.png differ diff --git a/StaticData/Icons/icon_shopping_cart_32x32.png b/StaticData/Icons/icon_shopping_cart_32x32.png index 4edcdd33a..6dd49b761 100644 Binary files a/StaticData/Icons/icon_shopping_cart_32x32.png and b/StaticData/Icons/icon_shopping_cart_32x32.png differ diff --git a/StaticData/Icons/provider_loading/01.png b/StaticData/Icons/provider_loading/01.png index 3507c9177..df07c45d7 100644 Binary files a/StaticData/Icons/provider_loading/01.png and b/StaticData/Icons/provider_loading/01.png differ diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 0b49ea8a2..58f13d68e 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 0b49ea8a261eeb1193bdabdf04c628652d835dcc +Subproject commit 58f13d68ed9ada8122898c67a982f63d2805f856 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 772625e61..7f9f7d561 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 772625e6147a994e8f6ed342377bbdbe958943d7 +Subproject commit 7f9f7d561325a32c592ae5dabe5358fe3326a794