Updated with latest Krypton

Nordlien · Jan 23, 2024 · 56a9570 · 56a9570
1 parent 1e26e73
commit 56a9570
Show file tree

Hide file tree

Showing 62 changed files with 1,143 additions and 1,136 deletions.
diff --git a/ApplicationAssociations/ApplicationAssociations.csproj b/ApplicationAssociations/ApplicationAssociations.csproj
@@ -70,7 +70,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.1" />
     <PackageReference Include="Microsoft.WindowsAPICodePack.Shell" Version="1.1.0" />
-    <PackageReference Include="NLog" Version="5.2.4" />
+    <PackageReference Include="NLog" Version="5.2.8" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PhotoTagsCommonComponets\PhotoTagsCommonComponets.csproj" />

diff --git a/DataGridViewGeneric/ClipboardUtility.cs b/DataGridViewGeneric/ClipboardUtility.cs
@@ -354,7 +354,7 @@ public static void CopyDataGridViewSelectedCellsToClipboard(DataGridView dataGri
             }
             catch (Exception ex)
             {
-                KryptonMessageBox.Show("Can't copy cells to clipboard. Reason:\r\n\r\n" + ex.Message, "Warning!", MessageBoxButtons.OK, KryptonMessageBoxIcon.Error, showCtrlCopy: true);
+                KryptonMessageBox.Show("Can't copy cells to clipboard. Reason:\r\n\r\n" + ex.Message, "Warning!", (KryptonMessageBoxButtons)MessageBoxButtons.OK, KryptonMessageBoxIcon.Error, showCtrlCopy: true);
             }
         }
         #endregion
@@ -666,7 +666,7 @@ public static void PasteDataGridViewSelectedCellsFromClipboard(
                     KryptonMessageBox.Show("Can't paste selection. Can only paste selection when have selected equal numbers of columns.\r\n" +
                         "Columns selected for copy: " + columnConentsCount + "\r\n" +
                         "Columns selected for paste: " + columnsSelected.Count,
-                        "Can't paste selected text", MessageBoxButtons.OK, KryptonMessageBoxIcon.Warning, showCtrlCopy: true);
+                        "Can't paste selected text", (KryptonMessageBoxButtons)MessageBoxButtons.OK, KryptonMessageBoxIcon.Warning, showCtrlCopy: true);
                     return;
                 }
 
@@ -720,7 +720,7 @@ public static void PasteDataGridViewSelectedCellsFromClipboard(
                     KryptonMessageBox.Show("Can't paste selection. Can only paste selection when have selected equal numbers of rows.\r\n" +
                         "Rows selected for copy: " + rowContents.Count + "\r\n" +
                         "Rows selected for paste: " + rowsSelected.Count,
-                        "Can't paste selected text", MessageBoxButtons.OK, KryptonMessageBoxIcon.Warning, showCtrlCopy: true);
+                        "Can't paste selected text", (KryptonMessageBoxButtons)MessageBoxButtons.OK, KryptonMessageBoxIcon.Warning, showCtrlCopy: true);
                     return;
                 }
 

diff --git a/DataGridViewGeneric/DataGridViewGeneric.csproj b/DataGridViewGeneric/DataGridViewGeneric.csproj
@@ -54,8 +54,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Krypton.Navigator" Version="70.22.11.312" />
-    <PackageReference Include="Krypton.Toolkit" Version="70.22.11.312" />
+    <PackageReference Include="Krypton.Navigator" Version="80.23.11.321" />
+    <PackageReference Include="Krypton.Toolkit" Version="80.23.11.321" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>

diff --git a/DataGridViewGeneric/DataGridViewGenericData.cs b/DataGridViewGeneric/DataGridViewGenericData.cs
@@ -26,7 +26,7 @@ public class DataGridViewGenericData
         public string DataGridViewName { get; set; } = "";
         public DataGridViewSize CellSize { get; set; } = DataGridViewSize.Medium;
         public int CellHeight { get; set; } = 24;
-        public KryptonPalette KryptonPalette { get; set; } = null;
+        public KryptonCustomPaletteBase KryptonCustomPaletteBase { get; set; } = null;
         public List<ColumnNameAndWidth> ColumnNameAndWidthsLarge { get; set; }
         public List<ColumnNameAndWidth> ColumnNameAndWidthsMedium { get; set; }
         public List<ColumnNameAndWidth> ColumnNameAndWidthsSmall { get; set; }

diff --git a/DataGridViewGeneric/DataGridViewHandler.cs b/DataGridViewGeneric/DataGridViewHandler.cs
@@ -43,140 +43,140 @@ public static bool IsFilenameEqual(string fullFileName1, string fullFileName2)
         public static Color ColorBackCellNormal(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlLightLight;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateNormal.DataCell.Back.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateNormal.DataCell.Back.Color1;
         }
 
 
         public static Color ColorTextCellNormal(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateNormal.DataCell.Content.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateNormal.DataCell.Content.Color1;
         }
         #endregion
 
         #region Color - Cell - Favorite
         public static Color ColorBackCellFavorite(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlLight;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateNormal.DataCell.Back.Color2;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateNormal.DataCell.Back.Color2;
         }
 
         public static Color ColorTextCellFavorite(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateNormal.DataCell.Content.Color2;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateNormal.DataCell.Content.Color2;
         }
         #endregion
 
         #region Color - Cell - ReadOnly
         public static Color ColorBackCellReadOnly(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.GradientInactiveCaption;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateDisabled.DataCell.Back.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateDisabled.DataCell.Back.Color1;
         }
 
         public static Color ColorTextCellReadOnly(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateDisabled.DataCell.Content.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateDisabled.DataCell.Content.Color1;
         }
         #endregion
 
         #region Color - Cell - Favorite - ReadOnly
         public static Color ColorBackCellFavoriteReadOnly(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.MenuHighlight;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateDisabled.DataCell.Back.Color2;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateDisabled.DataCell.Back.Color2;
         }
 
         public static Color ColorTextCellFavoriteReadOnly(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateDisabled.DataCell.Content.Color2;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateDisabled.DataCell.Content.Color2;
         }
         #endregion
 
         #region Color - Cell - Error
         public static Color ColorBackCellError(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return Color.FromArgb(255, 192, 192);
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom2.StateNormal.DataCell.Back.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom2.StateNormal.DataCell.Back.Color1;
         }
 
         public static Color ColorTextCellError(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom2.StateNormal.DataCell.Content.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom2.StateNormal.DataCell.Content.Color1;
         }
         #endregion
 
         #region Color - Cell - Image
         public static Color ColorBackCellImage(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return Color.White;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom3.StateNormal.DataCell.Back.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom3.StateNormal.DataCell.Back.Color1;
         }
 
         public static Color ColorTextCellImage(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom3.StateNormal.DataCell.Content.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom3.StateNormal.DataCell.Content.Color1;
         }
         #endregion
 
         #region Color - Header - Normal 
         public static Color ColorBackHeaderNormal(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.Control;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateCommon.HeaderColumn.Back.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateCommon.HeaderColumn.Back.Color1;
         }
 
         public static Color ColorTextHeaderNormal(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCommon.StateCommon.HeaderColumn.Content.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCommon.StateCommon.HeaderColumn.Content.Color1;
         }
         #endregion
 
         #region Color - Header - Warning
         public static Color ColorBackHeaderWarning(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return Color.Yellow;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom1.StateCommon.HeaderColumn.Back.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom1.StateCommon.HeaderColumn.Back.Color1;
         }
 
         public static Color ColorTextHeaderWarning(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom1.StateCommon.HeaderColumn.Content.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom1.StateCommon.HeaderColumn.Content.Color1;
         }
         #endregion
 
         #region Color - Header - Error
         public static Color ColorBackHeaderError(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return Color.Red;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom2.StateCommon.HeaderColumn.Back.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom2.StateCommon.HeaderColumn.Back.Color1;
         }
 
         public static Color ColorTextHeaderError(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom2.StateCommon.HeaderColumn.Content.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom2.StateCommon.HeaderColumn.Content.Color1;
         }
         #endregion
 
         #region Color - Header - Image
         public static Color ColorBackHeaderImage(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return Color.LightSteelBlue;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom3.StateCommon.HeaderColumn.Back.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom3.StateCommon.HeaderColumn.Back.Color1;
         }
 
         public static Color ColorTextHeaderImage(DataGridView dataGridView)
         {
             if (dataGridView == null || dataGridView.TopLeftHeaderCell.Tag == null) return SystemColors.ControlText;
-            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonPalette.GridStyles.GridCustom3.StateCommon.HeaderColumn.Content.Color1;
+            return ((DataGridViewGenericData)dataGridView.TopLeftHeaderCell.Tag).KryptonCustomPaletteBase.GridStyles.GridCustom3.StateCommon.HeaderColumn.Content.Color1;
         }
         #endregion
 
@@ -358,11 +358,11 @@ public static void DataGridViewInit(DataGridView dataGridView, bool allowUserToA
 
         #region DataGridViewInitGenericData
         private static void DataGridViewInitGenericData(
-            DataGridView dataGridView, KryptonPalette palette, string dataGridViewName, string topLeftHeaderCellName, DataGridViewSize cellSize, 
+            DataGridView dataGridView, KryptonCustomPaletteBase palette, string dataGridViewName, string topLeftHeaderCellName, DataGridViewSize cellSize, 
             List<ColumnNameAndWidth> columnNameAndWidthsLarge, List<ColumnNameAndWidth> columnNameAndWidthsMedium, List<ColumnNameAndWidth> columnNameAndWidthsSmall)
         {
             DataGridViewGenericData dataGridViewGenericData = new DataGridViewGenericData();
-            dataGridViewGenericData.KryptonPalette = palette;
+            dataGridViewGenericData.KryptonCustomPaletteBase = palette;
             dataGridViewGenericData.TopCellName = topLeftHeaderCellName;
             dataGridViewGenericData.DataGridViewName = dataGridViewName;
             dataGridViewGenericData.FavoriteList = FavouriteRead(CreateFavoriteFilename(dataGridViewGenericData.DataGridViewName));
@@ -393,12 +393,12 @@ private void DataGridViewInitEvents(DataGridView dataGridView)
         }
         #endregion
 
-        public DataGridViewHandler(DataGridView dataGridView, KryptonPalette palette, string dataGridViewName, string topLeftHeaderCellName,
+        public DataGridViewHandler(DataGridView dataGridView, KryptonCustomPaletteBase palette, string dataGridViewName, string topLeftHeaderCellName,
             DataGridViewSize cellSize, bool allowUserToAddRow) : this
             (dataGridView, palette, dataGridViewName, topLeftHeaderCellName, cellSize, null, null, null, allowUserToAddRow) {
         }
 
-        public DataGridViewHandler(DataGridView dataGridView, KryptonPalette palette, string dataGridViewName, string topLeftHeaderCellName, 
+        public DataGridViewHandler(DataGridView dataGridView, KryptonCustomPaletteBase palette, string dataGridViewName, string topLeftHeaderCellName, 
             DataGridViewSize cellSize, List<ColumnNameAndWidth> columnNameAndWidthsLarge, List<ColumnNameAndWidth> columnNameAndWidthsMedium, 
             List<ColumnNameAndWidth> columnNameAndWidthsSmall, bool allowUserToAddRow)
         {

diff --git a/ImageAndMovieFileExtentions/ImageAndMovieFileExtentionsUtility.cs b/ImageAndMovieFileExtentions/ImageAndMovieFileExtentionsUtility.cs
@@ -380,7 +380,7 @@ public static bool RotateVideo(string sourceFile, string outputFile, int rotateD
         //    catch (Exception ex)
         //    {
         //        Logger.Error(ex);
-        //        KryptonMessageBox.Show(ex.Message, "Syntax error...", MessageBoxButtons.OK, KryptonMessageBoxIcon.Error, showCtrlCopy: true);
+        //        KryptonMessageBox.Show(ex.Message, "Syntax error...", (KryptonMessageBoxButtons)MessageBoxButtons.OK, KryptonMessageBoxIcon.Error, showCtrlCopy: true);
         //    }
         //}
 
@@ -393,7 +393,7 @@ public static bool RotateVideo(string sourceFile, string outputFile, int rotateD
         //    catch (Exception ex)
         //    {
         //        Logger.Error(ex);
-        //        KryptonMessageBox.Show(ex.Message, "Syntax error...", MessageBoxButtons.OK, KryptonMessageBoxIcon.Error, showCtrlCopy: true);
+        //        KryptonMessageBox.Show(ex.Message, "Syntax error...", (KryptonMessageBoxButtons)MessageBoxButtons.OK, KryptonMessageBoxIcon.Error, showCtrlCopy: true);
         //    }
         //}
 

diff --git a/ImageListView/ImageListView.csproj b/ImageListView/ImageListView.csproj
@@ -75,9 +75,9 @@
     <EmbeddedResource Include="ImageListView.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Krypton.Toolkit" Version="70.22.11.312" />
+    <PackageReference Include="Krypton.Toolkit" Version="80.23.11.321" />
     <PackageReference Include="NLog">
-      <Version>5.2.4</Version>
+      <Version>5.2.8</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/IncludeFilesAlways/exiftool.exe b/IncludeFilesAlways/exiftool.exe
diff --git a/LocationNames/LocationNames.csproj b/LocationNames/LocationNames.csproj
@@ -59,7 +59,7 @@
   <ItemGroup>
     <PackageReference Include="Mono.Data.Sqlite" Version="1.0.61" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NLog" Version="5.2.4" />
+    <PackageReference Include="NLog" Version="5.2.8" />
     <PackageReference Include="Nominatim.API" Version="1.6.1" />
   </ItemGroup>
 </Project>