From 0aa4aa2d0e9f32ca3e223f6191c1d826eaaab0f8 Mon Sep 17 00:00:00 2001
From: Robin <robin@getgreenshot.org>
Date: Sun, 15 Apr 2018 09:36:07 +0200
Subject: [PATCH] Small improvements of the file configuration and some others.

---
 .../ConfluenceDestination.cs                     |  2 +-
 .../ViewModels/FileConfigPartViewModel.cs        | 15 +++++++++++++--
 .../Views/FileConfigPartView.xaml                |  5 ++---
 src/GreenshotOCRCommand/Program.cs               | 16 +++++++++-------
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/Greenshot.Addon.Confluence/ConfluenceDestination.cs b/src/Greenshot.Addon.Confluence/ConfluenceDestination.cs
index 47634fe44..d08740672 100644
--- a/src/Greenshot.Addon.Confluence/ConfluenceDestination.cs
+++ b/src/Greenshot.Addon.Confluence/ConfluenceDestination.cs
@@ -169,7 +169,7 @@ namespace Greenshot.Addon.Confluence
 			{
                 // TODO: Create content
 				new PleaseWaitForm().ShowAndWait(Description, _confluenceLanguage.CommunicationWait,
-				    () => _confluenceClient.Attachment.AttachAsync(""+page.Id, surfaceToUpload, filename, null, "image/" + _confluenceConfiguration.UploadFormat.ToString().ToLower())
+				    () => _confluenceClient.Attachment.AttachAsync(page.Id, surfaceToUpload, filename, null, "image/" + _confluenceConfiguration.UploadFormat.ToString().ToLower())
 				);
 				Log.Debug().WriteLine("Uploaded to Confluence.");
 				if (!_confluenceConfiguration.CopyWikiMarkupForImageToClipboard)
diff --git a/src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs b/src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs
index 0ae63733b..751873167 100644
--- a/src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs
+++ b/src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs
@@ -77,6 +77,7 @@ namespace Greenshot.Addons.ViewModels
                 _destinationFileConfiguration = value;
                 NotifyOfPropertyChange(nameof(DestinationFileConfigurationVisiblity));
                 NotifyOfPropertyChange(nameof(AreGlobalSettingsEnabled));
+                NotifyOfPropertyChange(nameof(OwnSettingsVisibility));
             }
         }
 
@@ -86,9 +87,19 @@ namespace Greenshot.Addons.ViewModels
         public bool AreGlobalSettingsEnabled => DestinationFileConfiguration == null;
 
         /// <summary>
-        /// If there is a DestinationFileConfiguration, the configuration is shown
+        /// If there is a DestinationFileConfiguration, the checkbox is shown
         /// </summary>
-        public Visibility DestinationFileConfigurationVisiblity => DestinationFileConfiguration == null ? Visibility.Collapsed : Visibility.Visible;
+        public Visibility OwnSettingsVisibility => DestinationFileConfiguration != null? Visibility.Visible : Visibility.Collapsed;
+
+        /// <summary>
+        /// If there is a DestinationFileConfiguration and use own settings is set the configuration is shown
+        /// </summary>
+        public Visibility DestinationFileConfigurationVisiblity => DestinationFileConfiguration != null && _useOwnSettings ? Visibility.Visible : Visibility.Collapsed;
+
+        /// <summary>
+        /// If there is a DestinationFileConfiguration, the global configuration is not shown
+        /// </summary>
+        public Visibility GlobalFileConfigurationVisiblity => AreGlobalSettingsEnabled || !_useOwnSettings ? Visibility.Visible : Visibility.Collapsed;
 
         /// <summary>
         /// The globally selected format
diff --git a/src/Greenshot.Addons/Views/FileConfigPartView.xaml b/src/Greenshot.Addons/Views/FileConfigPartView.xaml
index f5d8a6cb2..888233630 100644
--- a/src/Greenshot.Addons/Views/FileConfigPartView.xaml
+++ b/src/Greenshot.Addons/Views/FileConfigPartView.xaml
@@ -8,7 +8,7 @@
              d:DataContext="{d:DesignInstance viewModels:FileConfigPartViewModel,IsDesignTimeCreatable=False}"
              >
     <StackPanel>
-        <StackPanel Visibility="{Binding DestinationFileConfigurationVisiblity}">
+        <StackPanel Visibility="{Binding OwnSettingsVisibility}">
             <CheckBox Content="Use destination settings" IsChecked="{Binding UseOwnSettings}" />
         </StackPanel>
         <StackPanel Visibility="{Binding DestinationFileConfigurationVisiblity}" IsEnabled="{Binding UseOwnSettings}">
@@ -21,8 +21,7 @@
                 <Slider Maximum="100" Value="{Binding DestinationFileConfiguration.OutputFileJpegQuality}"/>
             </DockPanel>
         </StackPanel>
-        <Separator Visibility="{Binding DestinationFileConfigurationVisiblity}"/>
-        <StackPanel IsEnabled="{Binding AreGlobalSettingsEnabled}">
+        <StackPanel IsEnabled="{Binding AreGlobalSettingsEnabled}" Visibility="{Binding GlobalFileConfigurationVisiblity}">
             <DockPanel LastChildFill="True">
                 <Label Content="{Binding GreenshotLanguage.SettingsPrimaryimageformat}" Width="100" />
                 <ComboBox SelectedValue="{Binding SelectedFormat}" ItemsSource="{Binding Formats}" SelectedValuePath="Key" DisplayMemberPath="Value" />
diff --git a/src/GreenshotOCRCommand/Program.cs b/src/GreenshotOCRCommand/Program.cs
index a42e5a71a..906fcf141 100644
--- a/src/GreenshotOCRCommand/Program.cs
+++ b/src/GreenshotOCRCommand/Program.cs
@@ -86,13 +86,15 @@ namespace GreenshotOCRCommand
 							{
 								foreach (var word in ToEnumerable(layout.Words))
 								{
-									if (word.Rects != null)
-									{
-										foreach (var rect in ToEnumerable(word.Rects))
-										{
-											Debug.WriteLine($"Rect {rect.Left},{rect.Top},{rect.Right},{rect.Bottom} - Word {word.Text} : Confidence: {word.RecognitionConfidence}");
-										}
-									}
+								    if (word.Rects == null)
+								    {
+								        continue;
+								    }
+
+								    foreach (var rect in ToEnumerable(word.Rects))
+								    {
+								        Debug.WriteLine($"Rect {rect.Left},{rect.Top},{rect.Right},{rect.Bottom} - Word {word.Text} : Confidence: {word.RecognitionConfidence}");
+								    }
 								}
 							}
 #endif