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

Merge pull request #3384 from jlewin/design_tools

Browse source 
Remove wrapping container, remove padding
This commit is contained in:
johnlewin 2018-06-05 18:12:48 -07:00 • committed by GitHub
commit 0200f87c21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 47 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ApplicationView/ApplicationController.cs
View file

@ -2337,7 +2337,7 @@ namespace MatterHackers.MatterControl
{
UiThread.RunOnIdle(() =>
{
DialogWindow.Show(new DesignSpaceGuide("Guides Tab", ""));
DialogWindow.Show(new DesignSpaceGuide("AllGuides"));
});
}

2
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
{
UiThread.RunOnIdle(() =>
{
DialogWindow.Show(new DesignSpaceGuide("Guides Tab", ""));
DialogWindow.Show(new DesignSpaceGuide("AllGuides"));
});
});

2
PartPreviewWindow/PartPreviewContent.cs
View file

@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
seeWhatsNewButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
UserSettings.Instance.set(UserSettingsKey.LastReadWhatsNew, JsonConvert.SerializeObject(DateTime.Now));
DialogWindow.Show(new DesignSpaceGuide("What's New Tab", ""));
DialogWindow.Show(new DesignSpaceGuide("What's New"));
});
tabControl.TabBar.ActionArea.AddChild(seeWhatsNewButton);

5
PartPreviewWindow/Tabs.cs
View file

@ -181,6 +181,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
this.ActiveTabChanged?.Invoke(this, null);
}
internal int GetTabIndex(SimpleTab tab)
{
return _allTabs.IndexOf(tab);
}
}
public class ChromeTabs : SimpleTabs

2
PartPreviewWindow/ViewControls3D.cs
View file

@ -613,7 +613,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
UiThread.RunOnIdle(() =>
{
DialogWindow.Show(new DesignSpaceGuide("", ""));
DialogWindow.Show(new DesignSpaceGuide());
});
}
}

9
SettingsManagement/UserSettings.cs
View file

@ -119,9 +119,14 @@ namespace MatterHackers.MatterControl
DateTime installTime = new FileInfo(filePath).LastWriteTime;
var lastReadWhatsNew = UserSettings.Instance.get(UserSettingsKey.LastReadWhatsNew);
DateTime whatsNewReadTime = installTime;
if (lastReadWhatsNew != null)
if (!string.IsNullOrWhiteSpace(lastReadWhatsNew))
{
whatsNewReadTime = JsonConvert.DeserializeObject<DateTime>(lastReadWhatsNew);
try
{
whatsNewReadTime = JsonConvert.DeserializeObject<DateTime>(lastReadWhatsNew);
}
catch { }
}
return whatsNewReadTime > installTime;

67
SetupWizard/DesignSpaceHelp.cs
View file

@ -81,31 +81,18 @@ namespace MatterHackers.MatterControl
public class DesignSpaceGuide : DialogPage
{
private List<GuideAsset> whatsNewGuides = new List<GuideAsset>();
private List<GuideAsset> allAvailableGuides = new List<GuideAsset>();
private Dictionary<string, TreeNode> nodesByID;
private TreeView treeView;
public DesignSpaceGuide(string preSelectTabName, string guideKey)
public DesignSpaceGuide(string guideKey = null)
: base("Close".Localize())
{
WindowSize = new Vector2(800, 600);
allAvailableGuides = ApplicationController.Instance.FeatureGuides;
// TODO: Guides document should have separate properties for differing top level containers
whatsNewGuides = allAvailableGuides;
this.WindowTitle = "MatterControl " + "Help".Localize();
this.HeaderText = "How to succeed with MatterControl".Localize();
this.ChildBorderColor = theme.GetBorderColor(75);
var container = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch
};
contentRow.AddChild(container);
var tabControl = new SimpleTabs(theme, new GuiWidget())
{
HAnchor = HAnchor.Stretch,
@ -113,7 +100,8 @@ namespace MatterHackers.MatterControl
};
tabControl.TabBar.BackgroundColor = theme.TabBarBackground;
container.AddChild(tabControl);
contentRow.AddChild(tabControl);
contentRow.Padding = 0;
// add the mouse commands
var mouseControls = new FlowLayoutWidget()
@ -231,6 +219,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Stretch,
Padding = theme.DefaultContainerPadding
};
var guideTab = new ToolTab("Guides".Localize(), tabControl, guideSectionContainer, theme, hasClose: false)
{
// this can be used to navigate to this tab on construction
@ -238,30 +227,30 @@ namespace MatterHackers.MatterControl
};
tabControl.AddTab(guideTab);
AddGuides(guideSectionContainer, allAvailableGuides);
AddGuides(guideSectionContainer);
tabControl.SelectedTabIndex = 0;
if(!string.IsNullOrWhiteSpace(preSelectTabName))
// If guideKey is empty, switch to first tab
if (string.IsNullOrEmpty(guideKey))
{
// try to find the named tab
int index = 0;
foreach(var tab in tabControl.AllTabs)
tabControl.SelectedTabIndex = 0;
}
else
{
// Otherwise switch to guides tab and select the target item
tabControl.SelectedTabIndex = tabControl.GetTabIndex(guideTab);
// TODO: Find the target TreeNode by ID and select
if (nodesByID.TryGetValue(guideKey, out TreeNode guideNode))
{
if (tab is GuiWidget widget)
{
if (widget.Name == preSelectTabName)
{
tabControl.SelectedTabIndex = index;
break;
}
}
index++;
treeView.SelectedNode = guideNode;
}
}
}
private void AddGuides(FlowLayoutWidget guideContainer, List<GuideAsset> guideList)
private void AddGuides(FlowLayoutWidget guideContainer)
{
nodesByID = new Dictionary<string, TreeNode>();
var sequence = new ImageSequence()
{
FramesPerSecond = 3,
@ -297,7 +286,7 @@ namespace MatterHackers.MatterControl
};
rightPanel.AddChild(description);
var treeView = new TreeView(theme)
treeView = new TreeView(theme)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit | VAnchor.Top,
@ -325,13 +314,17 @@ namespace MatterHackers.MatterControl
treeView.Load += (s, e) =>
{
rootNode.Expanded = true;
treeView.SelectedNode = rootNode.Nodes.FirstOrDefault();
if (treeView.SelectedNode == null)
{
treeView.SelectedNode = rootNode.Nodes.FirstOrDefault();
}
};
TreeNode firstNode = null;
double maxMenuItemWidth = 0;
foreach (var guide in guideList)
foreach (var guide in ApplicationController.Instance.FeatureGuides.OrderBy(g => g.MenuName))
{
var treeNode = new TreeNode()
{
@ -348,6 +341,8 @@ namespace MatterHackers.MatterControl
firstNode = treeNode;
}
nodesByID.Add(guide.MenuName, treeNode);
rootNode.Nodes.Add(treeNode);
}