From 008ba3f1a1c76bbb63c7e9b3240ef2a1ef7e0dd2 Mon Sep 17 00:00:00 2001
From: nqrcqn <47343000+nqrcqn@users.noreply.github.com>
Date: Sat, 14 Sep 2019 15:49:29 +0300
Subject: [PATCH 1/2] Make currency type editable when pricing

---
 Procurement/Controls/ItemDisplay.xaml.cs   |  3 +++
 Procurement/Controls/SetBuyoutView.xaml    |  6 +++---
 Procurement/Controls/SetTabBuyoutView.xaml |  2 +-
 Procurement/ViewModel/PricingInfo.cs       | 14 +++++++++++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Procurement/Controls/ItemDisplay.xaml.cs b/Procurement/Controls/ItemDisplay.xaml.cs
index dd41a9cd..6c4ab781 100644
--- a/Procurement/Controls/ItemDisplay.xaml.cs
+++ b/Procurement/Controls/ItemDisplay.xaml.cs
@@ -276,6 +276,9 @@ private void buyoutView_SaveClicked(string amount, string orbType)
         {
             var abbreviation = CurrencyAbbreviationMap.Instance.FromCurrency(orbType);
 
+            if (string.IsNullOrEmpty(abbreviation))
+                abbreviation = orbType;
+
             var vm = DataContext as ItemDisplayViewModel;
             var item = vm.Item;
 
diff --git a/Procurement/Controls/SetBuyoutView.xaml b/Procurement/Controls/SetBuyoutView.xaml
index 4b1b6dc2..75d49498 100644
--- a/Procurement/Controls/SetBuyoutView.xaml
+++ b/Procurement/Controls/SetBuyoutView.xaml
@@ -29,7 +29,7 @@
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.IncreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.DecreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
-        <ComboBox Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" SelectedItem="{Binding BuyoutInfo.Orb}" />
+        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding BuyoutInfo.Orb}" />
 
         <!--Current Offer-->
         <CheckBox Content="Offer" Grid.Row="1" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding OfferInfo.Enabled, Mode=TwoWay}"/>
@@ -38,7 +38,7 @@
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=OfferInfo.IncreaseValue}" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" />
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=OfferInfo.DecreaseValue}" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
-        <ComboBox Grid.Column="2" Grid.Row="1" Height="25" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" SelectedItem="{Binding OfferInfo.Orb}"/>
+        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="1" Height="25" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding OfferInfo.Orb}"/>
 
         <!--Price-->
         <CheckBox Content="Price" Grid.Row="2" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
@@ -47,7 +47,7 @@
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=PriceInfo.IncreaseValue}" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=PriceInfo.DecreaseValue}" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
-        <ComboBox Grid.Column="2" Grid.Row="2" Height="25" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" SelectedItem="{Binding PriceInfo.Orb}" />
+        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="2" Height="25" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding PriceInfo.Orb}" />
 
 
         <TextBlock Grid.Row="3" Foreground="#FFAB9066" Text="Notes:" />
diff --git a/Procurement/Controls/SetTabBuyoutView.xaml b/Procurement/Controls/SetTabBuyoutView.xaml
index de878090..b1ad9cd9 100644
--- a/Procurement/Controls/SetTabBuyoutView.xaml
+++ b/Procurement/Controls/SetTabBuyoutView.xaml
@@ -24,7 +24,7 @@
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.IncreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.DecreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
-        <ComboBox Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" SelectedItem="{Binding BuyoutInfo.Orb}" />
+        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding BuyoutInfo.Orb}" />
 
         <Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3">
             <Grid.ColumnDefinitions>
diff --git a/Procurement/ViewModel/PricingInfo.cs b/Procurement/ViewModel/PricingInfo.cs
index 0587df68..f56aa35e 100644
--- a/Procurement/ViewModel/PricingInfo.cs
+++ b/Procurement/ViewModel/PricingInfo.cs
@@ -88,15 +88,23 @@ public void Update(string info)
             value = valueOrbPair[0];
             orb = CurrencyAbbreviationMap.Instance.FromAbbreviation(valueOrbPair[1]);
 
-            enabled = value != string.Empty;
+            if (string.IsNullOrEmpty(orb))
+                orb = valueOrbPair[1];
+
+            enabled = !string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(orb);
         }
 
         public string GetSaveText()
         {
-            if (!enabled || (string.IsNullOrEmpty(value) && string.IsNullOrEmpty(orb)))
+            if (!enabled)
                 return string.Empty;
 
-            return $"{value} {CurrencyAbbreviationMap.Instance.FromCurrency(orb)}";
+            string abbreviation = CurrencyAbbreviationMap.Instance.FromCurrency(orb);
+
+            if (string.IsNullOrEmpty(abbreviation))
+                return $"{value} {orb}";
+
+            return $"{value} {abbreviation}";
         }
     }
 }

From 1e3073ecfeb875c27f0e5d8f18b9cb950c183ff8 Mon Sep 17 00:00:00 2001
From: nqrcqn <47343000+nqrcqn@users.noreply.github.com>
Date: Sat, 14 Sep 2019 20:01:15 +0300
Subject: [PATCH 2/2] Use a wider box to fit most currency tags, minor fixes

---
 Procurement/Controls/SetBuyoutView.xaml     | 22 ++++++++++-----------
 Procurement/Controls/SetTabBuyoutView.xaml  | 16 +++++++--------
 Procurement/ViewModel/SetBuyoutViewModel.cs |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Procurement/Controls/SetBuyoutView.xaml b/Procurement/Controls/SetBuyoutView.xaml
index 75d49498..488ee79a 100644
--- a/Procurement/Controls/SetBuyoutView.xaml
+++ b/Procurement/Controls/SetBuyoutView.xaml
@@ -11,15 +11,15 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="30"/>
             <RowDefinition Height="30"/>
-            <RowDefinition Height="40"/>
+            <RowDefinition Height="30"/>
             <RowDefinition Height="30"/>
             <RowDefinition Height="60"/>
             <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="100" />
-            <ColumnDefinition Width="100" />
-            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="75" />
+            <ColumnDefinition Width="95" />
+            <ColumnDefinition Width="170" />
         </Grid.ColumnDefinitions>
 
         <!--Buyouts-->
@@ -29,7 +29,7 @@
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.IncreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.DecreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
-        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding BuyoutInfo.Orb}" />
+        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding BuyoutInfo.Orb}" IsTextSearchEnabled="False" />
 
         <!--Current Offer-->
         <CheckBox Content="Offer" Grid.Row="1" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding OfferInfo.Enabled, Mode=TwoWay}"/>
@@ -38,7 +38,7 @@
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=OfferInfo.IncreaseValue}" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" />
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=OfferInfo.DecreaseValue}" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
-        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="1" Height="25" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding OfferInfo.Orb}"/>
+        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="1" Height="25" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding OfferInfo.Orb}" IsTextSearchEnabled="False" />
 
         <!--Price-->
         <CheckBox Content="Price" Grid.Row="2" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
@@ -47,12 +47,12 @@
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=PriceInfo.IncreaseValue}" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=PriceInfo.DecreaseValue}" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
-        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="2" Height="25" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding PriceInfo.Orb}" />
+        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="2" Height="25" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding PriceInfo.Orb}" IsTextSearchEnabled="False" />
 
 
-        <TextBlock Grid.Row="3" Foreground="#FFAB9066" Text="Notes:" />
+        <TextBlock Grid.Row="3" Foreground="#FFAB9066" Text="Notes:" VerticalAlignment="Center" />
 
-        <TextBlock Grid.Row="3" Foreground="#FFAB9066" Text="POB Data copied to Clipboard" Grid.Column="1" Grid.ColumnSpan="2" Visibility="{Binding IsDataInClipboard, Converter={StaticResource bc}}"/>
+        <TextBlock Grid.Row="3" Foreground="#FFAB9066" Text="POB Data copied to clipboard." HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Column="1" Grid.ColumnSpan="2" Visibility="{Binding IsDataInClipboard, Converter={StaticResource bc}}"/>
 
         <Button Content="Export to POB" ToolTip="Copy item data to clipboard in Path of Building format" 
                 Grid.Column="2" Height="25" Command="{Binding PobDataGenerationCommand}"  Grid.Row="3" Visibility="{Binding IsDataInClipboard, Converter={StaticResource bc}, ConverterParameter=Invert}"
@@ -65,12 +65,12 @@
                 <ColumnDefinition Width="5" />
                 <ColumnDefinition Width="110" />
                 <ColumnDefinition Width="5" />
-                <ColumnDefinition Width="90" />
+                <ColumnDefinition Width="110" />
             </Grid.ColumnDefinitions>
 
             <Button Content="Save" Grid.Column="0" Height="25" Width="110" Click="Save_Clicked"/>
             <Button Content="Save Image" Grid.Column="2" Height="25" Width="110" Click="SaveImage_Click" HorizontalAlignment="Left" />
-            <Button Content="Timestamp" Grid.Column="4" Height="25" Width="90" Click="Timestamp_Click" HorizontalAlignment="Left" />
+            <Button Content="Timestamp" Grid.Column="4" Height="25" Width="110" Click="Timestamp_Click" HorizontalAlignment="Left" />
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Procurement/Controls/SetTabBuyoutView.xaml b/Procurement/Controls/SetTabBuyoutView.xaml
index b1ad9cd9..ef9cd568 100644
--- a/Procurement/Controls/SetTabBuyoutView.xaml
+++ b/Procurement/Controls/SetTabBuyoutView.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="Procurement.Controls.SetTabBuyoutView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Set Tabwide Buyout" WindowStyle="None" ResizeMode="NoResize" Width="340" Height="90">
+        Title="Set Tabwide Buyout" WindowStyle="None" ResizeMode="NoResize" Width="370" Height="90">
     <Window.Resources>
         <ResourceDictionary Source="/Procurement;component/Controls/ExpressionDark.xaml" />
     </Window.Resources>
@@ -13,8 +13,8 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100" />
-            <ColumnDefinition Width="100" />
-            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="95" />
+            <ColumnDefinition Width="170" />
         </Grid.ColumnDefinitions>
 
         <!--Buyouts-->
@@ -24,16 +24,16 @@
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.IncreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.DecreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
-        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding BuyoutInfo.Orb}" />
+        <ComboBox IsEditable="True" Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" Text="{Binding BuyoutInfo.Orb}" IsTextSearchEnabled="False" />
 
         <Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="160" />
-                <ColumnDefinition Width="10" />
-                <ColumnDefinition Width="160" />
+                <ColumnDefinition Width="175" />
+                <ColumnDefinition Width="20" />
+                <ColumnDefinition Width="175" />
             </Grid.ColumnDefinitions>
 
-            <Button Content="Save" Grid.Column="0" Height="25" Width="150" Click="Save_Clicked"/>
+            <Button Content="Save" Grid.Column="0" Height="25" Width="150" Click="Save_Clicked" HorizontalAlignment="Right" />
             <Button Content="Cancel" Grid.Column="2" Height="25" Width="150" Click="Cancel_Click" HorizontalAlignment="Left" />
 
             </Grid>
diff --git a/Procurement/ViewModel/SetBuyoutViewModel.cs b/Procurement/ViewModel/SetBuyoutViewModel.cs
index b362968f..d0bb3a43 100644
--- a/Procurement/ViewModel/SetBuyoutViewModel.cs
+++ b/Procurement/ViewModel/SetBuyoutViewModel.cs
@@ -109,7 +109,7 @@ private void GetPobData(object o)
 
         private bool CanGetPobData(object o)
         {
-            return item.GetType() == typeof(Gear);
+            return item.GetType() == typeof(Gear) && item.ItemLevel > 0;
         }
     }
 }