Skip to content

Commit

Permalink
minor code style fixing, updated version
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidegironi
davidegironi committed Jan 6, 2023
1 parent e612754 commit 42ff62f
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 56 deletions.
6 changes: 4 additions & 2 deletions AdvancedDataGridView/AdvancedDataGridView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ protected override void OnHandleDestroyed(EventArgs e)
/// <param name="e"></param>
protected override void OnDataSourceChanged(EventArgs e)
{
//dispose unactive menustrips
foreach (DataGridViewColumn column in Columns)
{
ColumnHeaderCell cell = column.HeaderCell as ColumnHeaderCell;
Expand All @@ -235,13 +236,14 @@ protected override void OnDataSourceChanged(EventArgs e)
}
_menuStripToDispose.Clear();

base.OnDataSourceChanged(e);

//update datatype for active menustrips
foreach (DataGridViewColumn column in Columns)
{
ColumnHeaderCell cell = column.HeaderCell as ColumnHeaderCell;
cell.MenuStrip.SetDataType(column.ValueType);
}

base.OnDataSourceChanged(e);
}
#endregion

Expand Down
Binary file modified AdvancedDataGridView/AdvancedDataGridView.csproj
View file
Binary file not shown.
116 changes: 63 additions & 53 deletions AdvancedDataGridView/MenuStrip.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,16 @@ public MenuStrip(Type dataType)
//initialize components
InitializeComponent();

//set type
SetDataType(dataType);

//set component translations
cancelSortMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVClearSort.ToString()];
cancelFilterMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVClearFilter.ToString()];
customFilterMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVAddCustomFilter.ToString()];
button_filter.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVButtonFilter.ToString()];
button_undofilter.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVButtonUndofilter.ToString()];

//set type
SetDataType(dataType);

//set default NOT IN logic
IsFilterNOTINLogicEnabled = false;

Expand Down Expand Up @@ -162,56 +162,6 @@ public MenuStrip(Type dataType)
_textFilterTextChangedTimer.Tick += new EventHandler(this.CheckTextFilterTextChangedTimer_Tick);
}

internal void SetDataType(Type dataType)
{
DataType = dataType;

//set components values
if (DataType == typeof(DateTime) || DataType == typeof(TimeSpan))
{
customFilterLastFiltersListMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVCustomFilter.ToString()];
sortASCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortDateTimeASC.ToString()];
sortDESCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortDateTimeDESC.ToString()];
sortASCMenuItem.Image = Properties.Resources.MenuStrip_OrderASCnum;
sortDESCMenuItem.Image = Properties.Resources.MenuStrip_OrderDESCnum;
}
else if (DataType == typeof(bool))
{
customFilterLastFiltersListMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVCustomFilter.ToString()];
sortASCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortBoolASC.ToString()];
sortDESCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortBoolDESC.ToString()];
sortASCMenuItem.Image = Properties.Resources.MenuStrip_OrderASCbool;
sortDESCMenuItem.Image = Properties.Resources.MenuStrip_OrderDESCbool;
}
else if (DataType == typeof(Int32) || DataType == typeof(Int64) || DataType == typeof(Int16) ||
DataType == typeof(UInt32) || DataType == typeof(UInt64) || DataType == typeof(UInt16) ||
DataType == typeof(Byte) || DataType == typeof(SByte) || DataType == typeof(Decimal) ||
DataType == typeof(Single) || DataType == typeof(Double))
{
customFilterLastFiltersListMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVCustomFilter.ToString()];
sortASCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortNumASC.ToString()];
sortDESCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortNumDESC.ToString()];
sortASCMenuItem.Image = Properties.Resources.MenuStrip_OrderASCnum;
sortDESCMenuItem.Image = Properties.Resources.MenuStrip_OrderDESCnum;
}
else
{
customFilterLastFiltersListMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVCustomFilter.ToString()];
sortASCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortTextASC.ToString()];
sortDESCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortTextDESC.ToString()];
sortASCMenuItem.Image = Properties.Resources.MenuStrip_OrderASCtxt;
sortDESCMenuItem.Image = Properties.Resources.MenuStrip_OrderDESCtxt;
}

//set check filter textbox
if (DataType == typeof(DateTime) || DataType == typeof(TimeSpan) || DataType == typeof(bool))
checkTextFilter.Enabled = false;

//set default compoents
customFilterLastFiltersListMenuItem.Enabled = DataType != typeof(bool);
customFilterLastFiltersListMenuItem.Checked = ActiveFilterType == FilterType.Custom;
}

/// <summary>
/// Closed event
/// </summary>
Expand Down Expand Up @@ -1887,6 +1837,66 @@ private void CancelSortMenuItem_MouseEnter(object sender, EventArgs e)
#endregion


#region datatype functions

/// <summary>
/// Update datatype
/// </summary>
/// <param name="dataType"></param>
internal void SetDataType(Type dataType)
{
// set current datatype
DataType = dataType;

//set components values
if (dataType == typeof(DateTime) || dataType == typeof(TimeSpan))
{
customFilterLastFiltersListMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVCustomFilter.ToString()];
sortASCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortDateTimeASC.ToString()];
sortDESCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortDateTimeDESC.ToString()];
sortASCMenuItem.Image = Properties.Resources.MenuStrip_OrderASCnum;
sortDESCMenuItem.Image = Properties.Resources.MenuStrip_OrderDESCnum;
}
else if (dataType == typeof(bool))
{
customFilterLastFiltersListMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVCustomFilter.ToString()];
sortASCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortBoolASC.ToString()];
sortDESCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortBoolDESC.ToString()];
sortASCMenuItem.Image = Properties.Resources.MenuStrip_OrderASCbool;
sortDESCMenuItem.Image = Properties.Resources.MenuStrip_OrderDESCbool;
}
else if (dataType == typeof(Int32) || dataType == typeof(Int64) || dataType == typeof(Int16) ||
dataType == typeof(UInt32) || dataType == typeof(UInt64) || dataType == typeof(UInt16) ||
dataType == typeof(Byte) || dataType == typeof(SByte) || dataType == typeof(Decimal) ||
dataType == typeof(Single) || dataType == typeof(Double))
{
customFilterLastFiltersListMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVCustomFilter.ToString()];
sortASCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortNumASC.ToString()];
sortDESCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortNumDESC.ToString()];
sortASCMenuItem.Image = Properties.Resources.MenuStrip_OrderASCnum;
sortDESCMenuItem.Image = Properties.Resources.MenuStrip_OrderDESCnum;
}
else
{
customFilterLastFiltersListMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVCustomFilter.ToString()];
sortASCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortTextASC.ToString()];
sortDESCMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVSortTextDESC.ToString()];
sortASCMenuItem.Image = Properties.Resources.MenuStrip_OrderASCtxt;
sortDESCMenuItem.Image = Properties.Resources.MenuStrip_OrderDESCtxt;
}

//set check filter textbox
if (dataType == typeof(DateTime) || dataType == typeof(TimeSpan) || dataType == typeof(bool))
checkTextFilter.Enabled = false;

//set default components
customFilterLastFiltersListMenuItem.Enabled = dataType != typeof(bool);
customFilterLastFiltersListMenuItem.Checked = ActiveFilterType == FilterType.Custom;
}

#endregion


#region resize methods

/// <summary>
Expand Down
Binary file modified AdvancedDataGridViewSample/AdvancedDataGridViewSample.csproj
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion _DevTools/AutoBuilder.config.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $solutionName = "AdvancedDataGridView"
$versionMajor = "1"
$versionMinor = "2"
$versionBuild = GetVersionBuild
$versionRevision = "8"
$versionRevision = "9"
#build version number
$version = GetVersion $versionMajor $versionMinor $versionBuild $versionRevision

Expand Down

0 comments on commit 42ff62f

Please sign in to comment.