remove adjust profit window
This commit is contained in:
parent
10351af7f9
commit
a451392e93
@ -1,24 +0,0 @@
|
|||||||
<Window x:Class="EliteBGS.AdjustProfitWindow"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:local="clr-namespace:EliteBGS"
|
|
||||||
mc:Ignorable="d"
|
|
||||||
Title="Adjust Trade Profit" Height="130" Width="450">
|
|
||||||
<Grid>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Label Content="Use this dialog to adjust trade profits" Grid.Row="0" Grid.ColumnSpan="2" />
|
|
||||||
<TextBox x:Name="Profit" Grid.Row="1" Grid.ColumnSpan="2" Margin="10,10,10,10"/>
|
|
||||||
<Button x:Name="Cancel" Content="Cancel" Width="60" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Margin="5,0,5,0" IsCancel="true" Click="Cancel_Click"/>
|
|
||||||
<Button x:Name="Accept" Content="Accept" Width="60" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" Margin="5,0,5,0" IsDefault="true" Click="Accept_Click" />
|
|
||||||
</Grid>
|
|
||||||
</Window>
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace EliteBGS {
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for AdjustProfitWindow.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class AdjustProfitWindow : Window {
|
|
||||||
public AdjustProfitWindow() {
|
|
||||||
InitializeComponent();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Cancel_Click(object sender, RoutedEventArgs e) {
|
|
||||||
DialogResult = false;
|
|
||||||
Close();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Accept_Click(object sender, RoutedEventArgs e) {
|
|
||||||
DialogResult = true;
|
|
||||||
Close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,109 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.5.json",
|
|
||||||
"version": "2.1.0",
|
|
||||||
"runs": [
|
|
||||||
{
|
|
||||||
"tool": {
|
|
||||||
"driver": {
|
|
||||||
"name": "Dependency Analysis",
|
|
||||||
"semanticVersion": "0.4.355802",
|
|
||||||
"informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"id": "UA106",
|
|
||||||
"name": "PackageToBeAdded",
|
|
||||||
"fullDescription": {
|
|
||||||
"text": "Packages that need to be added in order to upgrade the project to chosen TFM"
|
|
||||||
},
|
|
||||||
"helpUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"results": [
|
|
||||||
{
|
|
||||||
"ruleId": "UA106",
|
|
||||||
"message": {
|
|
||||||
"text": "Package Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.4.355802 needs to be added."
|
|
||||||
},
|
|
||||||
"locations": [
|
|
||||||
{
|
|
||||||
"physicalLocation": {
|
|
||||||
"artifactLocation": {
|
|
||||||
"uri": "file:///D:/src/EDBGS/EliteBGS/EliteBGS.csproj"
|
|
||||||
},
|
|
||||||
"region": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"ruleId": "UA106",
|
|
||||||
"message": {
|
|
||||||
"text": "Package Microsoft.Windows.Compatibility, Version=7.0.0 needs to be added."
|
|
||||||
},
|
|
||||||
"locations": [
|
|
||||||
{
|
|
||||||
"physicalLocation": {
|
|
||||||
"artifactLocation": {
|
|
||||||
"uri": "file:///D:/src/EDBGS/EliteBGS/EliteBGS.csproj"
|
|
||||||
},
|
|
||||||
"region": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"columnKind": "utf16CodeUnits"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tool": {
|
|
||||||
"driver": {
|
|
||||||
"name": "API Upgradability",
|
|
||||||
"semanticVersion": "0.4.355802",
|
|
||||||
"informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"results": [],
|
|
||||||
"columnKind": "utf16CodeUnits"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tool": {
|
|
||||||
"driver": {
|
|
||||||
"name": "Component Analysis",
|
|
||||||
"semanticVersion": "0.4.355802",
|
|
||||||
"informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"id": "UA209",
|
|
||||||
"name": "Microsoft.DotNet.UpgradeAssistant.Extensions.Windows.WinformsDefaultFontUpdater",
|
|
||||||
"fullDescription": {
|
|
||||||
"text": "Default Font API Alert"
|
|
||||||
},
|
|
||||||
"helpUri": "about:blank"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"results": [
|
|
||||||
{
|
|
||||||
"ruleId": "UA209",
|
|
||||||
"message": {
|
|
||||||
"text": "Default font in Windows Forms has been changed from Microsoft Sans Serif to Seg Segoe UI, in order to change the default font use the API - Application.SetDefaultFont(Font font). For more details see here - https://devblogs.microsoft.com/dotnet/whats-new-in-windows-forms-in-net-6-0-preview-5/#application-wide-default-font."
|
|
||||||
},
|
|
||||||
"locations": [
|
|
||||||
{
|
|
||||||
"physicalLocation": {
|
|
||||||
"artifactLocation": {
|
|
||||||
"uri": "file:///D:/src/EDBGS/EliteBGS/EliteBGS.csproj"
|
|
||||||
},
|
|
||||||
"region": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"columnKind": "utf16CodeUnits"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@ -45,8 +45,6 @@
|
|||||||
<DatePicker x:Name="enddate" Height="26.2857142857143" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
<DatePicker x:Name="enddate" Height="26.2857142857143" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
||||||
<Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
|
<Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
|
||||||
<Button x:Name="AddCombatZone" Content="Add Combat Zone Win" VerticalAlignment="Stretch" Margin="0,0,0,0.286" RenderTransformOrigin="0.5,0.505" Click="AddCombatZone_Click"/>
|
<Button x:Name="AddCombatZone" Content="Add Combat Zone Win" VerticalAlignment="Stretch" Margin="0,0,0,0.286" RenderTransformOrigin="0.5,0.505" Click="AddCombatZone_Click"/>
|
||||||
<Separator Height="26.2857142857143" Margin="0" VerticalAlignment="Top"/>
|
|
||||||
<Button x:Name="AdjustProfit" Content="Adjust Trade Profit" Margin="0" VerticalAlignment="Stretch" Click="AdjustProfit_Click" />
|
|
||||||
<Separator Margin="1" VerticalAlignment="Center" MinWidth="1" HorizontalAlignment="Center" MinHeight="22"/>
|
<Separator Margin="1" VerticalAlignment="Center" MinWidth="1" HorizontalAlignment="Center" MinHeight="22"/>
|
||||||
<Button x:Name="ManuallyParse" Content="Manually Parse JSON" Click="ManuallyParse_Click" />
|
<Button x:Name="ManuallyParse" Content="Manually Parse JSON" Click="ManuallyParse_Click" />
|
||||||
</ToolBar>
|
</ToolBar>
|
||||||
|
|||||||
@ -263,26 +263,6 @@ public partial class MainWindow : Window {
|
|||||||
GenerateLog();
|
GenerateLog();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AdjustProfit_Click(object sender, RoutedEventArgs e) {
|
|
||||||
if (entries.SelectedItem == null || entries.SelectedItem.GetType() != typeof(SellCargo)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
SellCargo sell = entries.SelectedItem as SellCargo;
|
|
||||||
AdjustProfitWindow adjust = new AdjustProfitWindow() { Owner = this };
|
|
||||||
|
|
||||||
adjust.Profit.Text = sell.Profit.ToString();
|
|
||||||
|
|
||||||
if (!(adjust.ShowDialog() ?? false)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (int.TryParse(adjust.Profit.Text, out int newprofit)) {
|
|
||||||
sell.Profit = newprofit;
|
|
||||||
RefreshView();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LogType_SelectionChanged(object sender, SelectionChangedEventArgs e) {
|
private void LogType_SelectionChanged(object sender, SelectionChangedEventArgs e) {
|
||||||
if (LogType.SelectedItem == null) {
|
if (LogType.SelectedItem == null) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user