release: v2.3.1 merged into master

rodriada000 · Nov 14, 2019 · db5e2c4 · db5e2c4
2 parents f93b1e9 + c1fd91f
commit db5e2c4
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 18 deletions.
diff --git a/SessionMapSwitcherWPF/Properties/AssemblyInfo.cs b/SessionMapSwitcherWPF/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.0.0")]
-[assembly: AssemblyFileVersion("2.3.0.0")]
+[assembly: AssemblyVersion("2.3.1.0")]
+[assembly: AssemblyFileVersion("2.3.1.0")]
diff --git a/SessionMapSwitcherWPF/UI/AssetStoreUserControl.xaml.cs b/SessionMapSwitcherWPF/UI/AssetStoreUserControl.xaml.cs
@@ -132,7 +132,11 @@ private void btnUpload_Click(object sender, RoutedEventArgs e)
 
         private void OpenUploadAssetForm()
         {
-            UploadAssetViewModel viewModel = new UploadAssetViewModel();
+            UploadAssetViewModel viewModel = new UploadAssetViewModel()
+            {
+                AvailableBuckets = ViewModel.GetAvailableBuckets()
+            };
+
             UploadAssetWindow window = new UploadAssetWindow(viewModel)
             {
                 WindowStartupLocation = WindowStartupLocation.CenterScreen

diff --git a/SessionMapSwitcherWPF/UI/UploadAssetWindow.xaml b/SessionMapSwitcherWPF/UI/UploadAssetWindow.xaml
@@ -6,8 +6,8 @@
         xmlns:local="clr-namespace:SessionModManagerWPF.UI"
         mc:Ignorable="d"
         Style="{StaticResource WindowStyle}"
-        Title="Upload Asset" Height="500" Width="460"
-        MaxHeight="500"
+        Title="Upload Asset" d:DesignHeight="535" Width="460"
+        MaxHeight="600"
         MaxWidth="650"
         WindowStyle="ToolWindow"
         Loaded="Window_Loaded">
@@ -35,6 +35,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
 
         </Grid.RowDefinitions>
@@ -58,7 +59,7 @@
                   Margin="0,10,5,0" 
                   HorizontalAlignment="Left" 
                   ItemsSource="{Binding AvailableCategories}"
-                  SelectedValue="{Binding SelectedCategory, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, FallbackValue='Maps'}"
+                  SelectedValue="{Binding SelectedCategory, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                   IsEnabled="{Binding IsNotUploadingAsset}"/>
 
 
@@ -89,25 +90,43 @@
             <Button x:Name="btnBrowseThumbnail" Content="..." Click="btnBrowseThumbnail_Click"  VerticalAlignment="Bottom" Padding="5,1,5,1"/>
         </WrapPanel>
 
+
+        <TextBlock Grid.Row="6" Grid.Column="1" HorizontalAlignment="Right" Margin="0,10,5,0" Text="Bucket:" Style="{StaticResource labelStyle}"/>
+        <ComboBox x:Name="cboBuckets" 
+                  ToolTip="Choose the bucket to upload your asset to. This is usually your username"
+                  Grid.Row="6" Grid.Column="2" 
+                  Width="125"
+                  Margin="0,10,5,0" 
+                  HorizontalAlignment="Left" 
+                  ItemsSource="{Binding AvailableBuckets}"
+                  SelectedValue="{Binding SelectedBucketName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                  IsEnabled="{Binding IsNotUploadingAsset}"/>
+
         <Button x:Name="btnUpload"
                 Content="Upload Asset"
                 IsEnabled="{Binding IsNotUploadingAsset}"
                 Click="btnUpload_Click"
                 Padding="5"
-                Grid.Row="6" Grid.ColumnSpan="3"
+                Grid.Row="7" Grid.ColumnSpan="3"
                 HorizontalAlignment="Center"
-                Margin="0,10,20,5"
+                Margin="0,15,20,5"
                 VerticalAlignment="Center"/>
 
-        <TextBlock Grid.Row="7"
-                   Grid.Column="0"
-                   Grid.ColumnSpan="3"
-                   HorizontalAlignment="Left"
-                   TextWrapping="Wrap"
-                   VerticalAlignment="Top"
-                   FontSize="13"
-                   Margin="10,0,0,0"
-                   MaxWidth="420"
-                   Text="{Binding StatusMessage, FallbackValue='This is a message to the user ...'}"/>
+        <ScrollViewer Grid.Row="8"
+                      Grid.Column="0"
+                      Grid.ColumnSpan="3"
+                      HorizontalAlignment="Stretch"
+                      VerticalScrollBarVisibility="Auto"
+                      VerticalAlignment="Top">
+
+            <TextBlock HorizontalAlignment="Stretch"
+                       TextWrapping="Wrap"
+                       VerticalAlignment="Top"
+                       FontSize="13"
+                       Margin="10,0,0,0"
+                       MaxWidth="420"
+                       Text="{Binding StatusMessage, FallbackValue='This is a message to the user ...'}"/>
+        </ScrollViewer>
+
     </Grid>
 </Window>
diff --git a/SessionMapSwitcherWPF/UI/UploadAssetWindow.xaml.cs b/SessionMapSwitcherWPF/UI/UploadAssetWindow.xaml.cs
@@ -110,6 +110,7 @@ private void AuthenticateOrPromptUserToAuthenticate()
             if (ViewModel.HasAuthenticated)
             {
                 ViewModel.StatusMessage = UploadAssetViewModel.DefaultStatusMesssage;
+                ViewModel.SetBucketBasedOnAuthor();
             }
             else
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,6 +110,7 @@ private void AuthenticateOrPromptUserToAuthenticate() @@
                 if (ViewModel.HasAuthenticated)
                 {
                     ViewModel.StatusMessage = UploadAssetViewModel.DefaultStatusMesssage;
+                    ViewModel.SetBucketBasedOnAuthor();
                 }
                 else
                 {
@@ Expand Down @@