From bf147087d021439746046b29c2c6eceda6592797 Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Fri, 7 Aug 2015 16:27:46 -0400 Subject: [PATCH] Remove selectable print window and always use the new Advanced window --- Cura/gui/preferencesDialog.py | 6 ------ Cura/gui/sceneView.py | 12 +----------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py index 4ab701ef..29d2c8a3 100644 --- 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 360214d2..7c7136e6 100644 --- 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() -- 2.30.2