frodovdr
/
kopano-ol-extension
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[KOE-49] Cleaned up margins for settings dialogs

This commit is contained in:
Patrick Simpson 2017-09-26 17:34:03 +02:00
parent 53e29a1d1f
commit b1d7ebc484
6 changed files with 80 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/FreeBusy/FreeBusySettings.resx
View File

@ -133,13 +133,13 @@
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="checkGABLookup.Location" type="System.Drawing.Point, System.Drawing"> <data name="checkGABLookup.Location" type="System.Drawing.Point, System.Drawing">
<value>2, 2</value> <value>4, 4</value>
</data> </data>
<data name="checkGABLookup.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="checkGABLookup.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>2, 2, 2, 2</value> <value>4, 4, 4, 4</value>
</data> </data>
<data name="checkGABLookup.Size" type="System.Drawing.Size, System.Drawing"> <data name="checkGABLookup.Size" type="System.Drawing.Size, System.Drawing">
<value>222, 17</value> <value>395, 29</value>
</data> </data>
<data name="checkGABLookup.TabIndex" type="System.Int32, mscorlib"> <data name="checkGABLookup.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -166,13 +166,13 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="labelUseAccount.Location" type="System.Drawing.Point, System.Drawing"> <data name="labelUseAccount.Location" type="System.Drawing.Point, System.Drawing">
<value>2, 30</value> <value>4, 55</value>
</data> </data>
<data name="labelUseAccount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="labelUseAccount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>2, 0, 2, 0</value> <value>4, 0, 4, 0</value>
</data> </data>
<data name="labelUseAccount.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelUseAccount.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 30</value> <value>132, 56</value>
</data> </data>
<data name="labelUseAccount.TabIndex" type="System.Int32, mscorlib"> <data name="labelUseAccount.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -199,13 +199,13 @@
<value>Top, Bottom, Left, Right</value> <value>Top, Bottom, Left, Right</value>
</data> </data>
<data name="comboDefaultAccount.Location" type="System.Drawing.Point, System.Drawing"> <data name="comboDefaultAccount.Location" type="System.Drawing.Point, System.Drawing">
<value>80, 32</value> <value>144, 59</value>
</data> </data>
<data name="comboDefaultAccount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="comboDefaultAccount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>2, 2, 2, 2</value> <value>4, 4, 4, 4</value>
</data> </data>
<data name="comboDefaultAccount.Size" type="System.Drawing.Size, System.Drawing"> <data name="comboDefaultAccount.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 21</value> <value>318, 32</value>
</data> </data>
<data name="comboDefaultAccount.TabIndex" type="System.Int32, mscorlib"> <data name="comboDefaultAccount.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -229,13 +229,13 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>2, 2, 2, 2</value> <value>4, 4, 4, 4</value>
</data> </data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib"> <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
</data> </data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 60</value> <value>466, 111</value>
</data> </data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib"> <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -259,16 +259,16 @@
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value> <value>11, 24</value>
</data> </data>
<data name="$this.AutoSize" type="System.Boolean, mscorlib"> <data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>2, 2, 2, 2</value> <value>4, 4, 4, 4</value>
</data> </data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing"> <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>254, 60</value> <value>466, 111</value>
</data> </data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>FreeBusySettings</value> <value>FreeBusySettings</value>

17
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/GAB/GABSettings.resx
View File

@ -127,10 +127,13 @@
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="checkFaxNumbers.Location" type="System.Drawing.Point, System.Drawing"> <data name="checkFaxNumbers.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>4, 4</value>
</data>
<data name="checkFaxNumbers.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data> </data>
<data name="checkFaxNumbers.Size" type="System.Drawing.Size, System.Drawing"> <data name="checkFaxNumbers.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 17</value> <value>259, 29</value>
</data> </data>
<data name="checkFaxNumbers.TabIndex" type="System.Int32, mscorlib"> <data name="checkFaxNumbers.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -154,13 +157,19 @@
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value> <value>11, 24</value>
</data> </data>
<data name="$this.AutoSize" type="System.Boolean, mscorlib"> <data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing"> <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 17</value> <value>267, 37</value>
</data> </data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>GABSettings</value> <value>GABSettings</value>

24
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/StoreTreeNode.cs
View File

@ -127,15 +127,23 @@ namespace Acacia.Features.SharedFolders
{ {
using (ContactStringReplacer replacer = ContactStringReplacer.FromGAB(_gab, _user)) using (ContactStringReplacer replacer = ContactStringReplacer.FromGAB(_gab, _user))
{ {
replacer.TokenOpen = "%"; if (replacer == null)
replacer.TokenClose = "%";
replacer.UnknownReplacer = (token) =>
{ {
if (token == "foldername") // No gab available, default to old
return folder.Name; folder.DefaultName = folder.Name + " - " + folder.Store.UserName;
return ""; }
}; else
folder.DefaultName = replacer.Replace(_feature.DefaultFolderNameFormat); {
replacer.TokenOpen = "%";
replacer.TokenClose = "%";
replacer.UnknownReplacer = (token) =>
{
if (token == "foldername")
return folder.Name;
return "";
};
folder.DefaultName = replacer.Replace(_feature.DefaultFolderNameFormat);
}
} }
} }
return folder.DefaultName; return folder.DefaultName;

3
src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.Designer.cs generated
View File

@ -38,10 +38,10 @@
// //
// flowLayoutPanel1 // flowLayoutPanel1
// //
resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
this.flowLayoutPanel1.Controls.Add(this.buttonApply); this.flowLayoutPanel1.Controls.Add(this.buttonApply);
this.flowLayoutPanel1.Controls.Add(this.buttonCancel); this.flowLayoutPanel1.Controls.Add(this.buttonCancel);
this.flowLayoutPanel1.Controls.Add(this.buttonOK); this.flowLayoutPanel1.Controls.Add(this.buttonOK);
resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1");
this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Name = "flowLayoutPanel1";
// //
// buttonApply // buttonApply
@ -83,6 +83,7 @@
this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout(); this.flowLayoutPanel1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }

3
src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.cs
View File

@ -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 /// 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, /// it under the terms of the GNU Affero General Public License, version 3,
@ -38,6 +38,7 @@ namespace Acacia.UI
InitializeComponent(); InitializeComponent();
settings.Dock = DockStyle.Fill; settings.Dock = DockStyle.Fill;
settings.Padding = new Padding(9);
Controls.Add(settings); Controls.Add(settings);
} }

45
src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/SettingsDialog.resx
View File

@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="buttonApply.AutoSize" type="System.Boolean, mscorlib"> <data name="buttonApply.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
@ -126,10 +129,14 @@
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="buttonApply.Location" type="System.Drawing.Point, System.Drawing"> <data name="buttonApply.Location" type="System.Drawing.Point, System.Drawing">
<value>269, 3</value> <value>482, 11</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="buttonApply.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data> </data>
<data name="buttonApply.Size" type="System.Drawing.Size, System.Drawing"> <data name="buttonApply.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 27</value> <value>138, 65</value>
</data> </data>
<data name="buttonApply.TabIndex" type="System.Int32, mscorlib"> <data name="buttonApply.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -153,10 +160,13 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing"> <data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>188, 3</value> <value>316, 11</value>
</data>
<data name="buttonCancel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data> </data>
<data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing"> <data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 27</value> <value>154, 65</value>
</data> </data>
<data name="buttonCancel.TabIndex" type="System.Int32, mscorlib"> <data name="buttonCancel.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -180,10 +190,13 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="buttonOK.Location" type="System.Drawing.Point, System.Drawing"> <data name="buttonOK.Location" type="System.Drawing.Point, System.Drawing">
<value>107, 3</value> <value>166, 11</value>
</data>
<data name="buttonOK.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data> </data>
<data name="buttonOK.Size" type="System.Drawing.Size, System.Drawing"> <data name="buttonOK.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 27</value> <value>138, 65</value>
</data> </data>
<data name="buttonOK.TabIndex" type="System.Int32, mscorlib"> <data name="buttonOK.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -203,7 +216,6 @@
<data name="&gt;&gt;buttonOK.ZOrder" xml:space="preserve"> <data name="&gt;&gt;buttonOK.ZOrder" xml:space="preserve">
<value>2</value> <value>2</value>
</data> </data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="flowLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="flowLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Bottom</value> <value>Bottom</value>
</data> </data>
@ -211,13 +223,16 @@
<value>RightToLeft</value> <value>RightToLeft</value>
</data> </data>
<data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing"> <data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 374</value> <value>5, 659</value>
</data>
<data name="flowLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data> </data>
<data name="flowLayoutPanel1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="flowLayoutPanel1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 5, 0</value> <value>0, 5, 9, 5</value>
</data> </data>
<data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>352, 30</value> <value>635, 87</value>
</data> </data>
<data name="flowLayoutPanel1.TabIndex" type="System.Int32, mscorlib"> <data name="flowLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -238,13 +253,19 @@
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value> <value>11, 24</value>
</data> </data>
<data name="$this.AutoSize" type="System.Boolean, mscorlib"> <data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>352, 404</value> <value>645, 746</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 0</value>
</data> </data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value> <value>CenterParent</value>