From b1d7ebc484fbe75d7d2d56e29a6429650e9aaebf Mon Sep 17 00:00:00 2001
From: Patrick Simpson
Date: Tue, 26 Sep 2017 17:34:03 +0200
Subject: [PATCH] [KOE-49] Cleaned up margins for settings dialogs
---
.../Features/FreeBusy/FreeBusySettings.resx | 28 ++++++------
.../Features/GAB/GABSettings.resx | 17 +++++--
.../Features/SharedFolders/StoreTreeNode.cs | 24 ++++++----
.../UI/SettingsDialog.Designer.cs | 3 +-
.../AcaciaZPushPlugin/UI/SettingsDialog.cs | 3 +-
.../AcaciaZPushPlugin/UI/SettingsDialog.resx | 45 ++++++++++++++-----
6 files changed, 80 insertions(+), 40 deletions(-)
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/FreeBusy/FreeBusySettings.resx b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/FreeBusy/FreeBusySettings.resx
index 7c1d1b3..b1a733a 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/FreeBusy/FreeBusySettings.resx
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/FreeBusy/FreeBusySettings.resx
@@ -133,13 +133,13 @@
- 2, 2
+ 4, 4
- 2, 2, 2, 2
+ 4, 4, 4, 4
- 222, 17
+ 395, 29
0
@@ -166,13 +166,13 @@
True
- 2, 30
+ 4, 55
- 2, 0, 2, 0
+ 4, 0, 4, 0
- 74, 30
+ 132, 56
1
@@ -199,13 +199,13 @@
Top, Bottom, Left, Right
- 80, 32
+ 144, 59
- 2, 2, 2, 2
+ 4, 4, 4, 4
- 172, 21
+ 318, 32
2
@@ -229,13 +229,13 @@
0, 0
- 2, 2, 2, 2
+ 4, 4, 4, 4
2
- 254, 60
+ 466, 111
0
@@ -259,16 +259,16 @@
True
- 6, 13
+ 11, 24
True
- 2, 2, 2, 2
+ 4, 4, 4, 4
- 254, 60
+ 466, 111
FreeBusySettings
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABSettings.resx b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABSettings.resx
index cf10406..e7da318 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABSettings.resx
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABSettings.resx
@@ -127,10 +127,13 @@
- 0, 0
+ 4, 4
+
+
+ 6, 6, 6, 6
- 144, 17
+ 259, 29
0
@@ -154,13 +157,19 @@
True
- 6, 13
+ 11, 24
True
+
+ 6, 6, 6, 6
+
+
+ 4, 4, 4, 4
+
- 144, 17
+ 267, 37
GABSettings
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
index d0e3c39..d7b57c3 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
@@ -127,15 +127,23 @@ namespace Acacia.Features.SharedFolders
{
using (ContactStringReplacer replacer = ContactStringReplacer.FromGAB(_gab, _user))
{
- replacer.TokenOpen = "%";
- replacer.TokenClose = "%";
- replacer.UnknownReplacer = (token) =>
+ if (replacer == null)
{
- if (token == "foldername")
- return folder.Name;
- return "";
- };
- folder.DefaultName = replacer.Replace(_feature.DefaultFolderNameFormat);
+ // No gab available, default to old
+ folder.DefaultName = folder.Name + " - " + folder.Store.UserName;
+ }
+ else
+ {
+ replacer.TokenOpen = "%";
+ replacer.TokenClose = "%";
+ replacer.UnknownReplacer = (token) =>
+ {
+ if (token == "foldername")
+ return folder.Name;
+ return "";
+ };
+ folder.DefaultName = replacer.Replace(_feature.DefaultFolderNameFormat);
+ }
}
}
return folder.DefaultName;
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.Designer.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.Designer.cs
index 32c3a77..128520b 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.Designer.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.Designer.cs
@@ -38,10 +38,10 @@
//
// flowLayoutPanel1
//
+ resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
this.flowLayoutPanel1.Controls.Add(this.buttonApply);
this.flowLayoutPanel1.Controls.Add(this.buttonCancel);
this.flowLayoutPanel1.Controls.Add(this.buttonOK);
- resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
//
// buttonApply
@@ -83,6 +83,7 @@
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
+ this.PerformLayout();
}
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.cs
index 4bcceb5..53ce574 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.cs
@@ -1,4 +1,4 @@
-/// Copyright 2016 Kopano b.v.
+/// Copyright 2017 Kopano b.v.
///
/// This program is free software: you can redistribute it and/or modify
/// it under the terms of the GNU Affero General Public License, version 3,
@@ -38,6 +38,7 @@ namespace Acacia.UI
InitializeComponent();
settings.Dock = DockStyle.Fill;
+ settings.Padding = new Padding(9);
Controls.Add(settings);
}
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.resx b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.resx
index 65262a9..eaf69b9 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.resx
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.resx
@@ -118,6 +118,9 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
True
@@ -126,10 +129,14 @@
- 269, 3
+ 482, 11
+
+
+
+ 6, 6, 6, 6
- 75, 27
+ 138, 65
0
@@ -153,10 +160,13 @@
True
- 188, 3
+ 316, 11
+
+
+ 6, 6, 6, 6
- 75, 27
+ 154, 65
1
@@ -180,10 +190,13 @@
True
- 107, 3
+ 166, 11
+
+
+ 6, 6, 6, 6
- 75, 27
+ 138, 65
2
@@ -203,7 +216,6 @@
2
-
Bottom
@@ -211,13 +223,16 @@
RightToLeft
- 0, 374
+ 5, 659
+
+
+ 6, 6, 6, 6
- 0, 0, 5, 0
+ 0, 5, 9, 5
- 352, 30
+ 635, 87
0
@@ -238,13 +253,19 @@
True
- 6, 13
+ 11, 24
True
- 352, 404
+ 645, 746
+
+
+ 6, 6, 6, 6
+
+
+ 5, 5, 5, 0
CenterParent