Various fixes to improve button layout on MacOS.

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index 491d33255fd60539417fe26d9eeb35bb44077cc8..0539ae0dd09c870c37cf4e146254a7cb596f26ea 100644 (file)
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@ -64,12 +64,8 @@ class configWindowBase(wx.Frame):
                                self.popup.text.SetLabel(setting.helpText)
                        self.popup.text.Wrap(350)
                        self.popup.Fit()
-                       if sys.platform == 'darwin':
-                               x, y = self.ClientToScreenXY(0, 0)
-                               sx, sy = self.GetClientSizeTuple()
-                       else:
-                               x, y = setting.ctrl.ClientToScreenXY(0, 0)
-                               sx, sy = setting.ctrl.GetSizeTuple()
+                       x, y = setting.ctrl.ClientToScreenXY(0, 0)
+                       sx, sy = setting.ctrl.GetSizeTuple()
                        #if platform.system() == "Windows":
                        #       for some reason, under windows, the popup is relative to the main window... in some cases. (Wierd ass bug)
                        #       wx, wy = self.ClientToScreenXY(0, 0)
@@ -93,8 +89,8 @@ class TitleRow():
                x = sizer.GetRows()
                self.title = wx.StaticText(panel, -1, name)
                self.title.SetFont(wx.Font(wx.SystemSettings.GetFont(wx.SYS_ANSI_VAR_FONT).GetPointSize(), wx.FONTFAMILY_DEFAULT, wx.NORMAL, wx.FONTWEIGHT_BOLD))
-               sizer.Add(self.title, (x,0), (1,3), flag=wx.EXPAND|wx.TOP, border=10)
-               sizer.Add(wx.StaticLine(panel), (x+1,0), (1,3), flag=wx.EXPAND)
+               sizer.Add(self.title, (x,0), (1,3), flag=wx.EXPAND|wx.TOP|wx.LEFT, border=10)
+               sizer.Add(wx.StaticLine(panel), (x+1,0), (1,3), flag=wx.EXPAND|wx.LEFT,border=10)
                sizer.SetRows(x + 2)
 
 class SettingRow():
@@ -136,7 +132,7 @@ class SettingRow():
                        self.ctrl.Bind(wx.EVT_COMBOBOX, self.OnSettingChange)
                        flag = wx.EXPAND
 
-               sizer.Add(self.label, (x,y), flag=wx.ALIGN_CENTER_VERTICAL)
+               sizer.Add(self.label, (x,y), flag=wx.ALIGN_CENTER_VERTICAL|wx.LEFT,border=10)
                sizer.Add(self.ctrl, (x,y+1), flag=wx.ALIGN_BOTTOM|flag)
                sizer.SetRows(x+1)
 

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index ec8b53cb5e69bb2b1ecbd6cfaca2d9be189e2002..3da92975dca1a6ebafd037c57ca1e112cba457b4 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -238,15 +238,15 @@ class mainWindow(configBase.configWindowBase):
                sizer.Add(self.preview3d, (0,1), span=(1,2+extruderCount), flag=wx.EXPAND)
                sizer.AddGrowableCol(2 + extruderCount)
                sizer.AddGrowableRow(0)
-               sizer.Add(loadButton, (1,1), flag=wx.RIGHT, border=5)
+               sizer.Add(loadButton, (1,1), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
                if extruderCount > 1:
-                       sizer.Add(loadButton2, (1,2), flag=wx.RIGHT, border=5)
+                       sizer.Add(loadButton2, (1,2), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
                if extruderCount > 2:
-                       sizer.Add(loadButton3, (1,3), flag=wx.RIGHT, border=5)
+                       sizer.Add(loadButton3, (1,3), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
                if extruderCount > 3:
-                       sizer.Add(loadButton4, (1,4), flag=wx.RIGHT, border=5)
-               sizer.Add(sliceButton, (1,1+extruderCount), flag=wx.RIGHT, border=5)
-               sizer.Add(printButton, (1,2+extruderCount), flag=wx.RIGHT, border=5)
+                       sizer.Add(loadButton4, (1,4), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               sizer.Add(sliceButton, (1,1+extruderCount), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               sizer.Add(printButton, (1,2+extruderCount), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
                self.sizer = sizer
 
                if len(self.filelist) > 0:

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index 0909697d06c7afe48d9de115757181cfd5e12f63..d849af29f662637f2d1b8236e6ea97a659b1b20b 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -67,7 +67,7 @@ class preferencesDialog(configBase.configWindowBase):
                c = configBase.SettingRow(right, 'Copy to SD with 8.3 names', 'sdshortnames', False, 'Save the gcode files in short filenames, so they are properly shown on the UltiController', type = 'preference')\r
 \r
                self.okButton = wx.Button(right, -1, 'Ok')\r
-               right.GetSizer().Add(self.okButton, (right.GetSizer().GetRows(), 0))\r
+               right.GetSizer().Add(self.okButton, (right.GetSizer().GetRows(), 0), flag=wx.BOTTOM, border=5)\r
                self.okButton.Bind(wx.EVT_BUTTON, self.OnClose)\r
                \r
                self.MakeModal(True)\r

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 1f5dcf51916d3c0d69b6115b60c5837091d4b211..36926250c6d41940b4d3b658d8a7b3682927c8c4 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -44,7 +44,6 @@ class printProcessMonitor():
                                if platform.machine() == 'i386':
                                        cmdList.insert(0, 'arch')
                                        cmdList.insert(1, '-i386')
-                       print cmdList
                        self.handle = subprocess.Popen(cmdList, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                        self.thread = threading.Thread(target=self.Monitor)\r
                        self.thread.start()\r
@@ -301,7 +300,7 @@ class printWindow(wx.Frame):
                self.Centre()\r
                \r
                self.statsText.SetMinSize(self.statsText.GetSize())\r
-\r
+
                self.UpdateButtonStates()\r
                #self.UpdateProgress()\r
        \r

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 4a7470b71b4d4a37231ef4318b23781d876b92bc..faf7dd311fa61b3167464393244870c1bcb50eb8 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -116,9 +116,9 @@ class simpleModeWindow(configBase.configWindowBase):
                sizer.Add(self.preview3d, (0,1), span=(1,3), flag=wx.EXPAND)
                sizer.AddGrowableCol(2)
                sizer.AddGrowableRow(0)
-               sizer.Add(loadButton, (1,1), flag=wx.RIGHT, border=5)
-               sizer.Add(sliceButton, (1,2), flag=wx.RIGHT, border=5)
-               sizer.Add(printButton, (1,3), flag=wx.RIGHT, border=5)
+               sizer.Add(loadButton, (1,1), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               sizer.Add(sliceButton, (1,2), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               sizer.Add(printButton, (1,3), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
                self.sizer = sizer
 
                if len(self.filelist) > 0:
@@ -126,6 +126,9 @@ class simpleModeWindow(configBase.configWindowBase):
 
                self.updateProfileToControls()
 
+               self.printTypeNormal.SetValue(True)
+               self.printMaterialPLA.SetValue(True)
+
                self.Fit()
                self.SetMinSize(self.GetSize())
                self.Centre()

diff --git a/Cura/gui/toolbarUtil.py b/Cura/gui/toolbarUtil.py
index 64dc9840d6253cddd424b0963ae57331bcbfaaa8..ad7770a20c49dccfe574eb6827d945f296ca7da9 100644 (file)
--- a/Cura/gui/toolbarUtil.py
+++ b/Cura/gui/toolbarUtil.py
@@ -48,12 +48,8 @@ class Toolbar(wx.ToolBar):
                popup.text.SetLabel(control.helpText)
                popup.text.Wrap(350)
                popup.Fit();
-               if sys.platform == 'darwin':
-                       x, y = self.GetParent().ClientToScreenXY(0, 0)
-                       sx, sy = self.GetParent().GetClientSizeTuple()
-               else:
-                       x, y = control.ClientToScreenXY(0, 0)
-                       sx, sy = control.GetSizeTuple()
+               x, y = control.ClientToScreenXY(0, 0)
+               sx, sy = control.GetSizeTuple()
                popup.SetPosition((x, y+sy))
 
 class ToggleButton(buttons.GenBitmapToggleButton):