Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some fixes for sai_display_rework #4

Merged
merged 5 commits into from
Dec 28, 2020
Merged

Some fixes for sai_display_rework #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e5aa90
Hide condition button and Text for SmartAction
funjoker Feb 9, 2020
a62dff1
Hide console in Release
funjoker Feb 9, 2020
327cf5f
Revert "ParameterLoader Fix"
funjoker Feb 9, 2020
01a20c9
Sync Actions with TC
funjoker Feb 10, 2020
22d45c4
Requested Changes
funjoker Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions WDE.Parameters/ParametersModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ public ParametersModule()

public override void OnInitialized(IContainerProvider containerProvider)
{
new ParameterLoader(containerProvider.Resolve<IDatabaseProvider>()).Load(containerProvider.Resolve<ParameterFactory>());
/*containerProvider.Resolve<AllModulesLoaded>().Subscribe(() =>
//new ParameterLoader(containerProvider.Resolve<IDatabaseProvider>()).Load(containerProvider.Resolve<ParameterFactory>());
containerProvider.Resolve<AllModulesLoaded>().Subscribe(() =>
{
Console.WriteLine("DEBUG 2");
new ParameterLoader(containerProvider.Resolve<IDatabaseProvider>()).Load(containerProvider.Resolve<ParameterFactory>());
});*/
});
}
}
}
3 changes: 3 additions & 0 deletions WDE.SmartScriptEditor/Editor/ViewModels/SmartScriptEditorViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,9 @@ private void EditActionCommand(SmartAction obj)
paramss.Add(new KeyValuePair<Parameter, string>(wrapper, "Target"));
}

// Hide Conditions stuff for SmartAction, because there is no ConditionType for these
v.conditionsTextBlock.Visibility = System.Windows.Visibility.Hidden;
v.editConditionsButton.Visibility = System.Windows.Visibility.Hidden;
v.DataContext = new ParametersEditViewModel(itemFromListProvider, obj, paramss, null, conditionDataManager);
v.ShowDialog();
}
Expand Down
2 changes: 1 addition & 1 deletion WDE.SmartScriptEditor/Editor/Views/ParametersEditView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<TextBlock Text="Conditions:" DockPanel.Dock="Top" Margin="10, 10, 10, 10"/>
<TextBlock Name="conditionsTextBlock" Text="Conditions:" DockPanel.Dock="Top" Margin="10, 10, 10, 10"/>
<Button Name="editConditionsButton" Button.Content="Edit conditions" DockPanel.Dock="Top" MaxHeight="30" Click="editConditionsButton_Click"/>
</DockPanel>
</ScrollViewer>
Expand Down