mirror of
https://github.com/greenshot/greenshot
synced 2025-08-20 13:33:27 -07:00
Default disabling Outlook export to meeting items, the bitmaps are changed to BMP by Outlook. Also removed some old obsolete code.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1668 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
parent
184e70f7b1
commit
7669f78de6
4 changed files with 20 additions and 54 deletions
|
@ -111,28 +111,6 @@ namespace Greenshot {
|
|||
return returnValue;
|
||||
}
|
||||
|
||||
private void SetEmailFormat(EmailFormat selectedEmailFormat) {
|
||||
// TODO: Fix!!
|
||||
// Setup the email settings
|
||||
EmailFormat [] availableValues;
|
||||
if (EmailConfigHelper.HasMAPI()) {
|
||||
//checkbox_email.Enabled = true;
|
||||
//combobox_emailformat.Visible = true;
|
||||
if (EmailConfigHelper.HasOutlook()) {
|
||||
availableValues = new EmailFormat[]{EmailFormat.MAPI, EmailFormat.OUTLOOK_TXT, EmailFormat.OUTLOOK_HTML};
|
||||
} else {
|
||||
// Force MAPI in configuration if no Outlook
|
||||
coreConfiguration.OutputEMailFormat = EmailFormat.MAPI;
|
||||
availableValues = new EmailFormat[]{EmailFormat.MAPI};
|
||||
}
|
||||
//PopulateComboBox<EmailFormat>(combobox_emailformat, availableValues, selectedEmailFormat);
|
||||
} else {
|
||||
//checkbox_email.Enabled = false;
|
||||
//checkbox_email.Checked = false;
|
||||
//combobox_emailformat.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void SetWindowCaptureMode(WindowCaptureMode selectedWindowCaptureMode) {
|
||||
WindowCaptureMode[] availableModes;
|
||||
if (!DWM.isDWMEnabled()) {
|
||||
|
@ -286,7 +264,6 @@ namespace Greenshot {
|
|||
textbox_screenshotname.Text = coreConfiguration.OutputFileFilenamePattern;
|
||||
combobox_primaryimageformat.SelectedItem = coreConfiguration.OutputFileFormat;
|
||||
|
||||
SetEmailFormat(coreConfiguration.OutputEMailFormat);
|
||||
SetWindowCaptureMode(coreConfiguration.WindowCaptureMode);
|
||||
|
||||
checkbox_copypathtoclipboard.Checked = coreConfiguration.OutputFileCopyPathToClipboard;
|
||||
|
@ -351,10 +328,6 @@ namespace Greenshot {
|
|||
coreConfiguration.OutputFileFormat = OutputFormat.png;
|
||||
}
|
||||
|
||||
// TODO: Fix
|
||||
//coreConfiguration.OutputEMailFormat = GetSelected<EmailFormat>(combobox_emailformat);
|
||||
coreConfiguration.OutputEMailFormat = EmailFormat.OUTLOOK_HTML;
|
||||
|
||||
coreConfiguration.OutputFileCopyPathToClipboard = checkbox_copypathtoclipboard.Checked;
|
||||
coreConfiguration.OutputFileJpegQuality = trackBarJpegQuality.Value;
|
||||
coreConfiguration.OutputFilePromptJpegQuality = checkbox_alwaysshowjpegqualitydialog.Checked;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue