diff --git a/AboutPage/AboutPage.cs b/AboutPage/AboutPage.cs
index e9d8f7327..7489b881c 100644
--- a/AboutPage/AboutPage.cs
+++ b/AboutPage/AboutPage.cs
@@ -239,8 +239,6 @@ namespace MatterHackers.MatterControl
System.IO.File.Delete(friendlyFileName);
}
}
-
-
}
public void DownloadUpdate(object sender, MouseEventArgs e)
diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj
index 8e78452f8..05fe56a6b 100644
--- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj
+++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj
@@ -41,6 +41,7 @@
prompt
4
AllRules.ruleset
+ x86
True
@@ -49,6 +50,7 @@
prompt
4
AllRules.ruleset
+ x86
True
diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj
index cc7380825..f50028424 100644
--- a/Launcher/Launcher.csproj
+++ b/Launcher/Launcher.csproj
@@ -27,7 +27,7 @@
prompt
4
True
- AnyCPU
+ x86
pdbonly
@@ -36,7 +36,7 @@
prompt
4
True
- AnyCPU
+ x86
diff --git a/Localizations/Localizations.csproj b/Localizations/Localizations.csproj
index 1c8ecc458..d7a57a863 100644
--- a/Localizations/Localizations.csproj
+++ b/Localizations/Localizations.csproj
@@ -47,6 +47,7 @@
prompt
4
True
+ x86
none
@@ -56,6 +57,7 @@
prompt
4
True
+ x86
diff --git a/MatterControl.csproj b/MatterControl.csproj
index 987040741..8b7c33e8e 100644
--- a/MatterControl.csproj
+++ b/MatterControl.csproj
@@ -57,7 +57,7 @@
TRACE
prompt
4
- AnyCPU
+ x86
true
diff --git a/PluginSystem/MatterControlPluginSystem.csproj b/PluginSystem/MatterControlPluginSystem.csproj
index a800b225c..7b867c260 100644
--- a/PluginSystem/MatterControlPluginSystem.csproj
+++ b/PluginSystem/MatterControlPluginSystem.csproj
@@ -25,7 +25,7 @@
prompt
4
True
- AnyCPU
+ x86
pdbonly
@@ -35,7 +35,7 @@
prompt
4
True
- AnyCPU
+ x86
diff --git a/PrintQueue/BottomToolbar.cs b/PrintQueue/BottomToolbar.cs
index cdf83f8ff..c731d7c8e 100644
--- a/PrintQueue/BottomToolbar.cs
+++ b/PrintQueue/BottomToolbar.cs
@@ -1,20 +1,12 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
using System.IO;
-using System.Diagnostics;
-using System.Threading;
-
-using MatterHackers.Agg.Image;
-using MatterHackers.Agg.VertexSource;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
-using MatterHackers.VectorMath;
-using MatterHackers.MatterControl.DataStorage;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CreatorPlugins;
+using MatterHackers.MatterControl.DataStorage;
+using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.PrintQueue
{
@@ -51,23 +43,47 @@ namespace MatterHackers.MatterControl.PrintQueue
buttonPanel1.Padding = new BorderDouble(0, 3);
{
- Button addToQueueButton = textImageButtonFactory.Generate(LocalizedString.Get("Add"), "icon_circle_plus.png");
+ Button addToQueueButton = textImageButtonFactory.Generate(LocalizedString.Get("Add"), "icon_circle_plus.png");
buttonPanel1.AddChild(addToQueueButton);
addToQueueButton.Margin = new BorderDouble(0, 0, 3, 0);
addToQueueButton.Click += new ButtonBase.ButtonEventHandler(addToQueueButton_Click);
- Button runCreator = textImageButtonFactory.Generate(LocalizedString.Get("Create"), "icon_creator_white_32x32.png");
- buttonPanel1.AddChild(runCreator);
- runCreator.Margin = new BorderDouble(0, 0, 3, 0);
- runCreator.Click += (sender, e) =>
+ // put in the creator button
{
- OpenPluginChooserWindow();
- };
+ Button runCreator = textImageButtonFactory.Generate(LocalizedString.Get("Create"), "icon_creator_white_32x32.png");
+ buttonPanel1.AddChild(runCreator);
+ runCreator.Margin = new BorderDouble(0, 0, 3, 0);
+ runCreator.Click += (sender, e) =>
+ {
+ OpenPluginChooserWindow();
+ };
+ }
- Button deleteAllFromQueueButton = textImageButtonFactory.Generate(LocalizedString.Get("Remove All"));
+ // hack: put in a store button
+ {
+ Button runStore = textImageButtonFactory.Generate(LocalizedString.Get("Shop"), "icon_shopping_cart_32x32.png");
+ buttonPanel1.AddChild(runStore);
+ runStore.Margin = new BorderDouble(0, 0, 3, 0);
+ runStore.Click += (sender, e) =>
+ {
+ double activeFilamentDiameter = 0;
+ if(ActivePrinterProfile.Instance.ActivePrinter != null)
+ {
+ activeFilamentDiameter = 3;
+ if (ActiveSliceSettings.Instance.FilamentDiameter < 2)
+ {
+ activeFilamentDiameter = 1.75;
+ }
+ }
+
+ System.Diagnostics.Process.Start("http://www.matterhackers.com/mc/store/redirect?d={0}".FormatWith(activeFilamentDiameter));
+ };
+ }
+
+ Button deleteAllFromQueueButton = textImageButtonFactory.Generate(LocalizedString.Get("Remove All"));
deleteAllFromQueueButton.Margin = new BorderDouble(3, 0);
deleteAllFromQueueButton.Click += new ButtonBase.ButtonEventHandler(deleteAllFromQueueButton_Click);
- //buttonPanel1.AddChild(deleteAllFromQueueButton);
+ //buttonPanel1.AddChild(deleteAllFromQueueButton);
GuiWidget spacer1 = new GuiWidget();
spacer1.HAnchor = HAnchor.ParentLeftRight;
diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj
index a96c5a201..df65cc36c 100644
--- a/PrinterDriverInstaller/InfInstaller.csproj
+++ b/PrinterDriverInstaller/InfInstaller.csproj
@@ -27,7 +27,7 @@
prompt
4
True
- AnyCPU
+ x86
pdbonly
@@ -36,7 +36,7 @@
prompt
4
True
- AnyCPU
+ x86
diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt
index 3d5506a44..f91467e14 100644
--- a/StaticData/Translations/Master.txt
+++ b/StaticData/Translations/Master.txt
@@ -1980,3 +1980,6 @@ Translated:Unknown
English:Press 'Add' to select an item.
Translated:Press 'Add' to select an item.
+English:Shop
+Translated:Shop
+
diff --git a/StaticData/icon_shopping_cart_32x32.png b/StaticData/icon_shopping_cart_32x32.png
new file mode 100644
index 000000000..4edcdd33a
Binary files /dev/null and b/StaticData/icon_shopping_cart_32x32.png differ