disabled RightToLeft in constructor, updated version

davidegironi · May 12, 2020 · c89e95d · c89e95d
1 parent d57b5e2
commit c89e95d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 26 deletions.
diff --git a/AdvancedDataGridView/AdvancedDataGridView.cs b/AdvancedDataGridView/AdvancedDataGridView.cs
@@ -179,7 +179,9 @@ public enum TranslationKey
         /// AdvancedDataGridView constructor
         /// </summary>
         public AdvancedDataGridView()
-        { }
+        {
+            RightToLeft = RightToLeft.No;
+        }
 
         #endregion
 

diff --git a/AdvancedDataGridView/MenuStrip.cs b/AdvancedDataGridView/MenuStrip.cs
@@ -81,11 +81,11 @@ public MenuStrip(Type dataType)
             InitializeComponent();
 
             //set component translations
-            this.cancelSortMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVClearSort.ToString()];
-            this.cancelFilterMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVClearFilter.ToString()];
-            this.customFilterMenuItem.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVAddCustomFilter.ToString()];
-            this.button_filter.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVButtonFilter.ToString()];
-            this.button_undofilter.Text = AdvancedDataGridView.Translations[AdvancedDataGridView.TranslationKey.ADGVButtonUndofilter.ToString()];
+            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
             DataType = dataType;
@@ -309,13 +309,11 @@ public bool DoesTextFilterRemoveNodesOnSearch
         /// <param name="enabled"></param>
         public void SetSortEnabled(bool enabled)
         {
-            if (!IsSortEnabled)
-                enabled = false;
-
-            this.cancelSortMenuItem.Enabled = enabled;
+            IsSortEnabled = enabled;
 
-            this.sortASCMenuItem.Enabled = enabled;
-            this.sortDESCMenuItem.Enabled = enabled;
+            sortASCMenuItem.Enabled = enabled;
+            sortDESCMenuItem.Enabled = enabled;
+            cancelSortMenuItem.Enabled = enabled;
         }
 
         /// <summary>
@@ -324,18 +322,14 @@ public void SetSortEnabled(bool enabled)
         /// <param name="enabled"></param>
         public void SetFilterEnabled(bool enabled)
         {
-            if (!IsFilterEnabled)
-                enabled = false;
+            IsFilterEnabled = enabled;
 
-            this.cancelFilterMenuItem.Enabled = enabled;
-            this.button_filter.Enabled = enabled;
-            this.button_undofilter.Enabled = enabled;
-            this.checkList.Enabled = enabled;
-            this.checkTextFilter.Enabled = enabled;
-            if (enabled)
-                customFilterLastFiltersListMenuItem.Enabled = DataType != typeof(bool);
-            else
-                customFilterLastFiltersListMenuItem.Enabled = false;
+            cancelFilterMenuItem.Enabled = enabled;
+            customFilterLastFiltersListMenuItem.Enabled = (enabled ? DataType != typeof(bool) : false);
+            button_filter.Enabled = enabled;
+            button_undofilter.Enabled = enabled;
+            checkList.Enabled = enabled;
+            checkTextFilter.Enabled = enabled;
         }
 
         /// <summary>
@@ -372,6 +366,7 @@ public void SetFilterCustomEnabled(bool enabled)
 
             IsFilterCustomEnabled = enabled;
             customFilterMenuItem.Enabled = enabled;
+            customFilterLastFiltersListMenuItem.Enabled = enabled;
 
             if (!IsFilterCustomEnabled)
             {

diff --git a/AdvancedDataGridView/Properties/AssemblyInfo.cs b/AdvancedDataGridView/Properties/AssemblyInfo.cs
diff --git a/AdvancedDataGridViewSample/FormMain.cs b/AdvancedDataGridViewSample/FormMain.cs
@@ -112,8 +112,8 @@ private void AddTestData()
             {
                 object[] newrow = new object[] {
                     i,
-                    (decimal)i*2/3,
-                    i % 2 == 0 ? (double)i*2/3 : (double)i/2,
+                    Math.Round((decimal)i*2/3, 6),
+                    Math.Round(i % 2 == 0 ? (double)i*2/3 : (double)i/2, 6),
                     DateTime.Today.AddHours(i*2).AddHours(i%2 == 0 ?i*10+1:0).AddMinutes(i%2 == 0 ?i*10+1:0).AddSeconds(i%2 == 0 ?i*10+1:0).AddMilliseconds(i%2 == 0 ?i*10+1:0).Date,
                     DateTime.Today.AddHours(i*2).AddHours(i%2 == 0 ?i*10+1:0).AddMinutes(i%2 == 0 ?i*10+1:0).AddSeconds(i%2 == 0 ?i*10+1:0).AddMilliseconds(i%2 == 0 ?i*10+1:0),
                     i*2 % 3 == 0 ? null : i.ToString()+" str",
@@ -141,6 +141,7 @@ private void FormMain_Load(object sender, EventArgs e)
             advancedDataGridView_main.SetTextFilterRemoveNodesOnSearch(advancedDataGridView_main.Columns["double"], false);
             advancedDataGridView_main.SetChecklistTextFilterRemoveNodesOnSearchMode(advancedDataGridView_main.Columns["decimal"], false);
             advancedDataGridView_main.SetFilterChecklistEnabled(advancedDataGridView_main.Columns["double"], false);
+            advancedDataGridView_main.SetFilterCustomEnabled(advancedDataGridView_main.Columns["timespan"], false);
         }
 
         private void advancedDataGridView_main_FilterStringChanged(object sender, Zuby.ADGV.AdvancedDataGridView.FilterEventArgs e)

diff --git a/AdvancedDataGridViewSample/Properties/AssemblyInfo.cs b/AdvancedDataGridViewSample/Properties/AssemblyInfo.cs
diff --git a/_DevTools/AutoBuilder.config.ps1 b/_DevTools/AutoBuilder.config.ps1
@@ -6,7 +6,7 @@ $solutionName = "AdvancedDataGridView"
 $versionMajor = "1"
 $versionMinor = "1"
 $versionBuild = GetVersionBuild
-$versionRevision = "6"
+$versionRevision = "7"
 #build version number
 $assemblyVersion = GetVersion $versionMajor $versionMinor $versionBuild $versionRevision
 $fileVersion = $assemblyVersion