nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't take empty extensions.

Browse source
This commit is contained in:
Lars Brubaker 2015-08-03 16:46:57 -07:00
parent f8c1a7a8bc
commit f43860c00f
11 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ApplicationView/MenuRow/MenuOptionFile.cs
View file

@ -24,7 +24,8 @@ namespace MatterHackers.MatterControl
return new TupleList<string, Func<bool>> return new TupleList<string, Func<bool>>
{ {
{"Add Printer".Localize(), addPrinter_Click}, {"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}, {"------------------------", nothing_Click},
{"Exit".Localize(), exit_Click}, {"Exit".Localize(), exit_Click},
}; };
@ -35,6 +36,12 @@ namespace MatterHackers.MatterControl
return true; return true;
} }
private bool addFolderToLibrar_Click()
{
//AddCollectionToLibrary(string collectionName);
return true;
}
private bool addPrinter_Click() private bool addPrinter_Click()
{ {
UiThread.RunOnIdle(ConnectionWindow.Show); UiThread.RunOnIdle(ConnectionWindow.Show);

5
Library/PrintLibraryWidget.cs
View file

@ -488,7 +488,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
foreach (string file in fileDropEventArgs.DroppedFiles) foreach (string file in fileDropEventArgs.DroppedFiles)
{ {
string extension = Path.GetExtension(file).ToUpper(); string extension = Path.GetExtension(file).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE" || extension == ".GCODE"
|| extension == ".ZIP") || extension == ".ZIP")
{ {
@ -503,11 +503,12 @@ namespace MatterHackers.MatterControl.PrintLibrary
foreach (string file in fileDropEventArgs.DroppedFiles) foreach (string file in fileDropEventArgs.DroppedFiles)
{ {
string extension = Path.GetExtension(file).ToUpper(); string extension = Path.GetExtension(file).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE" || extension == ".GCODE"
|| extension == ".ZIP") || extension == ".ZIP")
{ {
fileDropEventArgs.AcceptDrop = true; fileDropEventArgs.AcceptDrop = true;
break;
} }
} }
base.OnDragOver(fileDropEventArgs); base.OnDragOver(fileDropEventArgs);

4
Library/Provider/LibraryProviderHistory.cs
View file

@ -245,7 +245,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id; printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id;
printItem.Commit(); printItem.Commit();
if (MeshFileIo.ValidFileExtensions().Contains(extension)) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)))
{ {
List<MeshGroup> meshToConvertAndSave = MeshFileIo.Load(loadedFileName); List<MeshGroup> meshToConvertAndSave = MeshFileIo.Load(loadedFileName);
@ -322,7 +322,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
foreach (string loadedFileName in fileList) foreach (string loadedFileName in fileList)
{ {
string extension = Path.GetExtension(loadedFileName).ToUpper(); string extension = Path.GetExtension(loadedFileName).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE" || extension == ".GCODE"
|| extension == ".ZIP") || extension == ".ZIP")
{ {

4
Library/Provider/LibraryProviderQueue.cs
View file

@ -238,7 +238,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id; printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id;
printItem.Commit(); printItem.Commit();
if (MeshFileIo.ValidFileExtensions().Contains(extension)) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)))
{ {
List<MeshGroup> meshToConvertAndSave = MeshFileIo.Load(loadedFileName); List<MeshGroup> meshToConvertAndSave = MeshFileIo.Load(loadedFileName);
@ -315,7 +315,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
foreach (string loadedFileName in fileList) foreach (string loadedFileName in fileList)
{ {
string extension = Path.GetExtension(loadedFileName).ToUpper(); string extension = Path.GetExtension(loadedFileName).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE" || extension == ".GCODE"
|| extension == ".ZIP") || extension == ".ZIP")
{ {

4
Library/Provider/LibraryProviderSqlite.cs
View file

@ -377,7 +377,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id; printItem.PrintItemCollectionID = libraryToAddTo.baseLibraryCollection.Id;
printItem.Commit(); printItem.Commit();
if (MeshFileIo.ValidFileExtensions().Contains(extension)) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)))
{ {
List<MeshGroup> meshToConvertAndSave = MeshFileIo.Load(loadedFileName); List<MeshGroup> meshToConvertAndSave = MeshFileIo.Load(loadedFileName);
@ -454,7 +454,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
foreach (string loadedFileName in fileList) foreach (string loadedFileName in fileList)
{ {
string extension = Path.GetExtension(loadedFileName).ToUpper(); string extension = Path.GetExtension(loadedFileName).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE" || extension == ".GCODE"
|| extension == ".ZIP") || extension == ".ZIP")
{ {

8
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -517,7 +517,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
foreach (string droppedFileName in fileDropEventArgs.DroppedFiles) foreach (string droppedFileName in fileDropEventArgs.DroppedFiles)
{ {
string extension = Path.GetExtension(droppedFileName).ToLower(); string extension = Path.GetExtension(droppedFileName).ToLower();
if (ApplicationSettings.OpenDesignFileParams.Contains(extension)) if (extension != "" && ApplicationSettings.OpenDesignFileParams.Contains(extension))
{ {
pendingPartsToLoad.Add(droppedFileName); pendingPartsToLoad.Add(droppedFileName);
} }
@ -547,7 +547,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
foreach (string file in fileDropEventArgs.DroppedFiles) foreach (string file in fileDropEventArgs.DroppedFiles)
{ {
string extension = Path.GetExtension(file).ToLower(); string extension = Path.GetExtension(file).ToLower();
if (ApplicationSettings.OpenDesignFileParams.Contains(extension)) if (extension != "" && ApplicationSettings.OpenDesignFileParams.Contains(extension))
{ {
fileDropEventArgs.AcceptDrop = true; fileDropEventArgs.AcceptDrop = true;
} }
@ -563,7 +563,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
foreach (string file in fileDropEventArgs.DroppedFiles) foreach (string file in fileDropEventArgs.DroppedFiles)
{ {
string extension = Path.GetExtension(file).ToLower(); string extension = Path.GetExtension(file).ToLower();
if (ApplicationSettings.OpenDesignFileParams.Contains(extension)) if (extension != "" && ApplicationSettings.OpenDesignFileParams.Contains(extension))
{ {
fileDropEventArgs.AcceptDrop = true; fileDropEventArgs.AcceptDrop = true;
} }
@ -1648,7 +1648,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{ {
string loadedFileName = filesToLoadIncludingZips[i]; string loadedFileName = filesToLoadIncludingZips[i];
string extension = Path.GetExtension(loadedFileName).ToUpper(); string extension = Path.GetExtension(loadedFileName).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension)) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)))
{ {
filesToLoad.Add(loadedFileName); filesToLoad.Add(loadedFileName);
} }

2
Queue/OptionsMenu/ExportToFolderProcess.cs
View file

@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl.PrintQueue
{ {
PrintItemWrapper printItemWrapper = new PrintItemWrapper(part); PrintItemWrapper printItemWrapper = new PrintItemWrapper(part);
string extension = Path.GetExtension(part.FileLocation).ToUpper(); string extension = Path.GetExtension(part.FileLocation).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension)) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension)))
{ {
SlicingQueue.Instance.QueuePartForSlicing(printItemWrapper); SlicingQueue.Instance.QueuePartForSlicing(printItemWrapper);
printItemWrapper.SlicingDone += sliceItem_Done; printItemWrapper.SlicingDone += sliceItem_Done;

6
Queue/QueueDataWidget.cs
View file

@ -344,7 +344,7 @@ namespace MatterHackers.MatterControl.PrintQueue
foreach (string droppedFileName in fileDropEventArgs.DroppedFiles) foreach (string droppedFileName in fileDropEventArgs.DroppedFiles)
{ {
string extension = Path.GetExtension(droppedFileName).ToUpper(); string extension = Path.GetExtension(droppedFileName).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE") || extension == ".GCODE")
{ {
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(Path.GetFileNameWithoutExtension(droppedFileName), Path.GetFullPath(droppedFileName)))); 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) foreach (string file in fileDropEventArgs.DroppedFiles)
{ {
string extension = Path.GetExtension(file).ToUpper(); string extension = Path.GetExtension(file).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE" || extension == ".GCODE"
|| extension == ".ZIP") || extension == ".ZIP")
{ {
@ -391,7 +391,7 @@ namespace MatterHackers.MatterControl.PrintQueue
foreach (string file in fileDropEventArgs.DroppedFiles) foreach (string file in fileDropEventArgs.DroppedFiles)
{ {
string extension = Path.GetExtension(file).ToUpper(); string extension = Path.GetExtension(file).ToUpper();
if (MeshFileIo.ValidFileExtensions().Contains(extension) if ((extension != "" && MeshFileIo.ValidFileExtensions().Contains(extension))
|| extension == ".GCODE" || extension == ".GCODE"
|| extension == ".ZIP") || extension == ".ZIP")
{ {

BIN
StaticData/Icons/FileDialog/download_folder.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 514 B

After

Width:  |  Height:  |  Size: 558 B

Before After
Before After

9
StaticData/Translations/Master.txt
View file

@ -3514,3 +3514,12 @@ Translated:Oops! You cannot restart while a print is active.
English:Unable to restart English:Unable to restart
Translated: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

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 84f7016a79dcaec2965a74c7ad690e416d60082a Subproject commit 03f36b214669cd2544119d1edee9df6fab49bc11