chiark / gitweb /
Only enable the default firmware menu item when we have a default firmware for the...
[cura.git] / Cura / gui / mainWindow.py
index 971c19aa142d7aa830393625dfcefcaef5355456..6f11c1442fc926114d52eb35ee20c8134125cdea 100644 (file)
@@ -14,6 +14,7 @@ from Cura.gui import configWizard
 from Cura.gui import firmwareInstall
 from Cura.gui import simpleMode
 from Cura.gui import sceneView
+from Cura.gui import aboutWindow
 from Cura.gui.util import dropTarget
 #from Cura.gui.tools import batchRun
 from Cura.gui.tools import pidDebugger
@@ -91,14 +92,14 @@ class mainWindow(wx.Frame):
 
                # Model MRU list
                modelHistoryMenu = wx.Menu()
-               self.fileMenu.AppendMenu(wx.NewId(), _("&Recent Model Files"), modelHistoryMenu)
+               self.fileMenu.AppendMenu(wx.NewId(), '&' + _("Recent Model Files"), modelHistoryMenu)
                self.modelFileHistory.UseMenu(modelHistoryMenu)
                self.modelFileHistory.AddFilesToMenu()
                self.Bind(wx.EVT_MENU_RANGE, self.OnModelMRU, id=self.ID_MRU_MODEL1, id2=self.ID_MRU_MODEL10)
 
                # Profle MRU list
                profileHistoryMenu = wx.Menu()
-               self.fileMenu.AppendMenu(wx.NewId(), _("&Recent Profile Files"), profileHistoryMenu)
+               self.fileMenu.AppendMenu(wx.NewId(), _("Recent Profile Files"), profileHistoryMenu)
                self.profileFileHistory.UseMenu(profileHistoryMenu)
                self.profileFileHistory.AddFilesToMenu()
                self.Bind(wx.EVT_MENU_RANGE, self.OnProfileMRU, id=self.ID_MRU_PROFILE1, id2=self.ID_MRU_PROFILE10)
@@ -106,25 +107,15 @@ class mainWindow(wx.Frame):
                self.fileMenu.AppendSeparator()
                i = self.fileMenu.Append(wx.ID_EXIT, _("Quit"))
                self.Bind(wx.EVT_MENU, self.OnQuit, i)
-               self.menubar.Append(self.fileMenu, _("&File"))
+               self.menubar.Append(self.fileMenu, '&' + _("File"))
 
                toolsMenu = wx.Menu()
-
-               i = toolsMenu.Append(-1, _("Switch to quickprint..."))
-               self.switchToQuickprintMenuItem = i
-               self.Bind(wx.EVT_MENU, self.OnSimpleSwitch, i)
-
-               i = toolsMenu.Append(-1, _("Switch to full settings..."))
-               self.switchToNormalMenuItem = i
-               self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
-
-               #toolsMenu.AppendSeparator()
                #i = toolsMenu.Append(-1, 'Batch run...')
                #self.Bind(wx.EVT_MENU, self.OnBatchRun, i)
                #self.normalModeOnlyItems.append(i)
 
                if minecraftImport.hasMinecraft():
-                       i = toolsMenu.Append(-1, _("Minecraft import..."))
+                       i = toolsMenu.Append(-1, _("Minecraft map import..."))
                        self.Bind(wx.EVT_MENU, self.OnMinecraftImport, i)
 
                if version.isDevVersion():
@@ -142,6 +133,15 @@ class mainWindow(wx.Frame):
                self.menubar.Append(self.machineMenu, _("Machine"))
 
                expertMenu = wx.Menu()
+               i = expertMenu.Append(-1, _("Switch to quickprint..."), kind=wx.ITEM_RADIO)
+               self.switchToQuickprintMenuItem = i
+               self.Bind(wx.EVT_MENU, self.OnSimpleSwitch, i)
+
+               i = expertMenu.Append(-1, _("Switch to full settings..."), kind=wx.ITEM_RADIO)
+               self.switchToNormalMenuItem = i
+               self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
+               expertMenu.AppendSeparator()
+
                i = expertMenu.Append(-1, _("Open expert settings..."))
                self.normalModeOnlyItems.append(i)
                self.Bind(wx.EVT_MENU, self.OnExpertOpen, i)
@@ -284,8 +284,10 @@ class mainWindow(wx.Frame):
 
                for i in self.normalModeOnlyItems:
                        i.Enable(not isSimple)
-               self.switchToQuickprintMenuItem.Enable(not isSimple)
-               self.switchToNormalMenuItem.Enable(isSimple)
+               if isSimple:
+                       self.switchToQuickprintMenuItem.Check()
+               else:
+                       self.switchToNormalMenuItem.Check()
 
                # Set splitter sash position & size
                if isSimple:
@@ -302,12 +304,14 @@ class mainWindow(wx.Frame):
                        self.splitter.SetSashPosition(self.normalSashPos, True)
                        # Enabled sash
                        self.splitter.SetSashSize(4)
+               self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
                self.scene.updateProfileToControls()
 
        def OnPreferences(self, e):
                prefDialog = preferencesDialog.preferencesDialog(self)
                prefDialog.Centre()
                prefDialog.Show()
+               wx.CallAfter(prefDialog.Show)
 
        def OnMachineSettings(self, e):
                prefDialog = preferencesDialog.machineSettingsDialog(self)
@@ -392,9 +396,10 @@ class mainWindow(wx.Frame):
 
                #Add tools for machines.
                self.machineMenu.AppendSeparator()
-               i = self.machineMenu.Append(-1, _("Install custom firmware"))
+               i = self.machineMenu.Append(-1, _("Install custom firmware..."))
                self.Bind(wx.EVT_MENU, self.OnCustomFirmware, i)
-               i = self.machineMenu.Append(-1, _("Install default Marlin firmware"))
+
+               self.defaultFirmwareInstallMenuItem = self.machineMenu.Append(-1, _("Install default Marlin firmware..."))
                self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, i)
 
        def OnLoadProfile(self, e):
@@ -526,31 +531,9 @@ class mainWindow(wx.Frame):
                        wx.MessageBox(_("You are running the latest version of Cura!"), _("Awesome!"), wx.ICON_INFORMATION)
 
        def OnAbout(self, e):
-               info = wx.AboutDialogInfo()
-               info.SetName("Cura")
-               info.SetDescription("""
-End solution for Open Source Fused Filament Fabrication 3D printing.
-* Cura is the graphical User Interface.
-* CuraEngine is the slicer/gcode generator.
-Cura and the CuraEngine are licensed AGPLv3.
-               """)
-               info.SetWebSite('http://software.ultimaker.com/')
-               info.SetCopyright(_("Copyright (C) David Braam"))
-               info.SetLicence("""
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-""")
-               wx.AboutBox(info)
+               aboutBox = aboutWindow.aboutWindow()
+               aboutBox.Centre()
+               aboutBox.Show()
 
        def OnClose(self, e):
                profile.saveProfile(profile.getDefaultProfilePath())
@@ -600,10 +583,7 @@ class normalSettingsPanel(configBase.configPanelBase):
 
                #Plugin page
                self.pluginPanel = pluginPanel.pluginPanel(self.nb, callback)
-               if len(self.pluginPanel.pluginList) > 0:
-                       self.nb.AddPage(self.pluginPanel, _("Plugins"))
-               else:
-                       self.pluginPanel.Show(False)
+               self.nb.AddPage(self.pluginPanel, _("Plugins"))
 
                #Alteration page
                if profile.getMachineSetting('gcode_flavor') == 'UltiGCode':
@@ -627,7 +607,7 @@ class normalSettingsPanel(configBase.configPanelBase):
                        n += 1 + len(profile.getSettingsForCategory(category, title))
                        if n > count / 2:
                                p = right
-                       configBase.TitleRow(p, title)
+                       configBase.TitleRow(p, _(title))
                        for s in profile.getSettingsForCategory(category, title):
                                configBase.SettingRow(p, s.getName())