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

Merge pull request #1608 from larsbrubaker/1.6.0

Browse source 
Made the queue always populate on touch
This commit is contained in:
Lars Brubaker 2016-11-09 11:17:45 -08:00 • committed by GitHub
commit 914d6ad868
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ApplicationView/MainApplicationWidget.cs
View file

@ -468,6 +468,9 @@ namespace MatterHackers.MatterControl
if (UserSettings.Instance.DisplayMode == ApplicationDisplayType.Touchscreen)
{
// make sure that on touchscreen (due to lazy tabs) we initialize our stating parts and queue
var temp = new LibraryProviderSQLite(null, null, null, null);
// now bulid the ui
globalInstance.MainView = new TouchscreenView();
}
else

10
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -223,8 +223,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage
optionsContainer.AddChild(interfaceOptionsDropList);
optionsContainer.Width = 200;
MenuItem responsizeOptionsDropDownItem = interfaceOptionsDropList.AddItem("Normal".Localize(), "responsive");
MenuItem touchscreenOptionsDropDownItem = interfaceOptionsDropList.AddItem("Touchscreen".Localize(), "touchscreen");
interfaceOptionsDropList.AddItem("Normal".Localize(), "responsive");
interfaceOptionsDropList.AddItem("Touchscreen".Localize(), "touchscreen");
List<string> acceptableUpdateFeedTypeValues = new List<string>() { "responsive", "touchscreen" };
string currentDisplayModeType = UserSettings.Instance.get(UserSettingsKey.ApplicationDisplayMode);
@ -237,10 +237,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
interfaceOptionsDropList.SelectedValue = UserSettings.Instance.get(UserSettingsKey.ApplicationDisplayMode);
interfaceOptionsDropList.SelectionChanged += (sender, e) =>
{
string releaseCode = ((DropDownList)sender).SelectedValue;
if (releaseCode != UserSettings.Instance.get(UserSettingsKey.ApplicationDisplayMode))
string displayMode = ((DropDownList)sender).SelectedValue;
if (displayMode != UserSettings.Instance.get(UserSettingsKey.ApplicationDisplayMode))
{
UserSettings.Instance.set(UserSettingsKey.ApplicationDisplayMode, releaseCode);
UserSettings.Instance.set(UserSettingsKey.ApplicationDisplayMode, displayMode);
displayControlRestartButton.Visible = true;
}
};