Fixed bug with Confluence search, the search wasn't made on the selected space. This change also removes the user list from the space list by default but this behavior can be changed in the configuration.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1966 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4

GreenshotConfluencePlugin/ConfluenceConfiguration.cs

@@ -75,5 +75,10 @@ namespace GreenshotConfluencePlugin {
 			get;
 			set;
 		}
+        [IniProperty("IncludePersonSpaces", Description = "Include personal spaces in the search & browse spaces list", DefaultValue = "False")]
+        public bool IncludePersonSpaces {
+            get;
+            set;
+        }
 	}
 }

GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml

@@ -10,6 +10,7 @@
 	</Window.Resources>
 
 	<StackPanel>
+        <CheckBox IsChecked="{Binding IncludePersonSpaces}" Content="{l:Translate include_person_spaces}"/>
         <CheckBox IsChecked="{Binding OpenPageAfterUpload}" Content="{l:Translate open_page_after_upload}"/>
 		<CheckBox IsChecked="{Binding CopyWikiMarkupForImageToClipboard}" Content="{l:Translate copy_wikimarkup}"/>
 		<StackPanel Orientation="Horizontal">
@@ -25,8 +26,8 @@
 			<ComboBox ItemsSource="{Binding Source={StaticResource outputFormats},Path=DisplayNames}" SelectedValue="{Binding UploadFormat, Converter={StaticResource outputFormats}}" />
 		</StackPanel>
 		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button IsDefault="True" Content="{l:Translate OK}" Click="Button_OK_Click"/>
             <Button IsCancel="True" Content="{l:Translate CANCEL}"/>
-            <Button IsDefault="True" Content="{l:Translate OK}" Click="Button_Click"/>
         </StackPanel>
 	</StackPanel>
 </Window>

GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs

@@ -39,7 +39,7 @@ namespace GreenshotConfluencePlugin {
 			InitializeComponent();
 		}
 		
-		void Button_Click(object sender, RoutedEventArgs e) {
+		void Button_OK_Click(object sender, RoutedEventArgs e) {
 			DialogResult = true;
 		}
 	}

GreenshotConfluencePlugin/Languages/language_confluenceplugin-en-US.xml

@@ -70,5 +70,8 @@
   <resource name="loading">
 		Confluence data is loading, please wait...
 	</resource>
+  <resource name="include_person_spaces">
+    Include personal spaces in search and browsing
+  </resource>
  </resources>
 </language>