github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-15 01:23:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1966 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-07-27 13:59:59 +00:00
parent 2850955bb3
commit d5c60e37c8
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
GreenshotConfluencePlugin/ConfluenceConfiguration.cs
View file

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

7
GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
View file

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

2
GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs
View file

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

3
GreenshotConfluencePlugin/Languages/language_confluenceplugin-en-US.xml
View file

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