Some small changes suggested by ErikDeBruijn

[cura.git] / Cura / gui / mainWindow.py

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 156f02078b579d5d801db38b8dcd024488a82b94..9321d653e9ec572943e9c714722d7e5258229210 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -92,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)
@@ -107,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():
@@ -143,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)
@@ -285,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:
@@ -309,6 +310,7 @@ class mainWindow(wx.Frame):
                prefDialog = preferencesDialog.preferencesDialog(self)
                prefDialog.Centre()
                prefDialog.Show()
+               wx.CallAfter(prefDialog.Show)
 
        def OnMachineSettings(self, e):
                prefDialog = preferencesDialog.machineSettingsDialog(self)
@@ -393,9 +395,9 @@ 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"))
+               i = self.machineMenu.Append(-1, _("Install default Marlin firmware..."))
                self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, i)
 
        def OnLoadProfile(self, e):
@@ -606,7 +608,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())