Merge pull request #6 from jwestfall69/mono-ui-fixes

Mono UI/Crash fixes

ROMVault2/DirCellDraw.cs

@@ -1,146 +0,0 @@
-/******************************************************
- *     ROMVault2 is written by Gordon J.              *
- *     Contact gordon@romvault.com                    *
- *     Copyright 2014                                 *
- ******************************************************/
-
-using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.Windows.Forms;
-using ROMVault2.RvDB;
-using ROMVault2.SupportedFiles;
-
-namespace ROMVault2
-{
-
-    public class RomCellDraw : DataGridViewImageCell
-    {
-        private readonly Color _bgCol;
-        private readonly string _bitmapName;
-
-        public RomCellDraw(string name,Color bgCol)
-        {
-            _bitmapName = name;
-            _bgCol = bgCol;
-
-        }
-
-        protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
-        {
-            graphics.FillRectangle(new SolidBrush(_bgCol), cellBounds);
-
-            Bitmap bm= rvImages.GetBitmap(_bitmapName);
-
-            if (bm != null)
-            {
-                graphics.DrawImage(bm, cellBounds.Left, cellBounds.Top, bm.Width,bm.Height);
-                bm.Dispose();
-            }
-
-            
-            else
-                Debug.WriteLine("Missing Graphic for " + _bitmapName);
-        }
-
-    }
-
-    public class DirCellDraw : DataGridViewImageCell
-    {
-        private readonly Color _bgCol;
-        private readonly RvDir _cellDir;
-
-        public DirCellDraw(RvDir cellDir, Color bgCol)
-        {
-            _cellDir = cellDir;
-            _bgCol = bgCol;
-        }
-
-        protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
-        {
-
-            graphics.FillRectangle(new SolidBrush(_bgCol), cellBounds);
-
-            string bitmapName;
-
-            switch (_cellDir.FileType)
-            {
-                case FileType.Zip:
-                    if (_cellDir.RepStatus == RepStatus.DirCorrect && _cellDir.ZipStatus==ZipStatus.TrrntZip)
-                        bitmapName = "ZipTZ";
-                    else
-                        bitmapName = "Zip" + _cellDir.RepStatus;
-                    break;
-                default:
-                    bitmapName = "Dir" + _cellDir.RepStatus;
-                    break;
-            }
-
-            Bitmap bm = rvImages.GetBitmap(bitmapName);
-
-            if (bm != null)
-            {
-                graphics.DrawImage(bm, cellBounds.Left + 10, cellBounds.Top, 21, 17);
-                bm.Dispose();
-            }
-            else
-                Debug.WriteLine("Missing Graphic for " + bitmapName);
-        }
-    }
-
-    public class DirCellStatusDraw : DataGridViewImageCell
-    {
-        private readonly RvDir _dir;
-        public DirCellStatusDraw(RvDir dir)
-        {
-            _dir = dir;
-        }
-
-        protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
-        {
-            Font drawFont = new Font("Arial", 9);
-            SolidBrush drawBrushBlack = new SolidBrush(Color.Black);
-            SolidBrush drawBrushWhite = new SolidBrush(Color.White);
-
-            graphics.FillRectangle(drawBrushWhite, cellBounds);
-
-            int gOff;
-            int columnIndex = 0;
-            for (int l = 0; l < RepairStatus.DisplayOrder.Length; l++)
-            {
-                if (l >= 13) columnIndex = l;
-
-                if (_dir.DirStatus.Get(RepairStatus.DisplayOrder[l]) <= 0) continue;
-
-                gOff = cellBounds.Left + FrmMain.GameGridColumnXPositions[columnIndex];
-                Bitmap bm = rvImages.GetBitmap(@"G_" + RepairStatus.DisplayOrder[l]);
-                if (bm != null)
-                {
-                    graphics.DrawImage(bm, gOff, cellBounds.Top, 21, 18);
-                    bm.Dispose();
-                }
-                else
-                    Debug.WriteLine("Missing Graphics for " + "G_" + RepairStatus.DisplayOrder[l]);
-
-                columnIndex++;
-            }
-
-            columnIndex = 0;
-            for (int l = 0; l < RepairStatus.DisplayOrder.Length; l++)
-            {
-                if (l >= 13)
-                    columnIndex = l;
-
-                if (_dir.DirStatus.Get(RepairStatus.DisplayOrder[l]) > 0)
-                {
-                    gOff = cellBounds.Left + FrmMain.GameGridColumnXPositions[columnIndex];
-                    graphics.DrawString(_dir.DirStatus.Get(RepairStatus.DisplayOrder[l]).ToString(CultureInfo.InvariantCulture), drawFont, drawBrushBlack, new PointF(gOff + 20, cellBounds.Top + 3));
-                    columnIndex++;
-                }
-            }
-            drawBrushBlack.Dispose();
-            drawBrushWhite.Dispose();
-            drawFont.Dispose();
-        }
-    }
-}

ROMVault2/FrmMain.Designer.cs

@@ -654,6 +654,7 @@
             this.GameGrid.ShowRowErrors = false;
             this.GameGrid.Size = new System.Drawing.Size(697, 267);
             this.GameGrid.TabIndex = 4;
+            this.GameGrid.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.GameGrid_CellFormatting);
             this.GameGrid.SelectionChanged += new System.EventHandler(this.GameGridSelectionChanged);
             this.GameGrid.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.GameGridMouseDoubleClick);
             this.GameGrid.MouseUp += new System.Windows.Forms.MouseEventHandler(this.GameGrid_MouseUp);
@@ -746,6 +747,7 @@
             this.RomGrid.ShowRowErrors = false;
             this.RomGrid.Size = new System.Drawing.Size(697, 315);
             this.RomGrid.TabIndex = 21;
+            this.RomGrid.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.RomGrid_CellFormatting);
             this.RomGrid.SelectionChanged += new System.EventHandler(this.RomGridSelectionChanged);
             this.RomGrid.MouseUp += new System.Windows.Forms.MouseEventHandler(this.RomGridMouseUp);
             // 

ROMVault2/FrmMain.cs

@@ -13,6 +13,7 @@ using ROMVault2.Properties;
 using ROMVault2.RVRef;
 using ROMVault2.RvDB;
 using ROMVault2.Utils;
+using ROMVault2.SupportedFiles;
 
 namespace ROMVault2
 {
@@ -583,6 +584,7 @@ namespace ROMVault2
 
             GameGridColumnXPositions = new int[(int)RepStatus.EndValue];
 
+            int rowCount = 0;
             for (int j = 0; j < tDir.ChildCount; j++)
             {
 
@@ -607,6 +609,8 @@ namespace ROMVault2
 
                 if (!show) continue;
 
+                rowCount++;
+
                 int columnIndex = 0;
                 for (int l = 0; l < RepairStatus.DisplayOrder.Length; l++)
                 {
@@ -620,6 +624,7 @@ namespace ROMVault2
                     columnIndex++;
                 }
             }
+            GameGrid.RowCount = rowCount;
 
             int t = 0;
             for (int l = 0; l < (int)RepStatus.EndValue; l++)
@@ -629,6 +634,7 @@ namespace ROMVault2
                 t += colWidth;
             }
 
+            int row = 0;
             for (int j = 0; j < tDir.ChildCount; j++)
             {
                 RvDir tChildDir = tDir.Child(j) as RvDir;
@@ -651,42 +657,10 @@ namespace ROMVault2
                 show = show || !(gCorrect || gMissing || gUnknown || gInToSort || gFixes);
 
                 if (!show) continue;
-
+               
-                Color bgCol = Color.FromArgb(255, 255, 255);
+                GameGrid.Rows[row].Selected = false;
-
+                GameGrid.Rows[row].Tag = tChildDir;
-
+                row++;
-                foreach (RepStatus t1 in RepairStatus.DisplayOrder)
-                {
-                    if (tDirStat.Get(t1) <= 0) continue;
-
-                    bgCol = _displayColor[(int)t1];
-                    break;
-                }
-
-
-                GameGrid.Rows.Add();
-                int iRow = GameGrid.Rows.Count - 1;
-
-                GameGrid.Rows[iRow].Selected = false;
-                GameGrid.Rows[iRow].Tag = tChildDir;
-
-                GameGrid.Rows[iRow].Cells[0].Style.BackColor = bgCol;
-                GameGrid.Rows[iRow].Cells[1].Style.BackColor = bgCol;
-                GameGrid.Rows[iRow].Cells[2].Style.BackColor = bgCol;
-
-                if (String.IsNullOrEmpty(tChildDir.FileName))
-                    GameGrid.Rows[iRow].Cells[1].Value = tChildDir.Name;
-                else
-                    GameGrid.Rows[iRow].Cells[1].Value = tChildDir.Name + " (Found: " + tChildDir.FileName + ")";
-
-                if (tChildDir.Game != null)
-                    GameGrid.Rows[iRow].Cells[2].Value = tChildDir.Game.GetData(RvGame.GameData.Description);
-
-                DirCellDraw tDirCellDraw = new DirCellDraw(tChildDir, bgCol);
-                GameGrid.Rows[iRow].Cells[0] = tDirCellDraw;
-
-                DirCellStatusDraw tCellStatusDraw = new DirCellStatusDraw(tChildDir);
-                GameGrid.Rows[iRow].Cells[3] = tCellStatusDraw;
             }
 
             _updatingGameGrid = false;
@@ -730,6 +704,135 @@ namespace ROMVault2
             }
         }
 
+        private void GameGrid_CellFormatting(object sender, System.Windows.Forms.DataGridViewCellFormattingEventArgs e)
+        {
+
+            if (_updatingGameGrid)
+                return;
+  
+            Rectangle cellBounds = GameGrid.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+            RvDir tRvDir = (ROMVault2.RvDB.RvDir)GameGrid.Rows[e.RowIndex].Tag;
+            ReportStatus tDirStat = tRvDir.DirStatus;
+            Color bgCol = Color.FromArgb(255, 255, 255);
+
+            if (cellBounds.Width == 0 || cellBounds.Height == 0)
+                return;
+
+            foreach (RepStatus t1 in RepairStatus.DisplayOrder)
+            {
+                if (tDirStat.Get(t1) <= 0) continue;
+
+                bgCol = _displayColor[(int)t1];
+                break;
+            }
+
+            if (GameGrid.Columns[e.ColumnIndex].Name == "Type")
+            {
+                e.CellStyle.BackColor = bgCol;
+                e.CellStyle.SelectionBackColor = bgCol;
+
+                Bitmap bmp = new Bitmap(cellBounds.Width, cellBounds.Height);
+                Graphics g = Graphics.FromImage(bmp);
+
+                string bitmapName;
+                switch (tRvDir.FileType)
+                {
+                    case FileType.Zip:
+                        if (tRvDir.RepStatus == RepStatus.DirCorrect && tRvDir.ZipStatus == ZipStatus.TrrntZip)
+                            bitmapName = "ZipTZ";
+                        else
+                            bitmapName = "Zip" + tRvDir.RepStatus;
+                        break;
+                    default:
+                        // hack because DirDirInToSort image doesnt exist.
+                        if (tRvDir.RepStatus ==  RepStatus.DirInToSort)
+                            bitmapName = "Dir" + RepStatus.DirUnknown;
+                        else
+                            bitmapName = "Dir" + tRvDir.RepStatus;
+
+                        break;
+                }
+
+                Bitmap bm = rvImages.GetBitmap(bitmapName);
+                if (bm != null)
+                {
+                    g.DrawImage(bm, (cellBounds.Width - cellBounds.Height) / 2, 0, 18, 18);
+                    bm.Dispose();
+                }
+                else
+                    Debug.WriteLine("Missing Graphic for " + bitmapName);
+
+                e.Value = bmp;
+
+            } 
+            else if (GameGrid.Columns[e.ColumnIndex].Name == "CGame")
+            {
+                e.CellStyle.BackColor = bgCol;
+
+                if (String.IsNullOrEmpty(tRvDir.FileName))
+                    e.Value = tRvDir.Name;
+                else
+                    e.Value = tRvDir.Name + " (Found: " + tRvDir.FileName + ")";
+            }
+            else if (GameGrid.Columns[e.ColumnIndex].Name == "CDescription")
+            {
+                e.CellStyle.BackColor = bgCol;
+
+                if (tRvDir.Game != null)
+                    e.Value = tRvDir.Game.GetData(RvGame.GameData.Description);
+            }
+            else if (GameGrid.Columns[e.ColumnIndex].Name == "CCorrect")
+            {
+                e.CellStyle.SelectionBackColor = Color.White;
+
+                Bitmap bmp = new Bitmap(cellBounds.Width, cellBounds.Height);
+                Graphics g = Graphics.FromImage(bmp);
+                g.Clear(Color.White);
+                g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
+                Font drawFont = new Font("Arial", 9);
+                SolidBrush drawBrushBlack = new SolidBrush(Color.Black);
+
+                int gOff;
+                int columnIndex = 0;
+                for (int l = 0; l < RepairStatus.DisplayOrder.Length; l++)
+                {
+                    if (l >= 13) columnIndex = l;
+
+                    if (tRvDir.DirStatus.Get(RepairStatus.DisplayOrder[l]) <= 0) continue;
+
+                    gOff = FrmMain.GameGridColumnXPositions[columnIndex];
+                    Bitmap bm = rvImages.GetBitmap(@"G_" + RepairStatus.DisplayOrder[l]);
+                    if (bm != null)
+                    {
+                        g.DrawImage(bm, gOff, 0, 21, 18);
+                        bm.Dispose();
+                    }
+                    else
+                        Debug.WriteLine("Missing Graphics for " + "G_" + RepairStatus.DisplayOrder[l]);
+
+                    columnIndex++;
+                }
+
+                columnIndex = 0;
+                for (int l = 0; l < RepairStatus.DisplayOrder.Length; l++)
+                {
+                    if (l >= 13)
+                        columnIndex = l;
+
+                    if (tRvDir.DirStatus.Get(RepairStatus.DisplayOrder[l]) > 0)
+                    {
+                        gOff = FrmMain.GameGridColumnXPositions[columnIndex];
+                        g.DrawString(tRvDir.DirStatus.Get(RepairStatus.DisplayOrder[l]).ToString(CultureInfo.InvariantCulture), drawFont, drawBrushBlack, new PointF(gOff + 20, 3));
+                        columnIndex++;
+                    }
+                }
+                drawBrushBlack.Dispose();
+                drawFont.Dispose();
+                e.Value = bmp;
+            }
+            else
+              Console.WriteLine("WARN: GameGrid_CellFormatting() unknown column: {0}", GameGrid.Columns[e.ColumnIndex].Name);
+        }
 
         #endregion
 
@@ -1085,11 +1188,7 @@ namespace ROMVault2
             {
                 RomGrid.Rows.Add();
                 int row = RomGrid.Rows.Count - 1;
-
+                RomGrid.Rows[row].Tag = tRomTable;
-                string imageName = "R_" + tRomTable.DatStatus + "_" + tRomTable.RepStatus;
-
-                RomCellDraw tDirCellDraw = new RomCellDraw(imageName, _displayColor[(int)tRomTable.RepStatus]);
-                RomGrid.Rows[row].Cells[0] = tDirCellDraw;
 
                 for (int i = 0; i < RomGrid.Rows[row].Cells.Count; i++)
                     RomGrid.Rows[row].Cells[i].Style.BackColor = _displayColor[(int)tRomTable.RepStatus];
@@ -1170,6 +1269,29 @@ namespace ROMVault2
                 }
             }
         }
+
+        private void RomGrid_CellFormatting(object sender, System.Windows.Forms.DataGridViewCellFormattingEventArgs e)
+        {
+
+            if (_updatingGameGrid)
+                return;
+
+            Rectangle cellBounds = RomGrid.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+            RvFile tRvFile = (ROMVault2.RvDB.RvFile)RomGrid.Rows[e.RowIndex].Tag;
+
+            if (cellBounds.Width == 0 || cellBounds.Height == 0)
+                return;
+
+            if (RomGrid.Columns[e.ColumnIndex].Name == "CGot")
+            {
+                Bitmap bmp = new Bitmap(cellBounds.Width, cellBounds.Height);
+                Graphics g = Graphics.FromImage(bmp);
+                string bitmapName = "R_" + tRvFile.DatStatus + "_" + tRvFile.RepStatus;
+                g.DrawImage(rvImages.GetBitmap(bitmapName), 0, 0, 54, 18);
+                e.Value = bmp;
+            }
+        }
+
         #endregion
 
         private void RomGridSelectionChanged(object sender, EventArgs e)

ROMVault2/IO/RVIO.cs

@@ -193,6 +193,7 @@ namespace ROMVault2.IO
                     {
                         Name = tDi.Name,
                         FullName = Path.Combine(FullName, tDi.Name),
+                        Length = tDi.Length,
                         LastWriteTime = tDi.LastWriteTimeUtc.Ticks
                     };
                     files.Add(lDi);

ROMVault2/ROMVault2.csproj

@@ -163,7 +163,6 @@
     <Compile Include="FrmSettings.Designer.cs">
       <DependentUpon>FrmSettings.cs</DependentUpon>
     </Compile>
-    <Compile Include="DirCellDraw.cs" />
     <Compile Include="FrmShowError.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -333,4 +332,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>