github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 14:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code quality changes [skip ci]

Browse source
This commit is contained in:
Robin 2016-08-16 10:37:55 +02:00
commit 798ca503a5
108 changed files with 1981 additions and 2258 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml
View file

@ -1,7 +1,7 @@
<Page x:Class="GreenshotConfluencePlugin.ConfluencePagePicker"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:l="clr-namespace:TranslationByMarkupExtension" Loaded="Page_Loaded">
Loaded="Page_Loaded">
<ListView Name="PageListView" SelectionMode="Single" ItemsSource="{Binding}" SelectionChanged="PageListView_SelectionChanged" Width="480" Height="500">
<ListView.ItemTemplate>
<DataTemplate>

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

@ -44,7 +44,7 @@ namespace GreenshotConfluencePlugin {
if (PageListView.HasItems && PageListView.SelectedItems.Count > 0) {
confluenceUpload.SelectedPage = (Page)PageListView.SelectedItem;
// Make sure the uploader knows we selected an already opened page
confluenceUpload.isOpenPageSelected = true;
confluenceUpload.IsOpenPageSelected = true;
} else {
confluenceUpload.SelectedPage = null;
}

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

@ -77,7 +77,7 @@ namespace GreenshotConfluencePlugin {
void doSearch() {
string spaceKey = (string)SpaceComboBox.SelectedValue;
config.SearchSpaceKey = spaceKey;
List<Confluence.Page> searchResult = ConfluencePlugin.ConfluenceConnector.searchPages(searchText.Text, spaceKey);
List<Confluence.Page> searchResult = ConfluencePlugin.ConfluenceConnector.SearchPages(searchText.Text, spaceKey);
pages.Clear();
foreach(Confluence.Page page in searchResult) {
pages.Add(page);

4
GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml.cs
View file

@ -58,7 +58,7 @@ namespace GreenshotConfluencePlugin {
LOG.Debug("Loading pages for page: " + page.Title);
(new Thread(() => {
Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() => {ShowBusy.Visibility = Visibility.Visible;}));
List<Confluence.Page> pages = confluenceConnector.getPageChildren(page);
List<Confluence.Page> pages = confluenceConnector.GetPageChildren(page);
Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() => {
foreach(Confluence.Page childPage in pages) {
LOG.Debug("Adding page: " + childPage.Title);
@ -105,7 +105,7 @@ namespace GreenshotConfluencePlugin {
// Get homepage
try {
Confluence.Page page = confluenceConnector.getSpaceHomepage(space);
Confluence.Page page = confluenceConnector.GetSpaceHomepage(space);
TreeViewItem pageTreeViewItem = new TreeViewItem();
pageTreeViewItem.Header = page.Title;
pageTreeViewItem.Tag = page;

62
GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs
View file

@ -29,56 +29,56 @@ namespace GreenshotConfluencePlugin {
/// Interaction logic for ConfluenceUpload.xaml
/// </summary>
public partial class ConfluenceUpload : Window {
private Page pickerPage = null;
private Page _pickerPage;
public Page PickerPage {
get {
if (pickerPage == null) {
if (_pickerPage == null) {
List<Confluence.Page> pages = ConfluenceUtils.GetCurrentPages();
if (pages != null && pages.Count > 0) {
pickerPage = new ConfluencePagePicker(this, pages);
_pickerPage = new ConfluencePagePicker(this, pages);
}
}
return pickerPage;
return _pickerPage;
}
}
private Page searchPage = null;
private Page _searchPage;
public Page SearchPage {
get {
if (searchPage == null) {
searchPage = new ConfluenceSearch(this);
if (_searchPage == null) {
_searchPage = new ConfluenceSearch(this);
}
return searchPage;
return _searchPage;
}
}
private Page browsePage = null;
private Page _browsePage;
public Page BrowsePage {
get {
if (browsePage == null) {
browsePage = new ConfluenceTreePicker(this);
if (_browsePage == null) {
_browsePage = new ConfluenceTreePicker(this);
}
return browsePage;
return _browsePage;
}
}
private Confluence.Page selectedPage = null;
private Confluence.Page _selectedPage;
public Confluence.Page SelectedPage {
get {
return selectedPage;
return _selectedPage;
}
set {
selectedPage = value;
if (selectedPage != null) {
_selectedPage = value;
if (_selectedPage != null) {
Upload.IsEnabled = true;
} else {
Upload.IsEnabled = false;
}
isOpenPageSelected = false;
IsOpenPageSelected = false;
}
}
public bool isOpenPageSelected {
public bool IsOpenPageSelected {
get;
set;
}
@ -87,39 +87,39 @@ namespace GreenshotConfluencePlugin {
set;
}
private static DateTime lastLoad = DateTime.Now;
private static List<Confluence.Space> spaces;
private static DateTime _lastLoad = DateTime.Now;
private static List<Confluence.Space> _spaces;
public List<Confluence.Space> Spaces {
get {
updateSpaces();
while (spaces == null) {
UpdateSpaces();
while (_spaces == null) {
Thread.Sleep(300);
}
return spaces;
return _spaces;
}
}
public ConfluenceUpload(string filename) {
Filename = filename;
InitializeComponent();
this.DataContext = this;
updateSpaces();
DataContext = this;
UpdateSpaces();
if (PickerPage == null) {
PickerTab.Visibility = Visibility.Collapsed;
SearchTab.IsSelected = true;
}
}
void updateSpaces() {
if (spaces != null && DateTime.Now.AddMinutes(-60).CompareTo(lastLoad) > 0) {
void UpdateSpaces() {
if (_spaces != null && DateTime.Now.AddMinutes(-60).CompareTo(_lastLoad) > 0) {
// Reset
spaces = null;
_spaces = null;
}
// Check if load is needed
if (spaces == null) {
if (_spaces == null) {
(new Thread(() => {
spaces = ConfluencePlugin.ConfluenceConnector.getSpaceSummaries();
lastLoad = DateTime.Now;
_spaces = ConfluencePlugin.ConfluenceConnector.GetSpaceSummaries();
_lastLoad = DateTime.Now;
}) { Name = "Loading spaces for confluence"}).Start();
}
}