From f43860c00f2ee8ce5ed97c32ee01c899ef34318d Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 3 Aug 2015 16:46:57 -0700 Subject: [PATCH] Don't take empty extensions. --- ApplicationView/MenuRow/MenuOptionFile.cs | 9 ++++++++- Library/PrintLibraryWidget.cs | 5 +++-- Library/Provider/LibraryProviderHistory.cs | 4 ++-- Library/Provider/LibraryProviderQueue.cs | 4 ++-- Library/Provider/LibraryProviderSqlite.cs | 4 ++-- PartPreviewWindow/View3D/View3DWidget.cs | 8 ++++---- Queue/OptionsMenu/ExportToFolderProcess.cs | 2 +- Queue/QueueDataWidget.cs | 6 +++--- StaticData/Icons/FileDialog/download_folder.png | Bin 514 -> 558 bytes StaticData/Translations/Master.txt | 9 +++++++++ Submodules/agg-sharp | 2 +- 11 files changed, 35 insertions(+), 18 deletions(-) diff --git a/ApplicationView/MenuRow/MenuOptionFile.cs b/ApplicationView/MenuRow/MenuOptionFile.cs index 092e63fa4..b675a06de 100644 --- a/ApplicationView/MenuRow/MenuOptionFile.cs +++ b/ApplicationView/MenuRow/MenuOptionFile.cs @@ -24,7 +24,8 @@ namespace MatterHackers.MatterControl return new TupleList> { {"Add Printer".Localize(), addPrinter_Click}, - {"Add File".Localize(), importFile_Click}, + {"Add File To Queue".Localize(), importFile_Click}, + {"Add Folder To Library".Localize(), addFolderToLibrar_Click}, {"------------------------", nothing_Click}, {"Exit".Localize(), exit_Click}, }; @@ -35,6 +36,12 @@ namespace MatterHackers.MatterControl return true; } + private bool addFolderToLibrar_Click() + { + //AddCollectionToLibrary(string collectionName); + return true; + } + private bool addPrinter_Click() { UiThread.RunOnIdle(ConnectionWindow.Show); diff --git a/Library/PrintLibraryWidget.cs b/Library/PrintLibraryWidget.cs index 5038c26e2..453f1e214 100644 --- a/Library/PrintLibraryWidget.cs +++ b/Library/PrintLibraryWidget.cs @@ -488,7 +488,7 @@ namespace MatterHackers.MatterControl.PrintLibrary foreach (string file in fileDropEventArgs.DroppedFiles) { string extension = Path.GetExtension(file).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)) || extension == ".GCODE" || extension == ".ZIP") { @@ -503,11 +503,12 @@ namespace MatterHackers.MatterControl.PrintLibrary foreach (string file in fileDropEventArgs.DroppedFiles) { string extension = Path.GetExtension(file).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)) || extension == ".GCODE" || extension == ".ZIP") { fileDropEventArgs.AcceptDrop = true; + break; } } base.OnDragOver(fileDropEventArgs); diff --git a/Library/Provider/LibraryProviderHistory.cs b/Library/Provider/LibraryProviderHistory.cs index a4cefc162..e33384438 100644 --- a/Library/Provider/LibraryProviderHistory.cs +++ b/Library/Provider/LibraryProviderHistory.cs @@ -245,7 +245,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id; printItem.Commit(); - if (MeshFileIo.ValidFileExtensions().Contains(extension)) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))) { List meshToConvertAndSave = MeshFileIo.Load(loadedFileName); @@ -322,7 +322,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider foreach (string loadedFileName in fileList) { string extension = Path.GetExtension(loadedFileName).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)) || extension == ".GCODE" || extension == ".ZIP") { diff --git a/Library/Provider/LibraryProviderQueue.cs b/Library/Provider/LibraryProviderQueue.cs index 5ac8c48d1..b9da3a08e 100644 --- a/Library/Provider/LibraryProviderQueue.cs +++ b/Library/Provider/LibraryProviderQueue.cs @@ -238,7 +238,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id; printItem.Commit(); - if (MeshFileIo.ValidFileExtensions().Contains(extension)) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))) { List meshToConvertAndSave = MeshFileIo.Load(loadedFileName); @@ -315,7 +315,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider foreach (string loadedFileName in fileList) { string extension = Path.GetExtension(loadedFileName).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)) || extension == ".GCODE" || extension == ".ZIP") { diff --git a/Library/Provider/LibraryProviderSqlite.cs b/Library/Provider/LibraryProviderSqlite.cs index 33a418f7d..77ad78301 100644 --- a/Library/Provider/LibraryProviderSqlite.cs +++ b/Library/Provider/LibraryProviderSqlite.cs @@ -377,7 +377,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id; printItem.Commit(); - if (MeshFileIo.ValidFileExtensions().Contains(extension)) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))) { List meshToConvertAndSave = MeshFileIo.Load(loadedFileName); @@ -454,7 +454,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider foreach (string loadedFileName in fileList) { string extension = Path.GetExtension(loadedFileName).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)) || extension == ".GCODE" || extension == ".ZIP") { diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index f5e4d9aeb..81bfe81b6 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -517,7 +517,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow foreach (string droppedFileName in fileDropEventArgs.DroppedFiles) { string extension = Path.GetExtension(droppedFileName).ToLower(); - if (ApplicationSettings.OpenDesignFileParams.Contains(extension)) + if (extension != "" && ApplicationSettings.OpenDesignFileParams.Contains(extension)) { pendingPartsToLoad.Add(droppedFileName); } @@ -547,7 +547,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow foreach (string file in fileDropEventArgs.DroppedFiles) { string extension = Path.GetExtension(file).ToLower(); - if (ApplicationSettings.OpenDesignFileParams.Contains(extension)) + if (extension != "" && ApplicationSettings.OpenDesignFileParams.Contains(extension)) { fileDropEventArgs.AcceptDrop = true; } @@ -563,7 +563,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow foreach (string file in fileDropEventArgs.DroppedFiles) { string extension = Path.GetExtension(file).ToLower(); - if (ApplicationSettings.OpenDesignFileParams.Contains(extension)) + if (extension != "" && ApplicationSettings.OpenDesignFileParams.Contains(extension)) { fileDropEventArgs.AcceptDrop = true; } @@ -1648,7 +1648,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { string loadedFileName = filesToLoadIncludingZips[i]; string extension = Path.GetExtension(loadedFileName).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension)) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))) { filesToLoad.Add(loadedFileName); } diff --git a/Queue/OptionsMenu/ExportToFolderProcess.cs b/Queue/OptionsMenu/ExportToFolderProcess.cs index 095d09f44..1a64de18e 100644 --- a/Queue/OptionsMenu/ExportToFolderProcess.cs +++ b/Queue/OptionsMenu/ExportToFolderProcess.cs @@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl.PrintQueue { PrintItemWrapper printItemWrapper = new PrintItemWrapper(part); string extension = Path.GetExtension(part.FileLocation).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension)) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))) { SlicingQueue.Instance.QueuePartForSlicing(printItemWrapper); printItemWrapper.SlicingDone += sliceItem_Done; diff --git a/Queue/QueueDataWidget.cs b/Queue/QueueDataWidget.cs index c6115393f..318c36c4b 100644 --- a/Queue/QueueDataWidget.cs +++ b/Queue/QueueDataWidget.cs @@ -344,7 +344,7 @@ namespace MatterHackers.MatterControl.PrintQueue foreach (string droppedFileName in fileDropEventArgs.DroppedFiles) { string extension = Path.GetExtension(droppedFileName).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)) || extension == ".GCODE") { QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(Path.GetFileNameWithoutExtension(droppedFileName), Path.GetFullPath(droppedFileName)))); @@ -376,7 +376,7 @@ namespace MatterHackers.MatterControl.PrintQueue foreach (string file in fileDropEventArgs.DroppedFiles) { string extension = Path.GetExtension(file).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)) || extension == ".GCODE" || extension == ".ZIP") { @@ -391,7 +391,7 @@ namespace MatterHackers.MatterControl.PrintQueue foreach (string file in fileDropEventArgs.DroppedFiles) { string extension = Path.GetExtension(file).ToUpper(); - if (MeshFileIo.ValidFileExtensions().Contains(extension) + if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)) || extension == ".GCODE" || extension == ".ZIP") { diff --git a/StaticData/Icons/FileDialog/download_folder.png b/StaticData/Icons/FileDialog/download_folder.png index 735b476ca16201b123e2db5043ba3604db85f3c7..d4c886a9bf904302e688f3f1ef7ecf4055a034eb 100644 GIT binary patch delta 495 zcmZo-S;sQLv;Kmoi(^Q|tv9pY<~AD$w7uUfc7s{H{gfH-(V0+6} z(Y(pg*vV```6Wfy4zGiGAK2e}UOU*&{h=U!--2qPtwlFAI20I|P|+dZpo$xD8Krz> zZDEq4t@nJTqK-YD@x{+}8$H_M`gnW1We?8>_`4Jp45vadNg zuYS3wrMd>=2fNG6^E}^5s;s>%$|20<)bZ-TgIkKr1v>PD{Dsn1YfW6*puy^*u5eDX z?QrL`uR5Ev7#st($vvHH`{tFmpgJ8vy@NxNz|$vkp8Ti#>Oe*&KSi)U~d zzL909XB1#y6cB1DxDtNo`3II3W(5W(o*lw4xGW9%me%jJ?ugdh+#7~t|Q>{N6)(n}cqj zWa7RHzWLo^-6|J8YyM8r*Sn%Fe*Rz~JfX=d#Wzp$Pzj{?Jwc delta 451 zcmZ3-(!?^svwn%Ei(^Q|tv9nS<{nlMXzRVoXydf2(Y#}`;~qzA$61_@d?w^P5Z&Y` zsVIF#+C+Lsd&x=-f71?`mj5ax+f;l0zI?ZX`HD}Fs2-O910y?Cw9c5z9*HoQetV)$OFJO0I zU~xF1Wbn%6pYjXqBj?nQ2;4jNd)2hOqn>j@I$00cd}rx7GIQyStC^oQ$}6lGSwQL; ikja+%Q~eCg3|8E~EC1B(%4T3-VDNPHb6Mw<&;$SvZoAh2 diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index d0edef43b..110bae555 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -3514,3 +3514,12 @@ Translated:Oops! You cannot restart while a print is active. English:Unable to restart Translated:Unable to restart +English:Add File To Queue +Translated:Add File To Queue + +English:Add Folder To Library +Translated:Add Folder To Library + +English:Using the above controls +Translated:Using the above controls + diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 84f7016a7..03f36b214 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 84f7016a79dcaec2965a74c7ad690e416d60082a +Subproject commit 03f36b214669cd2544119d1edee9df6fab49bc11