frodovdr/kopano-ol-extension
1
0
Fork 0
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Implemented GABLookupControl using new combo box

Browse Source
This commit is contained in:
Patrick Simpson 2017-06-29 18:27:48 +02:00
parent a27f65e3d1
commit d7c7c94a7e
7 changed files with 362 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KAbstractComboBox.cs
View File

@ -59,16 +59,25 @@ namespace Acacia.Controls
} }
} }
protected int _settingText = 0;
override public string Text override public string Text
{ {
get { return _edit.Text; } get { return _edit.Text; }
set set
{
++_settingText;
try
{ {
_edit.Text = value; _edit.Text = value;
// Set the cursor after the text // Set the cursor after the text
_edit.Select(_edit.Text.Length, 0); _edit.Select(_edit.Text.Length, 0);
} }
finally
{
--_settingText;
}
}
} }
#endregion #endregion
@ -327,12 +336,6 @@ namespace Acacia.Controls
DropControl.MaximumSize = DropControl.MinimumSize = new Size(width, height); DropControl.MaximumSize = DropControl.MinimumSize = new Size(width, height);
_dropDown.Control.Bounds = _dropDown.ControlHost.Bounds; _dropDown.Control.Bounds = _dropDown.ControlHost.Bounds;
System.Diagnostics.Trace.WriteLine(string.Format(
"Layout: {0}, host: {1}, control: {2}",
height,
_dropDown.ControlHost.Bounds,
_dropDown.Control.Bounds
));
} }
protected abstract int GetDropDownHeightMax(); protected abstract int GetDropDownHeightMax();

58
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KComboBox.cs
View File

@ -27,6 +27,7 @@ namespace Acacia.Controls
{ {
private readonly KComboBox _owner; private readonly KComboBox _owner;
private int _committedIndex = -1; private int _committedIndex = -1;
public int ItemWidth { get; set; }
public DropList(KComboBox owner, bool ownerDraw) public DropList(KComboBox owner, bool ownerDraw)
{ {
@ -91,7 +92,8 @@ namespace Acacia.Controls
{ {
// Preferred size is simply the size of the (maximum) number of items // Preferred size is simply the size of the (maximum) number of items
Size prefSize = base.GetPreferredSize(proposedSize); Size prefSize = base.GetPreferredSize(proposedSize);
return new Size(prefSize.Width, ItemHeight * Math.Min(Items.Count, _owner.MaxDropDownItems)); int w = Math.Max(prefSize.Width, ItemWidth);
return new Size(w, ItemHeight * Math.Min(Items.Count, _owner.MaxDropDownItems));
} }
public void CommitSelection() public void CommitSelection()
@ -162,17 +164,40 @@ namespace Acacia.Controls
Text = ""; Text = "";
_selectedItem = null; _selectedItem = null;
} }
OnSelectedItemChanged();
} }
public void BeginUpdate() public DisplayItem SelectedItem
{ {
_list.BeginUpdate(); get { return _selectedItem; }
} }
public void EndUpdate() public void Select(object data)
{ {
_list.EndUpdate(); _list.SelectedIndex = -1;
Text = null;
_selectedItem = null;
if (data != null)
{
foreach (DisplayItem item in DisplayItems)
{
if (item.Item.Equals(data))
{
_list.SelectedItem = item;
_selectedItem = item;
break;
} }
}
}
}
public event EventHandler SelectedItemChanged;
protected virtual void OnSelectedItemChanged()
{
SelectedItemChanged?.Invoke(this, new EventArgs());
}
/// <summary> /// <summary>
/// Wrapper for list items to use custom string formatting /// Wrapper for list items to use custom string formatting
@ -213,11 +238,14 @@ namespace Acacia.Controls
if (_dataSource != value) if (_dataSource != value)
{ {
_dataSource = value; _dataSource = value;
_displayItemCache.Clear();
UpdateItems(); UpdateItems();
} }
} }
} }
private readonly Dictionary<object, DisplayItem> _displayItemCache = new Dictionary<object, DisplayItem>();
private void UpdateItems() private void UpdateItems()
{ {
int oldCount = _list.Items.Count; int oldCount = _list.Items.Count;
@ -228,12 +256,17 @@ namespace Acacia.Controls
int selected = -1; int selected = -1;
foreach (object item in _dataSource.FilteredItems) foreach (object item in _dataSource.FilteredItems)
{ {
DisplayItem displayItem = new DisplayItem(this, item); DisplayItem displayItem;
if (displayItem.Equals(_selectedItem)) if (!_displayItemCache.TryGetValue(item, out displayItem))
{
displayItem = new DisplayItem(this, item);
_displayItemCache.Add(item, displayItem);
}
if (displayItem == _selectedItem)
selected = _list.Items.Count; selected = _list.Items.Count;
_list.Items.Add(displayItem); _list.Items.Add(displayItem);
} }
System.Diagnostics.Trace.WriteLine(string.Format("FILTER: {0}", _list.Items.Count, selected));
// Select the current item only if new number of items is smaller. This means we don't keep selection // Select the current item only if new number of items is smaller. This means we don't keep selection
// when the user is removing text, only when they are typing more. // when the user is removing text, only when they are typing more.
@ -277,7 +310,7 @@ namespace Acacia.Controls
protected void SetItemSize(Size size) protected void SetItemSize(Size size)
{ {
ItemHeight = size.Height; ItemHeight = size.Height;
_list.Width = size.Width; _list.ItemWidth = size.Width;
} }
protected override void OnTextChanged(EventArgs e) protected override void OnTextChanged(EventArgs e)
@ -290,9 +323,12 @@ namespace Acacia.Controls
DataSource.Filter = new KDataFilter(Text); DataSource.Filter = new KDataFilter(Text);
UpdateItems(); UpdateItems();
if (_settingText == 0)
{
DroppedDown = true; DroppedDown = true;
} }
} }
}
protected override int GetDropDownHeightMax() protected override int GetDropDownHeightMax()
{ {
@ -322,8 +358,12 @@ namespace Acacia.Controls
// Enter commits the selected index and closes the drop down // Enter commits the selected index and closes the drop down
case Keys.Enter: case Keys.Enter:
case Keys.Tab: case Keys.Tab:
if (DroppedDown)
{
if (_list.SelectedIndex >= 0)
_list.CommitSelection(); _list.CommitSelection();
DroppedDown = false; DroppedDown = false;
}
e.IsInputKey = e.KeyCode == Keys.Enter; e.IsInputKey = e.KeyCode == Keys.Enter;
break; break;
default: default:

2
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KComboBoxCustomDraw.cs
View File

@ -49,7 +49,7 @@ namespace Acacia.Controls
OnDrawItem(new DrawItemEventArgs(e, GetDisplayItem(e.Index))); OnDrawItem(new DrawItemEventArgs(e, GetDisplayItem(e.Index)));
} }
abstract protected void OnDrawItem(DrawItemEventArgs e); protected abstract void OnDrawItem(DrawItemEventArgs e);
protected abstract void OnMeasureItem(MeasureItemEventArgs e); protected abstract void OnMeasureItem(MeasureItemEventArgs e);

49
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/SharedFoldersDialog.Designer.cs generated
View File

@ -35,19 +35,19 @@
this._layoutMain = new System.Windows.Forms.TableLayoutPanel(); this._layoutMain = new System.Windows.Forms.TableLayoutPanel();
this._layoutSelectUser = new System.Windows.Forms.TableLayoutPanel(); this._layoutSelectUser = new System.Windows.Forms.TableLayoutPanel();
this.labelSelectUser = new System.Windows.Forms.Label(); this.labelSelectUser = new System.Windows.Forms.Label();
this.buttonOpenUser = new System.Windows.Forms.Button();
this._layoutCenterGABLookup = new System.Windows.Forms.TableLayoutPanel(); this._layoutCenterGABLookup = new System.Windows.Forms.TableLayoutPanel();
this.gabLookup = new Acacia.UI.GABLookupControl(); this.gabLookup = new Acacia.UI.GABLookupControl();
this.buttonOpenUser = new System.Windows.Forms.Button();
this.kTreeFolders = new Acacia.Controls.KTree(); this.kTreeFolders = new Acacia.Controls.KTree();
this._layoutOptions = new System.Windows.Forms.TableLayoutPanel(); this._layoutOptions = new System.Windows.Forms.TableLayoutPanel();
this._labelName = new System.Windows.Forms.Label(); this._labelName = new System.Windows.Forms.Label();
this.textName = new System.Windows.Forms.TextBox(); this.textName = new System.Windows.Forms.TextBox();
this._labelSendAs = new System.Windows.Forms.Label(); this._labelSendAs = new System.Windows.Forms.Label();
this.checkSendAs = new System.Windows.Forms.CheckBox(); this.checkSendAs = new System.Windows.Forms.CheckBox();
this._labelPermissions = new System.Windows.Forms.Label();
this.labelPermissionsValue = new System.Windows.Forms.Label();
this._labelReminders = new System.Windows.Forms.Label(); this._labelReminders = new System.Windows.Forms.Label();
this.checkReminders = new System.Windows.Forms.CheckBox(); this.checkReminders = new System.Windows.Forms.CheckBox();
this._labelPermissions = new System.Windows.Forms.Label();
this.labelPermissionsValue = new System.Windows.Forms.Label();
this.dialogButtons = new Acacia.Controls.KDialogButtons(); this.dialogButtons = new Acacia.Controls.KDialogButtons();
this._layout.SuspendLayout(); this._layout.SuspendLayout();
this._mainBusyHider.SuspendLayout(); this._mainBusyHider.SuspendLayout();
@ -85,8 +85,8 @@
// //
resources.ApplyResources(this._layoutSelectUser, "_layoutSelectUser"); resources.ApplyResources(this._layoutSelectUser, "_layoutSelectUser");
this._layoutSelectUser.Controls.Add(this.labelSelectUser, 0, 0); this._layoutSelectUser.Controls.Add(this.labelSelectUser, 0, 0);
this._layoutSelectUser.Controls.Add(this.buttonOpenUser, 2, 0);
this._layoutSelectUser.Controls.Add(this._layoutCenterGABLookup, 1, 0); this._layoutSelectUser.Controls.Add(this._layoutCenterGABLookup, 1, 0);
this._layoutSelectUser.Controls.Add(this.buttonOpenUser, 2, 0);
this._layoutSelectUser.Name = "_layoutSelectUser"; this._layoutSelectUser.Name = "_layoutSelectUser";
// //
// labelSelectUser // labelSelectUser
@ -94,13 +94,6 @@
resources.ApplyResources(this.labelSelectUser, "labelSelectUser"); resources.ApplyResources(this.labelSelectUser, "labelSelectUser");
this.labelSelectUser.Name = "labelSelectUser"; this.labelSelectUser.Name = "labelSelectUser";
// //
// buttonOpenUser
//
resources.ApplyResources(this.buttonOpenUser, "buttonOpenUser");
this.buttonOpenUser.Name = "buttonOpenUser";
this.buttonOpenUser.UseVisualStyleBackColor = true;
this.buttonOpenUser.Click += new System.EventHandler(this.buttonOpenUser_Click);
//
// _layoutCenterGABLookup // _layoutCenterGABLookup
// //
resources.ApplyResources(this._layoutCenterGABLookup, "_layoutCenterGABLookup"); resources.ApplyResources(this._layoutCenterGABLookup, "_layoutCenterGABLookup");
@ -114,9 +107,18 @@
this.gabLookup.DroppedDown = false; this.gabLookup.DroppedDown = false;
this.gabLookup.GAB = null; this.gabLookup.GAB = null;
this.gabLookup.Name = "gabLookup"; this.gabLookup.Name = "gabLookup";
this.gabLookup.PlaceholderColor = System.Drawing.Color.Gray;
this.gabLookup.PlaceholderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.gabLookup.SelectedUser = null; this.gabLookup.SelectedUser = null;
this.gabLookup.SelectedUserChanged += new Acacia.UI.GABLookupControl.SelectedUserEventHandler(this.gabLookup_SelectedUserChanged); this.gabLookup.SelectedUserChanged += new Acacia.UI.GABLookupControl.SelectedUserEventHandler(this.gabLookup_SelectedUserChanged);
// //
// buttonOpenUser
//
resources.ApplyResources(this.buttonOpenUser, "buttonOpenUser");
this.buttonOpenUser.Name = "buttonOpenUser";
this.buttonOpenUser.UseVisualStyleBackColor = true;
this.buttonOpenUser.Click += new System.EventHandler(this.buttonOpenUser_Click);
//
// kTreeFolders // kTreeFolders
// //
this.kTreeFolders.BackColor = System.Drawing.SystemColors.Window; this.kTreeFolders.BackColor = System.Drawing.SystemColors.Window;
@ -140,10 +142,10 @@
this._layoutOptions.Controls.Add(this.textName, 1, 0); this._layoutOptions.Controls.Add(this.textName, 1, 0);
this._layoutOptions.Controls.Add(this._labelSendAs, 0, 1); this._layoutOptions.Controls.Add(this._labelSendAs, 0, 1);
this._layoutOptions.Controls.Add(this.checkSendAs, 1, 1); this._layoutOptions.Controls.Add(this.checkSendAs, 1, 1);
this._layoutOptions.Controls.Add(this._labelPermissions, 0, 3);
this._layoutOptions.Controls.Add(this.labelPermissionsValue, 1, 3);
this._layoutOptions.Controls.Add(this._labelReminders, 0, 2); this._layoutOptions.Controls.Add(this._labelReminders, 0, 2);
this._layoutOptions.Controls.Add(this.checkReminders, 1, 2); this._layoutOptions.Controls.Add(this.checkReminders, 1, 2);
this._layoutOptions.Controls.Add(this._labelPermissions, 0, 3);
this._layoutOptions.Controls.Add(this.labelPermissionsValue, 1, 3);
this._layoutOptions.Name = "_layoutOptions"; this._layoutOptions.Name = "_layoutOptions";
// //
// _labelName // _labelName
@ -170,16 +172,6 @@
this.checkSendAs.UseVisualStyleBackColor = true; this.checkSendAs.UseVisualStyleBackColor = true;
this.checkSendAs.CheckedChanged += new System.EventHandler(this.checkSendAs_CheckedChanged); this.checkSendAs.CheckedChanged += new System.EventHandler(this.checkSendAs_CheckedChanged);
// //
// _labelPermissions
//
resources.ApplyResources(this._labelPermissions, "_labelPermissions");
this._labelPermissions.Name = "_labelPermissions";
//
// labelPermissionsValue
//
resources.ApplyResources(this.labelPermissionsValue, "labelPermissionsValue");
this.labelPermissionsValue.Name = "labelPermissionsValue";
//
// _labelReminders // _labelReminders
// //
resources.ApplyResources(this._labelReminders, "_labelReminders"); resources.ApplyResources(this._labelReminders, "_labelReminders");
@ -192,6 +184,16 @@
this.checkReminders.UseVisualStyleBackColor = true; this.checkReminders.UseVisualStyleBackColor = true;
this.checkReminders.CheckedChanged += new System.EventHandler(this.checkReminders_CheckedChanged); this.checkReminders.CheckedChanged += new System.EventHandler(this.checkReminders_CheckedChanged);
// //
// _labelPermissions
//
resources.ApplyResources(this._labelPermissions, "_labelPermissions");
this._labelPermissions.Name = "_labelPermissions";
//
// labelPermissionsValue
//
resources.ApplyResources(this.labelPermissionsValue, "labelPermissionsValue");
this.labelPermissionsValue.Name = "labelPermissionsValue";
//
// dialogButtons // dialogButtons
// //
resources.ApplyResources(this.dialogButtons, "dialogButtons"); resources.ApplyResources(this.dialogButtons, "dialogButtons");
@ -220,6 +222,7 @@
this._layoutSelectUser.ResumeLayout(false); this._layoutSelectUser.ResumeLayout(false);
this._layoutSelectUser.PerformLayout(); this._layoutSelectUser.PerformLayout();
this._layoutCenterGABLookup.ResumeLayout(false); this._layoutCenterGABLookup.ResumeLayout(false);
this._layoutCenterGABLookup.PerformLayout();
this._layoutOptions.ResumeLayout(false); this._layoutOptions.ResumeLayout(false);
this._layoutOptions.PerformLayout(); this._layoutOptions.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);

241
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/SharedFolders/SharedFoldersDialog.resx
View File

@ -148,7 +148,7 @@
<value>3, 0</value> <value>3, 0</value>
</data> </data>
<data name="labelSelectUser.Size" type="System.Drawing.Size, System.Drawing"> <data name="labelSelectUser.Size" type="System.Drawing.Size, System.Drawing">
<value>105, 31</value> <value>105, 33</value>
</data> </data>
<data name="labelSelectUser.TabIndex" type="System.Int32, mscorlib"> <data name="labelSelectUser.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -171,48 +171,6 @@
<data name="&gt;&gt;labelSelectUser.ZOrder" xml:space="preserve"> <data name="&gt;&gt;labelSelectUser.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="buttonOpenUser.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="buttonOpenUser.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="buttonOpenUser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="buttonOpenUser.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="buttonOpenUser.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="buttonOpenUser.Location" type="System.Drawing.Point, System.Drawing">
<value>380, 3</value>
</data>
<data name="buttonOpenUser.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 0, 8, 0</value>
</data>
<data name="buttonOpenUser.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 25</value>
</data>
<data name="buttonOpenUser.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="buttonOpenUser.Text" xml:space="preserve">
<value>Open</value>
</data>
<data name="&gt;&gt;buttonOpenUser.Name" xml:space="preserve">
<value>buttonOpenUser</value>
</data>
<data name="&gt;&gt;buttonOpenUser.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonOpenUser.Parent" xml:space="preserve">
<value>_layoutSelectUser</value>
</data>
<data name="&gt;&gt;buttonOpenUser.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="_layoutCenterGABLookup.AutoSize" type="System.Boolean, mscorlib"> <data name="_layoutCenterGABLookup.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
@ -228,8 +186,11 @@
<data name="gabLookup.MinimumSize" type="System.Drawing.Size, System.Drawing"> <data name="gabLookup.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>200, 0</value> <value>200, 0</value>
</data> </data>
<data name="gabLookup.Placeholder" xml:space="preserve">
<value />
</data>
<data name="gabLookup.Size" type="System.Drawing.Size, System.Drawing"> <data name="gabLookup.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 21</value> <value>256, 23</value>
</data> </data>
<data name="gabLookup.TabIndex" type="System.Int32, mscorlib"> <data name="gabLookup.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -259,10 +220,10 @@
<value>3</value> <value>3</value>
</data> </data>
<data name="_layoutCenterGABLookup.Size" type="System.Drawing.Size, System.Drawing"> <data name="_layoutCenterGABLookup.Size" type="System.Drawing.Size, System.Drawing">
<value>262, 27</value> <value>262, 29</value>
</data> </data>
<data name="_layoutCenterGABLookup.TabIndex" type="System.Int32, mscorlib"> <data name="_layoutCenterGABLookup.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>1</value>
</data> </data>
<data name="&gt;&gt;_layoutCenterGABLookup.Name" xml:space="preserve"> <data name="&gt;&gt;_layoutCenterGABLookup.Name" xml:space="preserve">
<value>_layoutCenterGABLookup</value> <value>_layoutCenterGABLookup</value>
@ -274,11 +235,53 @@
<value>_layoutSelectUser</value> <value>_layoutSelectUser</value>
</data> </data>
<data name="&gt;&gt;_layoutCenterGABLookup.ZOrder" xml:space="preserve"> <data name="&gt;&gt;_layoutCenterGABLookup.ZOrder" xml:space="preserve">
<value>2</value> <value>1</value>
</data> </data>
<data name="_layoutCenterGABLookup.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> <data name="_layoutCenterGABLookup.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="gabLookup" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="Percent,50,AutoSize,0,Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value> <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="gabLookup" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="Percent,50,AutoSize,0,Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data> </data>
<data name="buttonOpenUser.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="buttonOpenUser.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="buttonOpenUser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="buttonOpenUser.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="buttonOpenUser.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="buttonOpenUser.Location" type="System.Drawing.Point, System.Drawing">
<value>380, 3</value>
</data>
<data name="buttonOpenUser.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 0, 8, 0</value>
</data>
<data name="buttonOpenUser.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 27</value>
</data>
<data name="buttonOpenUser.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="buttonOpenUser.Text" xml:space="preserve">
<value>Open</value>
</data>
<data name="&gt;&gt;buttonOpenUser.Name" xml:space="preserve">
<value>buttonOpenUser</value>
</data>
<data name="&gt;&gt;buttonOpenUser.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonOpenUser.Parent" xml:space="preserve">
<value>_layoutSelectUser</value>
</data>
<data name="&gt;&gt;buttonOpenUser.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="_layoutSelectUser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="_layoutSelectUser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
@ -289,7 +292,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="_layoutSelectUser.Size" type="System.Drawing.Size, System.Drawing"> <data name="_layoutSelectUser.Size" type="System.Drawing.Size, System.Drawing">
<value>442, 31</value> <value>442, 33</value>
</data> </data>
<data name="_layoutSelectUser.TabIndex" type="System.Int32, mscorlib"> <data name="_layoutSelectUser.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -307,16 +310,16 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="_layoutSelectUser.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> <data name="_layoutSelectUser.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelSelectUser" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonOpenUser" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="_layoutCenterGABLookup" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100,AutoSize,0" /&gt;&lt;Rows Styles="Percent,100,Absolute,31" /&gt;&lt;/TableLayoutSettings&gt;</value> <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelSelectUser" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="_layoutCenterGABLookup" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="buttonOpenUser" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100,AutoSize,0" /&gt;&lt;Rows Styles="Percent,100,Absolute,33" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data> </data>
<data name="kTreeFolders.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="kTreeFolders.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="kTreeFolders.Location" type="System.Drawing.Point, System.Drawing"> <data name="kTreeFolders.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 40</value> <value>3, 42</value>
</data> </data>
<data name="kTreeFolders.Size" type="System.Drawing.Size, System.Drawing"> <data name="kTreeFolders.Size" type="System.Drawing.Size, System.Drawing">
<value>442, 275</value> <value>442, 273</value>
</data> </data>
<data name="kTreeFolders.TabIndex" type="System.Int32, mscorlib"> <data name="kTreeFolders.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -468,6 +471,72 @@
<data name="&gt;&gt;checkSendAs.ZOrder" xml:space="preserve"> <data name="&gt;&gt;checkSendAs.ZOrder" xml:space="preserve">
<value>3</value> <value>3</value>
</data> </data>
<data name="_labelReminders.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="_labelReminders.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="_labelReminders.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 53</value>
</data>
<data name="_labelReminders.Size" type="System.Drawing.Size, System.Drawing">
<value>82, 27</value>
</data>
<data name="_labelReminders.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="_labelReminders.Text" xml:space="preserve">
<value>Show reminders</value>
</data>
<data name="_labelReminders.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;_labelReminders.Name" xml:space="preserve">
<value>_labelReminders</value>
</data>
<data name="&gt;&gt;_labelReminders.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;_labelReminders.Parent" xml:space="preserve">
<value>_layoutOptions</value>
</data>
<data name="&gt;&gt;_labelReminders.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="checkReminders.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkReminders.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="checkReminders.Location" type="System.Drawing.Point, System.Drawing">
<value>94, 57</value>
</data>
<data name="checkReminders.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 4, 3, 3</value>
</data>
<data name="checkReminders.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 0, 3</value>
</data>
<data name="checkReminders.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 20</value>
</data>
<data name="checkReminders.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="&gt;&gt;checkReminders.Name" xml:space="preserve">
<value>checkReminders</value>
</data>
<data name="&gt;&gt;checkReminders.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;checkReminders.Parent" xml:space="preserve">
<value>_layoutOptions</value>
</data>
<data name="&gt;&gt;checkReminders.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="_labelPermissions.AutoSize" type="System.Boolean, mscorlib"> <data name="_labelPermissions.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
@ -502,7 +571,7 @@
<value>_layoutOptions</value> <value>_layoutOptions</value>
</data> </data>
<data name="&gt;&gt;_labelPermissions.ZOrder" xml:space="preserve"> <data name="&gt;&gt;_labelPermissions.ZOrder" xml:space="preserve">
<value>4</value> <value>6</value>
</data> </data>
<data name="labelPermissionsValue.AutoSize" type="System.Boolean, mscorlib"> <data name="labelPermissionsValue.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
@ -541,72 +610,6 @@
<value>_layoutOptions</value> <value>_layoutOptions</value>
</data> </data>
<data name="&gt;&gt;labelPermissionsValue.ZOrder" xml:space="preserve"> <data name="&gt;&gt;labelPermissionsValue.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="_labelReminders.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="_labelReminders.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="_labelReminders.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 53</value>
</data>
<data name="_labelReminders.Size" type="System.Drawing.Size, System.Drawing">
<value>82, 27</value>
</data>
<data name="_labelReminders.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="_labelReminders.Text" xml:space="preserve">
<value>Show reminders</value>
</data>
<data name="_labelReminders.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;_labelReminders.Name" xml:space="preserve">
<value>_labelReminders</value>
</data>
<data name="&gt;&gt;_labelReminders.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;_labelReminders.Parent" xml:space="preserve">
<value>_layoutOptions</value>
</data>
<data name="&gt;&gt;_labelReminders.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="checkReminders.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkReminders.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="checkReminders.Location" type="System.Drawing.Point, System.Drawing">
<value>94, 57</value>
</data>
<data name="checkReminders.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 4, 3, 3</value>
</data>
<data name="checkReminders.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 3, 0, 3</value>
</data>
<data name="checkReminders.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 20</value>
</data>
<data name="checkReminders.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="&gt;&gt;checkReminders.Name" xml:space="preserve">
<value>checkReminders</value>
</data>
<data name="&gt;&gt;checkReminders.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;checkReminders.Parent" xml:space="preserve">
<value>_layoutOptions</value>
</data>
<data name="&gt;&gt;checkReminders.ZOrder" xml:space="preserve">
<value>7</value> <value>7</value>
</data> </data>
<data name="_layoutOptions.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="_layoutOptions.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -640,7 +643,7 @@
<value>2</value> <value>2</value>
</data> </data>
<data name="_layoutOptions.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> <data name="_layoutOptions.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="_labelName" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="textName" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="_labelSendAs" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="checkSendAs" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="_labelPermissions" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelPermissionsValue" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="_labelReminders" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="checkReminders" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value> <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="_labelName" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="textName" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="_labelSendAs" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="checkSendAs" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="_labelReminders" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="checkReminders" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="_labelPermissions" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelPermissionsValue" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data> </data>
<data name="_layoutMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="_layoutMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>

298
src/AcaciaZPushPlugin/AcaciaZPushPlugin/UI/GABLookupControl.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,
@ -31,8 +31,59 @@ using Acacia.Controls;
namespace Acacia.UI namespace Acacia.UI
{ {
public partial class GABLookupControl : KComboBox public partial class GABLookupControl : KComboBoxCustomDraw
{ {
private class GABDataSource : KDataSource<GABUser>
{
private readonly GABHandler _gab;
private readonly List<GABUser> _users;
public GABDataSource(GABHandler gab)
{
this._gab = gab;
_users = new List<GABUser>();
foreach (IItem item in _gab.Contacts.Items.Sort("FullName", false))
{
if (item is IContactItem)
_users.Add(new GABUser((IContactItem)item));
}
}
public override IEnumerable<GABUser> Items
{
get
{
return _users;
}
}
protected override string GetItemText(GABUser item)
{
// If there is a filter, try to complete that
if (!string.IsNullOrEmpty(Filter?.FilterText))
{
string s = Filter?.FilterText.ToLower();
if (item.UserName?.ToLower().StartsWith(s) == true)
return item.UserName;
else if (item.FullName?.ToLower().StartsWith(s) == true)
return item.FullName;
else if (item.EmailAddress?.ToLower().StartsWith(s) == true)
return item.EmailAddress;
}
return item.UserName;
}
protected override bool MatchesFilter(GABUser item)
{
string s = Filter.FilterText.ToLower();
return
item.FullName?.ToLower().StartsWith(s) == true ||
item.UserName?.ToLower().StartsWith(s) == true ||
item.EmailAddress?.ToLower().StartsWith(s) == true;
}
}
public GABLookupControl() : this(null) public GABLookupControl() : this(null)
{ {
} }
@ -40,7 +91,7 @@ namespace Acacia.UI
public GABLookupControl(GABHandler gab) public GABLookupControl(GABHandler gab)
{ {
InitializeComponent(); InitializeComponent();
this.GAB = gab; GAB = gab;
} }
#region Properties and events #region Properties and events
@ -64,40 +115,31 @@ namespace Acacia.UI
[Category("Behavior")] [Category("Behavior")]
public event SelectedUserEventHandler SelectedUserChanged; public event SelectedUserEventHandler SelectedUserChanged;
private GABUser _selectedUser;
public GABUser SelectedUser public GABUser SelectedUser
{ {
get get
{ {
/*if (SelectedValue == null) return _selectedUser;
return new GABUser(Text, Text);
else
return (GABUser)SelectedValue;*/
return null;
} }
set set
{ {
/*if (value == null) _selectedUser = null;
{ Select(value);
SelectedIndex = -1;
Text = "";
}
else
{
}*/
} }
} }
private void SetSelectedUser(GABUser user, bool isChosen) protected override void OnTextChanged(EventArgs e)
{ {
if (SelectedUser != user || isChosen) base.OnTextChanged(e);
{ _selectedUser = string.IsNullOrEmpty(Text) ? null : new GABUser(Text);
System.Diagnostics.Trace.WriteLine(string.Format("SELECT: {0} -> {1} : {2}", SelectedUser, user, isChosen)); SelectedUserChanged?.Invoke(this, new SelectedUserEventArgs(_selectedUser, false));
if (isChosen)
SelectedUser = user;
if (SelectedUserChanged != null)
SelectedUserChanged(this, new SelectedUserEventArgs(user, isChosen));
} }
protected override void OnSelectedItemChanged()
{
_selectedUser = (GABUser)SelectedItem?.Item;
SelectedUserChanged?.Invoke(this, new SelectedUserEventArgs(_selectedUser, true));
} }
#endregion #endregion
@ -117,7 +159,7 @@ namespace Acacia.UI
if (_gab != value) if (_gab != value)
{ {
_gab = value; _gab = value;
LookupUsers(false); DataSource = _gab == null ? null : new GABDataSource(_gab);
} }
} }
} }
@ -126,147 +168,20 @@ namespace Acacia.UI
#endregion #endregion
protected override void OnTextChanged(EventArgs e)
{
LookupUsers(true);
SelectCurrentUser(false);
}
private void SelectCurrentUser(bool isChosen)
{
/*GABUser user = null;
// Select whatever is currently in the text box as a user
if (DataSource != null)
{
// Find if there's a user matching
user = ((List<GABUser>)DataSource).FirstOrDefault((u) => u.DisplayName == Text);
}
if (user == null && Text.Length > 0)
{
// Make a new one
user = new GABUser(Text, Text);
}
SetSelectedUser(user, isChosen);*/
}
/*private bool _needUpdate;
protected override void OnTextUpdate(EventArgs e)
{
_needUpdate = true;
}
protected override void OnSelectedIndexChanged(EventArgs e)
{
base.OnSelectedIndexChanged(e);
SetSelectedUser((GABUser)SelectedItem, true);
}
protected override void OnKeyDown(KeyEventArgs e)
{
base.OnKeyDown(e);
if (e.KeyCode == Keys.Enter)
{
SelectCurrentUser(true);
}
else
{
SetSelectedUser(null, false);
}
}
protected override void OnDataSourceChanged(EventArgs e)
{
// Suppress to prevent automatic selection
}*/
private string _lastText;
private List<GABUser> _allUsers;
private void LookupUsers(bool dropDown)
{
// Cannot lookup if there is no GAB
if (_gab == null)
return;
string text = this.Text;
// Only search if the text actually changed
if (_lastText != text)
{
// Limit search results if there is a filter, otherwise show everything
List<GABUser> users;
if (text.Length == 0)
{
// Cache the list of all users
if (_allUsers == null)
{
_allUsers = Lookup("", int.MaxValue);
}
users = _allUsers;
}
else
{
users = Lookup(text, 8);
}
// Sort the users if we have them
users.Sort();
_lastText = text;
// Setting the datasource will trigger a select if there is a match
BeginUpdate();
//DataSource = users;
//SetItemsCore(users);
if (dropDown && text.Length != 0)
DroppedDown = true;
//Cursor.Current = Cursors.Default;
//Text = _lastText;
//SelectionLength = 0;
//SelectionStart = _lastText.Length;
EndUpdate();
}
}
#region Lookup helpers
// TODO: these probably belong in GAB
public List<GABUser> Lookup(string text, int max)
{
// Begin GAB lookup, search on full name or username
using (ISearch<IContactItem> search = _gab.Contacts.Search<IContactItem>())
{
ISearchOperator oper = search.AddOperator(SearchOperator.Or);
oper.AddField("urn:schemas:contacts:cn").SetOperation(SearchOperation.Like, text + "%");
oper.AddField("urn:schemas:contacts:customerid").SetOperation(SearchOperation.Like, text + "%");
// Fetch the results up to the limit.
// TODO: make limit a property?
List<GABUser> users = new List<GABUser>();
foreach (IContactItem result in search.Search(max))
{
users.Add(new GABUser(result.FullName, result.CustomerID));
}
return users;
}
}
public GABUser LookupExact(string username) public GABUser LookupExact(string username)
{ {
if (_gab?.Contacts != null) string s = username.ToLower();
if (DataSource != null)
{ {
// Begin GAB lookup, search on full name or username foreach(GABUser user in DataSource.Items)
using (ISearch<IContactItem> search = _gab.Contacts.Search<IContactItem>())
{ {
search.AddField("urn:schemas:contacts:customerid").SetOperation(SearchOperation.Equal, username); if (
user.FullName?.ToLower().Equals(s) == true ||
// Fetch the result, if any. user.UserName?.ToLower().Equals(s) == true ||
List<GABUser> users = new List<GABUser>(); user.EmailAddress?.ToLower().Equals(s) == true
using (IContactItem result = search.SearchOne()) )
{ {
if (result != null) return user;
return new GABUser(result.FullName, result.CustomerID);
} }
} }
} }
@ -274,6 +189,65 @@ namespace Acacia.UI
return new GABUser(username); return new GABUser(username);
} }
#region Rendering
private static readonly Size NameSpacing = new Size(12, 4);
private static readonly Padding ItemPadding = new Padding(5);
private static readonly Padding BorderPadding = new Padding(2);
private const int BorderThickness = 1;
protected override void OnMeasureItem(MeasureItemEventArgs e)
{
GABUser item = (GABUser)e.Item;
Size nameSize = TextRenderer.MeasureText(e.Graphics, item.FullName, Font);
Size loginSize = TextRenderer.MeasureText(e.Graphics, item.UserName, Font);
Size emailSize = TextRenderer.MeasureText(e.Graphics, item.EmailAddress, Font);
e.ItemWidth = Math.Max(emailSize.Width, nameSize.Width + loginSize.Width + NameSpacing.Width) +
ItemPadding.Horizontal;
e.ItemHeight = emailSize.Height + Math.Max(nameSize.Height, loginSize.Height) +
ItemPadding.Vertical +
NameSpacing.Height +
BorderThickness + BorderPadding.Vertical;
}
protected override void OnDrawItem(DrawItemEventArgs e)
{
GABUser item = (GABUser)e.Item;
// Draw the background
e.DrawBackground();
// Get the sizes
Size nameSize = TextRenderer.MeasureText(e.Graphics, item.FullName, Font);
Size loginSize = TextRenderer.MeasureText(e.Graphics, item.UserName, Font);
Size emailSize = TextRenderer.MeasureText(e.Graphics, item.EmailAddress, Font);
// Draw the full name top-left
Point pt = e.Bounds.TopLeft();
pt.Y += ItemPadding.Top;
pt.X += ItemPadding.Left;
TextRenderer.DrawText(e.Graphics, item.FullName, Font, pt, e.ForeColor);
// Draw the username top-right
pt.X = e.Bounds.Right - loginSize.Width - ItemPadding.Right;
TextRenderer.DrawText(e.Graphics, item.UserName, Font, pt, e.ForeColor);
// Draw the email below
pt.Y += Math.Max(nameSize.Height, loginSize.Height) + NameSpacing.Height;
pt.X = e.Bounds.X + ItemPadding.Left;
TextRenderer.DrawText(e.Graphics, item.EmailAddress, Font, pt, e.ForeColor);
// Draw a separator line
if (e.Index < DisplayItemCount - 1)
{
int lineY = e.Bounds.Bottom - 1 - BorderThickness - BorderPadding.Bottom;
e.Graphics.DrawLine(Pens.LightGray, BorderPadding.Left, lineY, e.Bounds.Width - BorderPadding.Right, lineY);
}
}
#endregion #endregion
} }
} }

15
src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/GABUser.cs
View File

@ -1,4 +1,6 @@
/// Copyright 2016 Kopano b.v. 
using Acacia.Stubs;
/// Copyright 2016 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,
@ -13,7 +15,6 @@
/// along with this program.If not, see<http://www.gnu.org/licenses/>. /// along with this program.If not, see<http://www.gnu.org/licenses/>.
/// ///
/// Consult LICENSE file for details /// Consult LICENSE file for details
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -36,8 +37,9 @@ namespace Acacia.ZPush
public readonly string FullName; public readonly string FullName;
public readonly string UserName; public readonly string UserName;
public readonly string EmailAddress;
public GABUser(string displayName, string userName) private GABUser(string displayName, string userName)
{ {
this.FullName = displayName; this.FullName = displayName;
this.UserName = userName; this.UserName = userName;
@ -49,6 +51,13 @@ namespace Acacia.ZPush
this.UserName = userName; this.UserName = userName;
} }
public GABUser(IContactItem item)
{
this.FullName = item.FullName;
this.EmailAddress = item.Email1Address;
this.UserName = item.CustomerID;
}
public int CompareTo(GABUser other) public int CompareTo(GABUser other)
{ {
return FullName.CompareTo(other.FullName); return FullName.CompareTo(other.FullName);