Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3092150d3a | |||
| 163dc17b49 | |||
| b7cc335184 | |||
| a19a39b7d2 | |||
| 6349424007 | |||
| 7ffaddc77f | |||
| 9007e2a9b5 | |||
| 0eadb2274e | |||
| a676e064c4 |
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
; Erfordert Inno Setup 6.x (https://jrsoftware.org/isinfo.php)
|
; Erfordert Inno Setup 6.x (https://jrsoftware.org/isinfo.php)
|
||||||
|
|
||||||
#define MyAppName "Starface Outlook Sync"
|
#define MyAppName "Starface Outlook Sync"
|
||||||
#define MyAppVersion "0.0.0.17"
|
#define MyAppVersion "0.0.0.20"
|
||||||
#define MyAppPublisher "HackerSoft - Hacker-Net Telekommunikation"
|
#define MyAppPublisher "HackerSoft - Hacker-Net Telekommunikation"
|
||||||
#define MyAppURL "https://www.hacker-net.de"
|
#define MyAppURL "https://www.hacker-net.de"
|
||||||
#define MyAppExeName "StarfaceOutlookSync.exe"
|
#define MyAppExeName "StarfaceOutlookSync.exe"
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using Microsoft.Win32;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
namespace StarfaceOutlookSync.Models
|
namespace StarfaceOutlookSync.Models
|
||||||
@@ -7,6 +8,8 @@ namespace StarfaceOutlookSync.Models
|
|||||||
public class UserSettings
|
public class UserSettings
|
||||||
{
|
{
|
||||||
public bool StartMinimized { get; set; } = false;
|
public bool StartMinimized { get; set; } = false;
|
||||||
|
public bool SyncOnStart { get; set; } = false;
|
||||||
|
public bool AutoAcceptOutlookPrompt { get; set; } = false;
|
||||||
|
|
||||||
private static readonly string SettingsFile = Path.Combine(
|
private static readonly string SettingsFile = Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
@@ -32,6 +35,45 @@ namespace StarfaceOutlookSync.Models
|
|||||||
File.WriteAllText(SettingsFile, JsonConvert.SerializeObject(this, Formatting.Indented));
|
File.WriteAllText(SettingsFile, JsonConvert.SerializeObject(this, Formatting.Indented));
|
||||||
}
|
}
|
||||||
catch { }
|
catch { }
|
||||||
|
|
||||||
|
ApplyOutlookSecuritySetting();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ApplyOutlookSecuritySetting()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var regPath = @"Software\Policies\Microsoft\Office\16.0\Outlook\Security";
|
||||||
|
|
||||||
|
if (AutoAcceptOutlookPrompt)
|
||||||
|
{
|
||||||
|
// Alle Outlook Object Model Guard Prompts unterdruecken
|
||||||
|
var key = Registry.CurrentUser.CreateSubKey(regPath);
|
||||||
|
key.SetValue("ObjectModelGuard", 2, RegistryValueKind.DWord);
|
||||||
|
key.SetValue("PromptOOMAddressBookAccess", 2, RegistryValueKind.DWord);
|
||||||
|
key.SetValue("PromptOOMAddressInformationAccess", 2, RegistryValueKind.DWord);
|
||||||
|
key.SetValue("AdminSecurityMode", 3, RegistryValueKind.DWord);
|
||||||
|
key.Close();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Zurueck auf Standard (Werte loeschen)
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var key = Registry.CurrentUser.OpenSubKey(regPath, true);
|
||||||
|
if (key != null)
|
||||||
|
{
|
||||||
|
try { key.DeleteValue("ObjectModelGuard"); } catch { }
|
||||||
|
try { key.DeleteValue("PromptOOMAddressBookAccess"); } catch { }
|
||||||
|
try { key.DeleteValue("PromptOOMAddressInformationAccess"); } catch { }
|
||||||
|
try { key.DeleteValue("AdminSecurityMode"); } catch { }
|
||||||
|
key.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -394,29 +394,40 @@ namespace StarfaceOutlookSync.Services
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static string SafeGet(dynamic ci, string property)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
object val = ci.GetType().InvokeMember(property,
|
||||||
|
System.Reflection.BindingFlags.GetProperty, null, ci, null);
|
||||||
|
return val?.ToString() ?? "";
|
||||||
|
}
|
||||||
|
catch { return ""; }
|
||||||
|
}
|
||||||
|
|
||||||
private UnifiedContact MapFromOutlook(dynamic ci)
|
private UnifiedContact MapFromOutlook(dynamic ci)
|
||||||
{
|
{
|
||||||
return new UnifiedContact
|
return new UnifiedContact
|
||||||
{
|
{
|
||||||
OutlookEntryId = (string)(ci.EntryID ?? ""),
|
OutlookEntryId = SafeGet(ci, "EntryID"),
|
||||||
FirstName = (string)(ci.FirstName ?? ""),
|
FirstName = SafeGet(ci, "FirstName"),
|
||||||
LastName = (string)(ci.LastName ?? ""),
|
LastName = SafeGet(ci, "LastName"),
|
||||||
Company = (string)(ci.CompanyName ?? ""),
|
Company = SafeGet(ci, "CompanyName"),
|
||||||
JobTitle = (string)(ci.JobTitle ?? ""),
|
JobTitle = SafeGet(ci, "JobTitle"),
|
||||||
Email = (string)(ci.Email1Address ?? ""),
|
Email = SafeGet(ci, "Email1Address"),
|
||||||
EmailSecondary = (string)(ci.Email2Address ?? ""),
|
EmailSecondary = SafeGet(ci, "Email2Address"),
|
||||||
PhoneWork = (string)(ci.BusinessTelephoneNumber ?? ""),
|
PhoneWork = SafeGet(ci, "BusinessTelephoneNumber"),
|
||||||
PhoneMobile = (string)(ci.MobileTelephoneNumber ?? ""),
|
PhoneMobile = SafeGet(ci, "MobileTelephoneNumber"),
|
||||||
PhoneHome = (string)(ci.HomeTelephoneNumber ?? ""),
|
PhoneHome = SafeGet(ci, "HomeTelephoneNumber"),
|
||||||
Fax = (string)(ci.BusinessFaxNumber ?? ""),
|
Fax = SafeGet(ci, "BusinessFaxNumber"),
|
||||||
Street = (string)(ci.BusinessAddressStreet ?? ""),
|
Street = SafeGet(ci, "BusinessAddressStreet"),
|
||||||
City = (string)(ci.BusinessAddressCity ?? ""),
|
City = SafeGet(ci, "BusinessAddressCity"),
|
||||||
PostalCode = (string)(ci.BusinessAddressPostalCode ?? ""),
|
PostalCode = SafeGet(ci, "BusinessAddressPostalCode"),
|
||||||
State = (string)(ci.BusinessAddressState ?? ""),
|
State = SafeGet(ci, "BusinessAddressState"),
|
||||||
Country = (string)(ci.BusinessAddressCountry ?? ""),
|
Country = SafeGet(ci, "BusinessAddressCountry"),
|
||||||
Website = (string)(ci.WebPage ?? ""),
|
Website = SafeGet(ci, "WebPage"),
|
||||||
Notes = (string)(ci.Body ?? ""),
|
Notes = SafeGet(ci, "Body"),
|
||||||
Salutation = (string)(ci.Title ?? ""),
|
Salutation = SafeGet(ci, "Title"),
|
||||||
Birthday = GetBirthdayString(ci)
|
Birthday = GetBirthdayString(ci)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -425,8 +436,9 @@ namespace StarfaceOutlookSync.Services
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
DateTime bday = ci.Birthday;
|
object val = ci.GetType().InvokeMember("Birthday",
|
||||||
if (bday.Year > 1900 && bday != DateTime.MinValue)
|
System.Reflection.BindingFlags.GetProperty, null, ci, null);
|
||||||
|
if (val is DateTime bday && bday.Year > 1900 && bday != DateTime.MinValue)
|
||||||
return bday.ToString("yyyy-MM-dd");
|
return bday.ToString("yyyy-MM-dd");
|
||||||
}
|
}
|
||||||
catch { }
|
catch { }
|
||||||
|
|||||||
@@ -304,12 +304,27 @@ namespace StarfaceOutlookSync.Services
|
|||||||
{
|
{
|
||||||
var sfContact = MapToStarface(contact);
|
var sfContact = MapToStarface(contact);
|
||||||
sfContact["id"] = contactId;
|
sfContact["id"] = contactId;
|
||||||
|
|
||||||
|
// Tag beibehalten
|
||||||
|
if (!string.IsNullOrEmpty(book.TagId))
|
||||||
|
{
|
||||||
|
sfContact["tags"] = new JArray { new JObject { ["id"] = book.TagId } };
|
||||||
|
}
|
||||||
|
|
||||||
var query = "";
|
var query = "";
|
||||||
if (book.Type == "user" && !string.IsNullOrEmpty(book.UserId))
|
if (book.Type == "user" && !string.IsNullOrEmpty(book.UserId))
|
||||||
query = $"?userId={book.UserId}";
|
query = $"?userId={book.UserId}";
|
||||||
|
|
||||||
var content = new StringContent(sfContact.ToString(), Encoding.UTF8, "application/json");
|
var body = sfContact.ToString();
|
||||||
|
var content = new StringContent(body, Encoding.UTF8, "application/json");
|
||||||
var resp = await _http.PutAsync($"{_baseUrl}/contacts/{contactId}{query}", content);
|
var resp = await _http.PutAsync($"{_baseUrl}/contacts/{contactId}{query}", content);
|
||||||
|
|
||||||
|
if (!resp.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
var respBody = await resp.Content.ReadAsStringAsync();
|
||||||
|
OnDebug?.Invoke($"PUT /contacts/{contactId} fehlgeschlagen: {(int)resp.StatusCode}\n{respBody}");
|
||||||
|
}
|
||||||
|
|
||||||
return resp.IsSuccessStatusCode;
|
return resp.IsSuccessStatusCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,61 +17,94 @@ namespace StarfaceOutlookSync.Services
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Findet einen passenden Kontakt in der Kandidatenliste.
|
/// Findet einen passenden Kontakt in der Kandidatenliste.
|
||||||
/// Matching-Reihenfolge: E-Mail, dann Vorname+Nachname+Firma, dann Vorname+Nachname.
|
/// Strenges Matching: Felder die auf einer Seite gefuellt sind muessen
|
||||||
|
/// auf der anderen auch gefuellt (und gleich) sein.
|
||||||
|
/// Ein leeres Feld auf einer Seite und ein gefuelltes auf der anderen
|
||||||
|
/// bedeutet: verschiedene Kontakte.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static UnifiedContact FindMatch(UnifiedContact contact, List<UnifiedContact> candidates)
|
private static UnifiedContact FindMatch(UnifiedContact contact, List<UnifiedContact> candidates)
|
||||||
{
|
{
|
||||||
if (candidates == null || candidates.Count == 0) return null;
|
if (candidates == null || candidates.Count == 0) return null;
|
||||||
|
|
||||||
// 1. Exakte E-Mail
|
foreach (var c in candidates)
|
||||||
if (!string.IsNullOrEmpty(contact.Email))
|
|
||||||
{
|
{
|
||||||
var byEmail = candidates.FirstOrDefault(c =>
|
if (IsMatch(contact, c))
|
||||||
!string.IsNullOrEmpty(c.Email) &&
|
return c;
|
||||||
c.Email.Equals(contact.Email, StringComparison.OrdinalIgnoreCase));
|
|
||||||
if (byEmail != null) return byEmail;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Vorname + Nachname + Firma (staerkstes Match ohne E-Mail)
|
|
||||||
if ((!string.IsNullOrEmpty(contact.FirstName) || !string.IsNullOrEmpty(contact.LastName))
|
|
||||||
&& !string.IsNullOrEmpty(contact.Company))
|
|
||||||
{
|
|
||||||
var byNameCompany = candidates.FirstOrDefault(c =>
|
|
||||||
c.FirstName.Equals(contact.FirstName, StringComparison.OrdinalIgnoreCase) &&
|
|
||||||
c.LastName.Equals(contact.LastName, StringComparison.OrdinalIgnoreCase) &&
|
|
||||||
c.Company.Equals(contact.Company, StringComparison.OrdinalIgnoreCase));
|
|
||||||
if (byNameCompany != null) return byNameCompany;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 3. Vorname + Nachname (ohne Firma)
|
|
||||||
if (!string.IsNullOrEmpty(contact.FirstName) || !string.IsNullOrEmpty(contact.LastName))
|
|
||||||
{
|
|
||||||
var byName = candidates.FirstOrDefault(c =>
|
|
||||||
c.FirstName.Equals(contact.FirstName, StringComparison.OrdinalIgnoreCase) &&
|
|
||||||
c.LastName.Equals(contact.LastName, StringComparison.OrdinalIgnoreCase) &&
|
|
||||||
(!string.IsNullOrEmpty(c.FirstName) || !string.IsNullOrEmpty(c.LastName)));
|
|
||||||
if (byName != null) return byName;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 4. Telefonnummer (Buero oder Mobil)
|
|
||||||
if (!string.IsNullOrEmpty(contact.PhoneWork))
|
|
||||||
{
|
|
||||||
var byPhone = candidates.FirstOrDefault(c =>
|
|
||||||
!string.IsNullOrEmpty(c.PhoneWork) &&
|
|
||||||
NormalizePhone(c.PhoneWork) == NormalizePhone(contact.PhoneWork));
|
|
||||||
if (byPhone != null) return byPhone;
|
|
||||||
}
|
|
||||||
if (!string.IsNullOrEmpty(contact.PhoneMobile))
|
|
||||||
{
|
|
||||||
var byMobile = candidates.FirstOrDefault(c =>
|
|
||||||
!string.IsNullOrEmpty(c.PhoneMobile) &&
|
|
||||||
NormalizePhone(c.PhoneMobile) == NormalizePhone(contact.PhoneMobile));
|
|
||||||
if (byMobile != null) return byMobile;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool IsMatch(UnifiedContact a, UnifiedContact b)
|
||||||
|
{
|
||||||
|
// Mindestens ein identifizierendes Feld muss vorhanden sein
|
||||||
|
bool hasName = !string.IsNullOrEmpty(a.FirstName) || !string.IsNullOrEmpty(a.LastName);
|
||||||
|
bool hasEmail = !string.IsNullOrEmpty(a.Email);
|
||||||
|
bool hasPhone = !string.IsNullOrEmpty(a.PhoneWork) || !string.IsNullOrEmpty(a.PhoneMobile);
|
||||||
|
|
||||||
|
if (!hasName && !hasEmail && !hasPhone) return false;
|
||||||
|
|
||||||
|
// E-Mail: wenn auf beiden Seiten vorhanden, muss sie gleich sein
|
||||||
|
// Wenn nur auf einer Seite vorhanden -> kein Match
|
||||||
|
if (!FieldsCompatible(a.Email, b.Email)) return false;
|
||||||
|
|
||||||
|
// Name: wenn auf einer Seite vorhanden, muss er gleich sein
|
||||||
|
if (!FieldsCompatible(a.FirstName, b.FirstName)) return false;
|
||||||
|
if (!FieldsCompatible(a.LastName, b.LastName)) return false;
|
||||||
|
|
||||||
|
// Firma: wenn auf einer Seite vorhanden, muss sie gleich sein
|
||||||
|
// Leere Firma vs. gefuellte Firma = verschiedene Kontakte
|
||||||
|
if (!FieldsCompatible(a.Company, b.Company)) return false;
|
||||||
|
|
||||||
|
// Telefon/Fax: wenn auf einer Seite vorhanden, muss es gleich sein
|
||||||
|
if (!PhoneFieldsCompatible(a.PhoneWork, b.PhoneWork)) return false;
|
||||||
|
if (!PhoneFieldsCompatible(a.PhoneMobile, b.PhoneMobile)) return false;
|
||||||
|
if (!PhoneFieldsCompatible(a.PhoneHome, b.PhoneHome)) return false;
|
||||||
|
if (!PhoneFieldsCompatible(a.Fax, b.Fax)) return false;
|
||||||
|
|
||||||
|
// Mindestens ein starkes Match muss vorhanden sein
|
||||||
|
bool emailMatch = !string.IsNullOrEmpty(a.Email) && !string.IsNullOrEmpty(b.Email)
|
||||||
|
&& a.Email.Equals(b.Email, StringComparison.OrdinalIgnoreCase);
|
||||||
|
bool nameMatch = hasName
|
||||||
|
&& a.FirstName.Equals(b.FirstName, StringComparison.OrdinalIgnoreCase)
|
||||||
|
&& a.LastName.Equals(b.LastName, StringComparison.OrdinalIgnoreCase)
|
||||||
|
&& (!string.IsNullOrEmpty(a.FirstName) || !string.IsNullOrEmpty(a.LastName));
|
||||||
|
bool phoneMatch = (!string.IsNullOrEmpty(a.PhoneWork) && !string.IsNullOrEmpty(b.PhoneWork)
|
||||||
|
&& NormalizePhone(a.PhoneWork) == NormalizePhone(b.PhoneWork))
|
||||||
|
|| (!string.IsNullOrEmpty(a.Fax) && !string.IsNullOrEmpty(b.Fax)
|
||||||
|
&& NormalizePhone(a.Fax) == NormalizePhone(b.Fax));
|
||||||
|
bool companyMatch = !string.IsNullOrEmpty(a.Company) && !string.IsNullOrEmpty(b.Company)
|
||||||
|
&& a.Company.Equals(b.Company, StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
// Email oder Name reicht. Telefon/Fax nur mit Firma zusammen.
|
||||||
|
return emailMatch || nameMatch || (phoneMatch && companyMatch) || (companyMatch && phoneMatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Prueft ob zwei Felder kompatibel sind.
|
||||||
|
/// Beide leer = kompatibel. Beide gleich = kompatibel.
|
||||||
|
/// Eins leer, eins gefuellt = NICHT kompatibel (verschiedene Kontakte).
|
||||||
|
/// </summary>
|
||||||
|
private static bool FieldsCompatible(string a, string b)
|
||||||
|
{
|
||||||
|
bool aEmpty = string.IsNullOrEmpty(a);
|
||||||
|
bool bEmpty = string.IsNullOrEmpty(b);
|
||||||
|
|
||||||
|
if (aEmpty && bEmpty) return true;
|
||||||
|
if (aEmpty != bEmpty) return false; // Einer leer, anderer nicht
|
||||||
|
return a.Equals(b, StringComparison.OrdinalIgnoreCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool PhoneFieldsCompatible(string a, string b)
|
||||||
|
{
|
||||||
|
bool aEmpty = string.IsNullOrEmpty(a);
|
||||||
|
bool bEmpty = string.IsNullOrEmpty(b);
|
||||||
|
|
||||||
|
if (aEmpty && bEmpty) return true;
|
||||||
|
if (aEmpty != bEmpty) return false;
|
||||||
|
return NormalizePhone(a) == NormalizePhone(b);
|
||||||
|
}
|
||||||
|
|
||||||
private static string NormalizePhone(string phone)
|
private static string NormalizePhone(string phone)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(phone)) return "";
|
if (string.IsNullOrEmpty(phone)) return "";
|
||||||
|
|||||||
@@ -7,9 +7,9 @@
|
|||||||
<AssemblyTitle>Starface Outlook Sync</AssemblyTitle>
|
<AssemblyTitle>Starface Outlook Sync</AssemblyTitle>
|
||||||
<Company>HackerSoft - Hacker-Net Telekommunikation</Company>
|
<Company>HackerSoft - Hacker-Net Telekommunikation</Company>
|
||||||
<Product>Starface Outlook Sync</Product>
|
<Product>Starface Outlook Sync</Product>
|
||||||
<Version>0.0.0.17</Version>
|
<Version>0.0.0.20</Version>
|
||||||
<AssemblyVersion>0.0.0.17</AssemblyVersion>
|
<AssemblyVersion>0.0.0.20</AssemblyVersion>
|
||||||
<FileVersion>0.0.0.17</FileVersion>
|
<FileVersion>0.0.0.20</FileVersion>
|
||||||
<Description>Synchronisiert Outlook-Kontakte mit Starface Telefonanlage</Description>
|
<Description>Synchronisiert Outlook-Kontakte mit Starface Telefonanlage</Description>
|
||||||
<Copyright>Stefan Hacker - HackerSoft</Copyright>
|
<Copyright>Stefan Hacker - HackerSoft</Copyright>
|
||||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ namespace StarfaceOutlookSync.UI
|
|||||||
|
|
||||||
var lblVersion = new Label
|
var lblVersion = new Label
|
||||||
{
|
{
|
||||||
Text = "Version 0.0.0.17",
|
Text = "Version 0.0.0.20",
|
||||||
Left = 0, Top = 56, Width = 340, Height = 20,
|
Left = 0, Top = 56, Width = 340, Height = 20,
|
||||||
TextAlign = ContentAlignment.MiddleCenter,
|
TextAlign = ContentAlignment.MiddleCenter,
|
||||||
ForeColor = Color.Gray
|
ForeColor = Color.Gray
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ namespace StarfaceOutlookSync.UI
|
|||||||
private StatusStrip _statusBar;
|
private StatusStrip _statusBar;
|
||||||
private ToolStripStatusLabel _statusLabel;
|
private ToolStripStatusLabel _statusLabel;
|
||||||
private Timer _autoSyncTimer;
|
private Timer _autoSyncTimer;
|
||||||
|
private volatile bool _syncRunning = false;
|
||||||
|
|
||||||
public MainForm()
|
public MainForm()
|
||||||
{
|
{
|
||||||
@@ -30,14 +31,31 @@ namespace StarfaceOutlookSync.UI
|
|||||||
SetupAutoSync();
|
SetupAutoSync();
|
||||||
RefreshProfileList();
|
RefreshProfileList();
|
||||||
|
|
||||||
// Minimiert starten falls in Einstellungen aktiviert
|
// Einstellungen laden und anwenden
|
||||||
var settings = UserSettings.Load();
|
var settings = UserSettings.Load();
|
||||||
|
settings.ApplyOutlookSecuritySetting();
|
||||||
|
|
||||||
if (settings.StartMinimized)
|
if (settings.StartMinimized)
|
||||||
{
|
{
|
||||||
WindowState = FormWindowState.Minimized;
|
WindowState = FormWindowState.Minimized;
|
||||||
ShowInTaskbar = false;
|
ShowInTaskbar = false;
|
||||||
Visible = false;
|
Visible = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Beim Start automatisch synchronisieren
|
||||||
|
if (settings.SyncOnStart)
|
||||||
|
{
|
||||||
|
_ = SyncAllProfiles();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SyncAllProfiles()
|
||||||
|
{
|
||||||
|
var profiles = _profileManager.GetProfiles().Where(p => p.Enabled).ToList();
|
||||||
|
foreach (var profile in profiles)
|
||||||
|
{
|
||||||
|
await RunSync(profile);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void SetVisibleCore(bool value)
|
protected override void SetVisibleCore(bool value)
|
||||||
@@ -158,6 +176,7 @@ namespace StarfaceOutlookSync.UI
|
|||||||
if (profiles.Any(p => p.Enabled))
|
if (profiles.Any(p => p.Enabled))
|
||||||
_trayMenu.Items.Add("-");
|
_trayMenu.Items.Add("-");
|
||||||
|
|
||||||
|
_trayMenu.Items.Add("Ueber", null, (s, e) => ShowAbout());
|
||||||
_trayMenu.Items.Add("Beenden", null, (s, e) => ExitApplication());
|
_trayMenu.Items.Add("Beenden", null, (s, e) => ExitApplication());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -318,6 +337,13 @@ namespace StarfaceOutlookSync.UI
|
|||||||
|
|
||||||
private async Task RunSync(SyncProfile profile)
|
private async Task RunSync(SyncProfile profile)
|
||||||
{
|
{
|
||||||
|
if (_syncRunning)
|
||||||
|
{
|
||||||
|
SetStatus("Sync laeuft bereits, bitte warten...");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_syncRunning = true;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
SetStatus($"Synchronisiere '{profile.Name}'...");
|
SetStatus($"Synchronisiere '{profile.Name}'...");
|
||||||
@@ -340,6 +366,10 @@ namespace StarfaceOutlookSync.UI
|
|||||||
ex.Message, ToolTipIcon.Error);
|
ex.Message, ToolTipIcon.Error);
|
||||||
SetStatus($"Fehler: {ex.Message}");
|
SetStatus($"Fehler: {ex.Message}");
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_syncRunning = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetStatus(string text)
|
private void SetStatus(string text)
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ namespace StarfaceOutlookSync.UI
|
|||||||
{
|
{
|
||||||
public class SettingsForm : Form
|
public class SettingsForm : Form
|
||||||
{
|
{
|
||||||
private CheckBox _chkStartMinimized;
|
private CheckBox _chkStartMinimized, _chkSyncOnStart, _chkAutoAcceptOutlook;
|
||||||
private Button _btnSave, _btnCancel;
|
private Button _btnSave, _btnCancel;
|
||||||
private readonly UserSettings _settings;
|
private readonly UserSettings _settings;
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ namespace StarfaceOutlookSync.UI
|
|||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
Text = "Einstellungen";
|
Text = "Einstellungen";
|
||||||
Size = new Size(350, 180);
|
Size = new Size(380, 250);
|
||||||
FormBorderStyle = FormBorderStyle.FixedDialog;
|
FormBorderStyle = FormBorderStyle.FixedDialog;
|
||||||
MaximizeBox = false;
|
MaximizeBox = false;
|
||||||
MinimizeBox = false;
|
MinimizeBox = false;
|
||||||
@@ -33,20 +33,34 @@ namespace StarfaceOutlookSync.UI
|
|||||||
Checked = _settings.StartMinimized
|
Checked = _settings.StartMinimized
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_chkSyncOnStart = new CheckBox
|
||||||
|
{
|
||||||
|
Text = "Beim Start automatisch synchronisieren",
|
||||||
|
Left = 20, Top = 52, AutoSize = true,
|
||||||
|
Checked = _settings.SyncOnStart
|
||||||
|
};
|
||||||
|
|
||||||
|
_chkAutoAcceptOutlook = new CheckBox
|
||||||
|
{
|
||||||
|
Text = "Outlook-Sicherheitsabfrage automatisch erlauben",
|
||||||
|
Left = 20, Top = 80, AutoSize = true,
|
||||||
|
Checked = _settings.AutoAcceptOutlookPrompt
|
||||||
|
};
|
||||||
|
|
||||||
_btnSave = new Button
|
_btnSave = new Button
|
||||||
{
|
{
|
||||||
Text = "Speichern", Left = 80, Top = 100, Width = 85, Height = 28,
|
Text = "Speichern", Left = 95, Top = 160, Width = 85, Height = 28,
|
||||||
DialogResult = DialogResult.None
|
DialogResult = DialogResult.None
|
||||||
};
|
};
|
||||||
_btnSave.Click += (s, e) => Save();
|
_btnSave.Click += (s, e) => Save();
|
||||||
|
|
||||||
_btnCancel = new Button
|
_btnCancel = new Button
|
||||||
{
|
{
|
||||||
Text = "Abbrechen", Left = 174, Top = 100, Width = 85, Height = 28,
|
Text = "Abbrechen", Left = 189, Top = 160, Width = 85, Height = 28,
|
||||||
DialogResult = DialogResult.Cancel
|
DialogResult = DialogResult.Cancel
|
||||||
};
|
};
|
||||||
|
|
||||||
Controls.AddRange(new Control[] { _chkStartMinimized, _btnSave, _btnCancel });
|
Controls.AddRange(new Control[] { _chkStartMinimized, _chkSyncOnStart, _chkAutoAcceptOutlook, _btnSave, _btnCancel });
|
||||||
AcceptButton = _btnSave;
|
AcceptButton = _btnSave;
|
||||||
CancelButton = _btnCancel;
|
CancelButton = _btnCancel;
|
||||||
}
|
}
|
||||||
@@ -54,6 +68,8 @@ namespace StarfaceOutlookSync.UI
|
|||||||
private void Save()
|
private void Save()
|
||||||
{
|
{
|
||||||
_settings.StartMinimized = _chkStartMinimized.Checked;
|
_settings.StartMinimized = _chkStartMinimized.Checked;
|
||||||
|
_settings.SyncOnStart = _chkSyncOnStart.Checked;
|
||||||
|
_settings.AutoAcceptOutlookPrompt = _chkAutoAcceptOutlook.Checked;
|
||||||
_settings.Save();
|
_settings.Save();
|
||||||
DialogResult = DialogResult.OK;
|
DialogResult = DialogResult.OK;
|
||||||
Close();
|
Close();
|
||||||
|
|||||||
Reference in New Issue
Block a user