Remove selectable print window and always use the new Advanced window

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index 4ab701eff01024890db659b516051f969ea73d47..29d2c8a306a01b513173e9f7aae5543feaf7e4ff 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -23,12 +23,6 @@ class preferencesDialog(wx.Dialog):
 
                left, right, main = self.panel.CreateConfigPanel(self)
 
-               printWindowTypes = ['Basic', 'Advanced']
-               for p in pluginInfo.getPluginList('printwindow'):
-                       printWindowTypes.append(p.getName())
-               configBase.TitleRow(left, _("Print window"))
-               configBase.SettingRow(left, 'printing_window', printWindowTypes)
-
                configBase.TitleRow(left, _("Colours"))
                configBase.SettingRow(left, 'model_colour', wx.Colour)
                for i in xrange(1, extruderCount):

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 360214d23a46c7146fbe50a9eac907efac29340d..7c7136e68f4952e70edeb2d71aaee4628f9b4176 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -349,17 +349,7 @@ class SceneView(openglGui.glGuiPanel):
 
        def _openPrintWindowForConnection(self, connection):
                if connection.window is None or not connection.window:
-                       connection.window = None
-                       windowType = profile.getPreference('printing_window')
-                       for p in pluginInfo.getPluginList('printwindow'):
-                               if p.getName() == windowType:
-                                       connection.window = printWindow.printWindowPlugin(self, connection, p.getFullFilename())
-                                       break
-                       if connection.window is None:
-                               if windowType == "Basic":
-                                       connection.window = printWindow.printWindowBasic(self, connection)
-                               else:
-                                       connection.window = printWindow.printWindowAdvanced(self, connection)
+                       connection.window = printWindow.printWindowAdvanced(self, connection)
 
                connection.window.Show()
                connection.window.Raise()