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

Fixed missing login

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@898 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2010-09-22 10:47:14 +00:00
commit 82207ac607
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GreenshotConfluencePlugin/ConfluencePluginBase.cs
View file

@ -117,8 +117,8 @@ namespace GreenshotConfluencePlugin {
confluenceConnector = new ConfluenceConnector(config.Url, config.Timeout); confluenceConnector = new ConfluenceConnector(config.Url, config.Timeout);
} }
ConfluenceForm confluenceForm = new ConfluenceForm(confluenceConnector);
if (confluenceConnector.isLoggedIn()) { if (confluenceConnector.isLoggedIn()) {
ConfluenceForm confluenceForm = new ConfluenceForm(confluenceConnector);
confluenceForm.setFilename(host.GetFilename(config.UploadFormat, imageEditor.CaptureDetails)); confluenceForm.setFilename(host.GetFilename(config.UploadFormat, imageEditor.CaptureDetails));
DialogResult result = confluenceForm.ShowDialog(); DialogResult result = confluenceForm.ShowDialog();
if (result == DialogResult.OK) { if (result == DialogResult.OK) {

20
GreenshotConfluencePlugin/Forms/ConfluenceForm.cs
View file

@ -23,20 +23,30 @@ using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using Confluence; using Confluence;
using Greenshot.Core;
namespace GreenshotConfluencePlugin { namespace GreenshotConfluencePlugin {
/// <summary> /// <summary>
/// Description of ConfluenceForm. /// Description of ConfluenceForm.
/// </summary> /// </summary>
public partial class ConfluenceForm : Form { public partial class ConfluenceForm : Form {
private ConfluenceConnector confluence; private ConfluenceConnector confluenceConnector;
public ConfluenceForm(ConfluenceConnector confluence) { private ILanguage language = Language.GetInstance();
public ConfluenceForm(ConfluenceConnector confluenceConnector) {
// //
// The InitializeComponent() call is required for Windows Forms designer support. // The InitializeComponent() call is required for Windows Forms designer support.
// //
InitializeComponent(); InitializeComponent();
this.confluence = confluence; this.confluenceConnector = confluenceConnector;
try {
if (!confluenceConnector.isLoggedIn()) {
confluenceConnector.login();
}
} catch (Exception e) {
MessageBox.Show(language.GetFormattedString(LangKey.login_error, e.Message));
}
} }
public void setFilename(string filename) { public void setFilename(string filename) {
@ -44,8 +54,8 @@ namespace GreenshotConfluencePlugin {
} }
public void upload(byte [] buffer) { public void upload(byte [] buffer) {
Page page = confluence.getPage(textBox_space.Text, textBox_page.Text); Page page = confluenceConnector.getPage(textBox_space.Text, textBox_page.Text);
confluence.addAttachment(page.id, " image/png", "HALLO", textBox_filename.Text, buffer); confluenceConnector.addAttachment(page.id, " image/png", "HALLO", textBox_filename.Text, buffer);
} }
void ButtonCancelClick(object sender, EventArgs e) { void ButtonCancelClick(object sender, EventArgs e) {

2
GreenshotJiraPlugin/JiraPluginBase.cs
View file

@ -116,9 +116,9 @@ namespace GreenshotJiraPlugin {
if (jiraConnector == null) { if (jiraConnector == null) {
jiraConnector = new JiraConnector(config.Url, config.Timeout); jiraConnector = new JiraConnector(config.Url, config.Timeout);
} }
JiraForm jiraForm = new JiraForm(jiraConnector);
if (jiraConnector.isLoggedIn()) { if (jiraConnector.isLoggedIn()) {
JiraForm jiraForm = new JiraForm(jiraConnector);
jiraForm.setFilename(host.GetFilename(config.UploadFormat, imageEditor.CaptureDetails)); jiraForm.setFilename(host.GetFilename(config.UploadFormat, imageEditor.CaptureDetails));
DialogResult result = jiraForm.ShowDialog(); DialogResult result = jiraForm.ShowDialog();
if (result == DialogResult.OK) { if (result == DialogResult.OK) {