nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

making default window better

Browse source
This commit is contained in:
Lars Brubaker 2023-03-21 18:29:24 -07:00
parent ea6ced10d1
commit 3946b8fa20
6 changed files with 45 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -1544,12 +1544,7 @@ namespace MatterHackers.MatterControl
this.IsReloading = true;
var theme = ApplicationController.Instance.Theme;
SingleWindowProvider.SetWindowTheme(theme.TextColor,
theme.DefaultFontSize - 1,
() => theme.CreateSmallResetButton(),
theme.ToolbarPadding,
theme.TabBarBackground,
new Color(theme.PrimaryAccentColor, 175));
SingleWindowProvider.SetWindowTheme(theme);
reloadingOverlay = new GuiWidget
{

9
MatterControlLib/ApplicationView/Themes/ThemeConfigExtensions.cs
View file

@ -272,15 +272,6 @@ namespace MatterHackers.MatterControl
};
}
public static GuiWidget CreateSmallResetButton(this ThemeConfig theme)
{
return new HoverImageWidget(theme.RestoreNormal, theme.RestoreHover)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(0, 0, 5, 0)
};
}
public static PopupMenuButton CreateSplitButton(this ThemeConfig theme, SplitButtonParams buttonParams, OperationGroup operationGroup = null)
{
PopupMenuButton menuButton = null;

67
MatterControlLib/CustomWidgets/HoverImageWidget.cs
View file

@ -1,67 +0,0 @@
/*
Copyright (c) 2018, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
namespace MatterHackers.MatterControl
{
public class HoverImageWidget : ImageWidget
{
private ImageBuffer hoverImage;
private bool mouseInBounds = false;
public HoverImageWidget(ImageBuffer normalImage, ImageBuffer hoverImage)
: base(normalImage, listenForImageChanged: false)
{
this.hoverImage = hoverImage;
}
public override ImageBuffer Image
{
get => mouseInBounds ? hoverImage : base.Image;
set => base.Image = value;
}
public override void OnMouseEnterBounds(MouseEventArgs mouseEvent)
{
mouseInBounds = true;
base.OnMouseEnterBounds(mouseEvent);
this.Invalidate();
}
public override void OnMouseLeaveBounds(MouseEventArgs mouseEvent)
{
mouseInBounds = false;
base.OnMouseLeaveBounds(mouseEvent);
this.Invalidate();
}
}
}

7
Program.cs
View file

@ -300,12 +300,7 @@ namespace MatterHackers.MatterControl
var rootSystemWindow = Application.LoadRootWindow(width, height);
var theme = ApplicationController.Instance.Theme;
SingleWindowProvider.SetWindowTheme(theme.TextColor,
theme.DefaultFontSize - 1,
() => theme.CreateSmallResetButton(),
theme.ToolbarPadding,
theme.TabBarBackground,
new Color(theme.PrimaryAccentColor, 175));
SingleWindowProvider.SetWindowTheme(theme);
ApplicationController.Instance.KeepAwake = KeepAwake;

42
StaticData/Translations/Master.txt
View file

@ -415,6 +415,9 @@ Translated:Are you sure you want to sign out? You will not have access to your p
English:Arrange All Parts
Translated:Arrange All Parts
English:Arranging
Translated:Arranging
English:As the time to print a layer decreases to this, the fan speed will be increased up to its maximum speed.
Translated:As the time to print a layer decreases to this, the fan speed will be increased up to its maximum speed.
@ -535,6 +538,9 @@ Translated:Be sure you are not pressing down on the bed while moving the paper.
English:Bed
Translated:Bed
English:Bed Depth
Translated:Bed Depth
English:Bed Dislodged
Translated:Bed Dislodged
@ -580,6 +586,9 @@ Translated:Bed Temperature Set to 0
English:Bed Temperature:
Translated:Bed Temperature:
English:Bed Width
Translated:Bed Width
English:Bed Wipe Temperature
Translated:Bed Wipe Temperature
@ -823,6 +832,9 @@ Translated:Clear Bed
English:Clear Bed G-Code
Translated:Clear Bed G-Code
English:Clear Bed When Done
Translated:Clear Bed When Done
English:Clear Cache
Translated:Clear Cache
@ -1138,6 +1150,9 @@ Translated:Create Part Sheet
English:Create Perimeter
Translated:Create Perimeter
English:Create Plates
Translated:Create Plates
English:Create Printer
Translated:Create Printer
@ -1156,6 +1171,9 @@ Translated:Create Support
English:Create Supports
Translated:Create Supports
English:Create the plates for all the selected STLs.
Translated:Create the plates for all the selected STLs.
English:Creates a brim attached to the base of the print. Useful to prevent warping when printing ABS (and other warping-prone plastics) as it helps parts adhere to the bed.
Translated:Creates a brim attached to the base of the print. Useful to prevent warping when printing ABS (and other warping-prone plastics) as it helps parts adhere to the bed.
@ -2512,6 +2530,12 @@ Translated:Iterations
English:Jerk Velocity
Translated:Jerk Velocity
English:Job Manager
Translated:Job Manager
English:Jobs Folder
Translated:Jobs Folder
English:Junction Deviation [mm/s]
Translated:Junction Deviation [mm/s]
@ -2695,6 +2719,9 @@ Translated:Loading GCode
English:Loading Help
Translated:Loading Help
English:Loading Stls
Translated:Loading Stls
English:Local Library
Translated:Local Library
@ -3421,6 +3448,9 @@ Translated:Outlines (default)
English:Output
Translated:Output
English:Output Folder
Translated:Output Folder
English:Output only the first layer of the print. Especially useful for outputting gcode data for applications like engraving or cutting.
Translated:Output only the first layer of the print. Especially useful for outputting gcode data for applications like engraving or cutting.
@ -3475,6 +3505,9 @@ Translated:Part(s) to Subtract and Replace
English:Parts
Translated:Parts
English:Parts Folder
Translated:Parts Folder
English:Password
Translated:Password
@ -4399,6 +4432,9 @@ Translated:Saving changes
English:Saving Changes
Translated:Saving Changes
English:Saving PDF
Translated:Saving PDF
English:SCAD Script
Translated:SCAD Script
@ -4471,6 +4507,9 @@ Translated:Select an object to copy its color
English:Select cell to edit
Translated:Select cell to edit
English:Select Folder
Translated:Select Folder
English:Select Parts
Translated:Select Parts
@ -4492,6 +4531,9 @@ Translated:Select this option only if your printer does not appear in the list
English:Select What to Import
Translated:Select What to Import
English:Selecte a directory
Translated:Selecte a directory
English:Selected Children
Translated:Selected Children

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 69cf72c0b7d04a9e630ee5abbea020b0a0fca7bb
Subproject commit 8cc9cabda4490c7121aa4c626dbf2757031aa38b