diff --git a/OpenNest/Forms/DrawingLibraryGridForm.cs b/OpenNest/Forms/DrawingLibraryGridForm.cs index 278c80cf..123f951c 100644 --- a/OpenNest/Forms/DrawingLibraryGridForm.cs +++ b/OpenNest/Forms/DrawingLibraryGridForm.cs @@ -14,7 +14,7 @@ using OpenNest.IO; namespace OpenNest.Forms { /// - /// File > Drawing Library Grid: a page of library drawings drawn side by side. Check All + /// A testing tool, on no menu: a page of library drawings drawn side by side. Check All /// Pages walks every page, timing each drawing's download, label search and paint, and lists /// the drawings that fail, run slow or would freeze a preview. The label search is timed /// without the paint's cell budget, on a worker with a time limit, so a shape the budget hides diff --git a/OpenNest/Forms/MainForm.Designer.cs b/OpenNest/Forms/MainForm.Designer.cs index 86920973..0c6331e7 100644 --- a/OpenNest/Forms/MainForm.Designer.cs +++ b/OpenNest/Forms/MainForm.Designer.cs @@ -42,7 +42,6 @@ namespace OpenNest.Forms mnuFileOpen = new System.Windows.Forms.ToolStripMenuItem(); mnuFileImportBom = new System.Windows.Forms.ToolStripMenuItem(); mnuFileDrawingLibrary = new System.Windows.Forms.ToolStripMenuItem(); - mnuFileDrawingLibraryGrid = new System.Windows.Forms.ToolStripMenuItem(); mnuFileDrawingSets = new System.Windows.Forms.ToolStripMenuItem(); mnuFileReleases = new System.Windows.Forms.ToolStripMenuItem(); toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); @@ -217,7 +216,7 @@ namespace OpenNest.Forms // // mnuFile // - mnuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { mnuFileNew, mnuFileOpen, mnuFileImportBom, mnuFileDrawingLibrary, mnuFileDrawingLibraryGrid, mnuFileDrawingSets, mnuFileReleases, toolStripMenuItem1, mnuFileSave, mnuFileSaveAs, toolStripMenuItem2, mnuFileExport, mnuFileExportAll, mnuFileExportNestReport, toolStripMenuItem3, mnuFileExit }); + mnuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { mnuFileNew, mnuFileOpen, mnuFileImportBom, mnuFileDrawingLibrary, mnuFileDrawingSets, mnuFileReleases, toolStripMenuItem1, mnuFileSave, mnuFileSaveAs, toolStripMenuItem2, mnuFileExport, mnuFileExportAll, mnuFileExportNestReport, toolStripMenuItem3, mnuFileExit }); mnuFile.Name = "mnuFile"; mnuFile.DropDownOpening += FileMenu_Opening; mnuFile.Size = new System.Drawing.Size(37, 20); @@ -255,13 +254,6 @@ namespace OpenNest.Forms mnuFileDrawingLibrary.Text = "Drawing Library..."; mnuFileDrawingLibrary.Click += FileDrawingLibrary_Click; // - // mnuFileDrawingLibraryGrid - // - mnuFileDrawingLibraryGrid.Name = "mnuFileDrawingLibraryGrid"; - mnuFileDrawingLibraryGrid.Size = new System.Drawing.Size(180, 22); - mnuFileDrawingLibraryGrid.Text = "Drawing Library Grid..."; - mnuFileDrawingLibraryGrid.Click += FileDrawingLibraryGrid_Click; - // // mnuFileDrawingSets // mnuFileDrawingSets.Name = "mnuFileDrawingSets"; @@ -1424,7 +1416,6 @@ namespace OpenNest.Forms private System.Windows.Forms.ToolStripMenuItem mnuFileOpen; private System.Windows.Forms.ToolStripMenuItem mnuFileImportBom; private System.Windows.Forms.ToolStripMenuItem mnuFileDrawingLibrary; - private System.Windows.Forms.ToolStripMenuItem mnuFileDrawingLibraryGrid; private System.Windows.Forms.ToolStripMenuItem mnuFileDrawingSets; private System.Windows.Forms.ToolStripMenuItem mnuFileReleases; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; diff --git a/OpenNest/Forms/MainForm.File.cs b/OpenNest/Forms/MainForm.File.cs index 4d001243..7858b22c 100644 --- a/OpenNest/Forms/MainForm.File.cs +++ b/OpenNest/Forms/MainForm.File.cs @@ -135,10 +135,6 @@ namespace OpenNest.Forms mnuFile.DropDown.ShowItemToolTips = true; mnuFileDrawingLibrary.Enabled = databaseMode; mnuFileDrawingLibrary.ToolTipText = databaseMode ? "" : NestStorage.DatabaseModeOnly; - mnuFileDrawingLibraryGrid.Enabled = databaseMode; - mnuFileDrawingLibraryGrid.ToolTipText = databaseMode - ? "Shows library drawings side by side; Check All Pages finds drawings that fail or freeze a preview." - : NestStorage.DatabaseModeOnly; mnuFileDrawingSets.Enabled = databaseMode; mnuFileDrawingSets.ToolTipText = databaseMode ? "" : NestStorage.DatabaseModeOnly; mnuFileReleases.Enabled = databaseMode; @@ -154,24 +150,6 @@ namespace OpenNest.Forms /// private void FileDrawingLibrary_Click(object sender, EventArgs e) => ShowDrawingSets(releases: false, libraryTab: true); - /// Opens the Drawing Library Grid, a window of its own like Drawing Sets. - private void FileDrawingLibraryGrid_Click(object sender, EventArgs e) - { - if (!NestStorage.Settings.IsDatabaseMode) - return; - IDrawingLibraryStore library; - try - { - library = NestStorage.CreateDrawingLibrary(); - } - catch (ArgumentException ex) - { - MessageBox.Show(this, ex.Message, "Drawing Library Grid", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - new DrawingLibraryGridForm(library, NestStorage.Settings.ServerUrl).Show(); - } - /// /// Browses, edits and releases drawing sets; needs no open nest, since a release /// creates or merges into nests and opens each in its own tab.