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

Fixed down arrows on edit model page

Browse source 
MatterHackers/MCCentral#538
Lost down arrow for edit options on 3D view
This commit is contained in:
Lars Brubaker 2016-10-06 10:59:51 -07:00
parent 6fc4a40379
commit 8b72131769
8 changed files with 54 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BrailleBuilder/View3DBrailleBuilder.cs
View file

@ -593,7 +593,9 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder
// put in the word editing menu
{
CheckBox expandWordOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Word Edit".Localize(), StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
CheckBox expandWordOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Word Edit".Localize(),
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandWordOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandWordOptions);

7
ControlElements/TextImageButtonFactory.cs
View file

@ -265,9 +265,12 @@ namespace MatterHackers.MatterControl
return groupLableAndEditControl;
}
public CheckBox GenerateCheckBoxButton(string label, ImageBuffer normalImageName, ImageBuffer normalToPressedImageName = null, ImageBuffer pressedImageName = null, ImageBuffer pressedToNormalImageName = null, string pressedLabel = null)
public CheckBox GenerateCheckBoxButton(string label, ImageBuffer normalImage, ImageBuffer normalToPressedImage = null, ImageBuffer pressedImage = null, ImageBuffer pressedToNormalImage = null, string pressedLabel = null)
{
CheckBoxViewStates checkBoxButtonViewWidget = getCheckBoxButtonView(label, normalImageName, normalToPressedImageName, pressedImageName, pressedToNormalImageName, pressedLabel);
if (pressedImage == null) pressedImage = normalImage;
if (pressedToNormalImage == null) pressedToNormalImage = normalToPressedImage;
CheckBoxViewStates checkBoxButtonViewWidget = getCheckBoxButtonView(label, normalImage, normalToPressedImage, pressedImage, pressedToNormalImage, pressedLabel);
//Override the width if requested
if (this.FixedWidth != 0)

5
PartPreviewWindow/View3D/SideBar/MirrorControls.cs
View file

@ -52,7 +52,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// put in the mirror options
{
expandMirrorOptions = view3DWidget.ExpandMenuOptionFactory.GenerateCheckBoxButton("Mirror".Localize().ToUpper(), StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32,32).InvertLightness());
expandMirrorOptions = view3DWidget.ExpandMenuOptionFactory.GenerateCheckBoxButton(
"Mirror".Localize().ToUpper(),
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandMirrorOptions.Margin = new BorderDouble(bottom: 2);
this.AddChild(expandMirrorOptions);

4
PartPreviewWindow/View3D/SideBar/ScaleControls.cs
View file

@ -55,7 +55,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
this.view3DWidget = view3DWidget;
{
expandScaleOptions = view3DWidget.ExpandMenuOptionFactory.GenerateCheckBoxButton("Scale".Localize().ToUpper(), StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
expandScaleOptions = view3DWidget.ExpandMenuOptionFactory.GenerateCheckBoxButton("Scale".Localize().ToUpper(),
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandScaleOptions.Margin = new BorderDouble(bottom: 2);
this.AddChild(expandScaleOptions);

29
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -132,6 +132,22 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public event EventHandler SelectedTransformChanged;
public static ImageBuffer ArrowRight
{
get
{
return StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness();
}
}
public static ImageBuffer ArrowDown
{
get
{
return StaticData.Instance.LoadIcon("icon_arrow_down_no_border_32x32.png", 32, 32).InvertLightness();
}
}
public View3DWidget(PrintItemWrapper printItemWrapper, Vector3 viewerVolume, Vector2 bedCenter, BedShape bedShape, WindowMode windowType, AutoRotate autoRotate, OpenMode openMode = OpenMode.Viewing)
{
this.openMode = openMode;
@ -1446,7 +1462,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
BorderDouble buttonMargin = new BorderDouble(top: 3);
expandRotateOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Rotate".Localize().ToUpper(), StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
expandRotateOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton(
"Rotate".Localize().ToUpper(),
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandRotateOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandRotateOptions);
expandRotateOptions.CheckedStateChanged += expandRotateOptions_CheckedStateChanged;
@ -1469,7 +1488,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// put in the material options
int numberOfExtruders = ActiveSliceSettings.Instance.GetValue<int>(SettingsKey.extruder_count);
expandMaterialOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Materials".Localize().ToUpper(), StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
expandMaterialOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Materials".Localize().ToUpper(),
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandMaterialOptions.Margin = new BorderDouble(bottom: 2);
expandMaterialOptions.CheckedStateChanged += expandMaterialOptions_CheckedStateChanged;
@ -1487,7 +1508,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// put in the view options
{
expandViewOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(), StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
expandViewOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(),
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandViewOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandViewOptions);
expandViewOptions.CheckedStateChanged += expandViewOptions_CheckedStateChanged;

8
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -398,7 +398,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
buttonRightPanel.Width = 200;
{
string label = "Model".Localize().ToUpper();
expandModelOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton(label, StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
expandModelOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton(label,
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandModelOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandModelOptions);
expandModelOptions.Checked = true;
@ -408,7 +410,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
//modelOptionsContainer.Visible = false;
buttonRightPanel.AddChild(modelOptionsContainer);
expandDisplayOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(), StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
expandDisplayOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(),
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandDisplayOptions.Name = "Display Checkbox";
expandDisplayOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandDisplayOptions);

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 2e51c545392b3d6886e9abc7c84cbb62871792d4
Subproject commit 30663134718628bf6baa1bbd2343a562a99b8617

8
TextCreator/View3DTextCreator.cs
View file

@ -607,7 +607,9 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
// put in the word editing menu
{
CheckBox expandWordOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Word Edit".Localize(), StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
CheckBox expandWordOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Word Edit".Localize(),
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandWordOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandWordOptions);
@ -680,7 +682,9 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
// put in the letter editing menu
{
CheckBox expandLetterOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Letter", StaticData.Instance.LoadIcon("icon_arrow_right_no_border_32x32.png", 32, 32).InvertLightness());
CheckBox expandLetterOptions = ExpandMenuOptionFactory.GenerateCheckBoxButton("Letter",
View3DWidget.ArrowRight,
View3DWidget.ArrowDown);
expandLetterOptions.Margin = new BorderDouble(bottom: 2);
//buttonRightPanel.AddChild(expandLetterOptions);