diff --git a/printrun/pronterface.py b/printrun/pronterface.py index b0607c62c..3e55dafe2 100644 --- a/printrun/pronterface.py +++ b/printrun/pronterface.py @@ -272,7 +272,7 @@ def reload_ui(self, *args): self.reset_ui() # Create UI - if self.settings.uimode in (_("Tabbed"), _("Tabbed with platers")): + if 0: #self.settings.uimode in (_("Tabbed"), _("Tabbed with platers")): #disable tabbed mode for now self.createTabbedGui() else: self.createGui(self.settings.uimode == _("Compact"), @@ -544,9 +544,9 @@ def plate_gcode(self, e): def platecb(self, name): self.log(_("Plated %s") % name) self.loadfile(None, name) - if self.settings.uimode in (_("Tabbed"), _("Tabbed with platers")): + #if self.settings.uimode in (_("Tabbed"), _("Tabbed with platers")): # Switch to page 1 (Status tab) - self.notebook.SetSelection(1) + # self.notebook.SetSelection(1) def do_editgcode(self, e = None): if self.filename is not None: @@ -859,7 +859,7 @@ def _add_settings(self, size): self.settings._add(BooleanSetting("clamp_jogging", False, _("Clamp manual moves"), _("Prevent manual moves from leaving the specified build dimensions"), "Printer")) self.settings._add(BooleanSetting("display_progress_on_printer", False, _("Display progress on printer"), _("Show progress on printers display (sent via M117, might not be supported by all printers)"), "Printer")) self.settings._add(SpinSetting("printer_progress_update_interval", 10., 0, 120, _("Printer progress update interval"), _("Interval in which pronterface sends the progress to the printer if enabled, in seconds"), "Printer")) - self.settings._add(ComboSetting("uimode", _("Standard"), [_("Standard"), _("Compact"), _("Tabbed"), _("Tabbed with platers")], _("Interface mode"), _("Standard interface is a one-page, three columns layout with controls/visualization/log\nCompact mode is a one-page, two columns layout with controls + log/visualization\nTabbed mode is a two-pages mode, where the first page shows controls and the second one shows visualization and log.\nTabbed with platers mode is the same as Tabbed, but with two extra pages for the STL and G-Code platers."), "UI"), self.reload_ui) + self.settings._add(ComboSetting("uimode", _("Standard"), [_("Standard"), _("Compact"), ], _("Interface mode"), _("Standard interface is a one-page, three columns layout with controls/visualization/log\nCompact mode is a one-page, two columns layout with controls + log/visualization"), "UI"), self.reload_ui) self.settings._add(ComboSetting("controlsmode", "Standard", ["Standard", "Mini"], _("Controls mode"), _("Standard controls include all controls needed for printer setup and calibration, while Mini controls are limited to the ones needed for daily printing"), "UI"), self.reload_ui) self.settings._add(BooleanSetting("slic3rintegration", False, _("Enable Slic3r integration"), _("Add a menu to select Slic3r profiles directly from Pronterface"), "UI"), self.reload_ui) self.settings._add(BooleanSetting("slic3rupdate", False, _("Update Slic3r default presets"), _("When selecting a profile in Slic3r integration menu, also save it as the default Slic3r preset"), "UI"))