Update the layout of the YM dialogs a bit.

diff --git a/Cura/gui/tools/youmagineGui.py b/Cura/gui/tools/youmagineGui.py
index b68a9db0bd664c988110ee33fa313f1c5de4154a..f7d60ce885c9008d92196ac4cd610bb3c3a32b54 100644 (file)
--- a/Cura/gui/tools/youmagineGui.py
+++ b/Cura/gui/tools/youmagineGui.py
@@ -151,9 +151,9 @@ class workingIndicatorWindow(wx.Frame):
 
                self._panel._sizer = wx.GridBagSizer(2, 2)
                self._panel.SetSizer(self._panel._sizer)
-               self._panel._sizer.Add(self._indicatorBitmap, (0, 0))
-               self._panel._sizer.Add(self._statusText, (0, 1), flag=wx.ALIGN_CENTER_VERTICAL)
-               self._panel._sizer.Add(self._progress, (1, 0), span=(1,2), flag=wx.EXPAND)
+               self._panel._sizer.Add(self._indicatorBitmap, (0, 0), flag=wx.ALL, border=5)
+               self._panel._sizer.Add(self._statusText, (0, 1), flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL, border=5)
+               self._panel._sizer.Add(self._progress, (1, 0), span=(1,2), flag=wx.EXPAND|wx.ALL, border=5)
 
                self._busyState = 0
                self._busyTimer = wx.Timer(self)
@@ -197,7 +197,7 @@ class getAuthorizationWindow(wx.Frame):
                self._panel._sizer = wx.GridBagSizer(5, 5)
                self._panel.SetSizer(self._panel._sizer)
 
-               self._panel._sizer.Add(wx.StaticBitmap(self._panel, -1, wx.Bitmap(getPathForImage('youmagine-text.png'))), (0,0), span=(1,4), flag=wx.ALIGN_CENTRE | wx.ALL)
+               self._panel._sizer.Add(wx.StaticBitmap(self._panel, -1, wx.Bitmap(getPathForImage('youmagine-text.png'))), (0,0), span=(1,4), flag=wx.ALIGN_CENTRE | wx.ALL, border=5)
                self._panel._sizer.Add(wx.StaticText(self._panel, -1, 'To share your designs on YouMagine\nyou need an account on YouMagine.com\nand authorize Cura to access your account.'), (1, 1))
                self._panel._sizer.Add(self._requestButton, (2, 1), flag=wx.ALL)
                self._panel._sizer.Add(wx.StaticText(self._panel, -1, 'This will open a browser window where you can\nauthorize Cura to access your YouMagine account.\nYou can revoke access at any time\nfrom YouMagine.com'), (3, 1), flag=wx.ALL)
@@ -261,24 +261,24 @@ class newDesignWindow(wx.Frame):
                s = wx.GridBagSizer(5, 5)
                p.SetSizer(s)
 
-               s.Add(wx.StaticBitmap(p, -1, wx.Bitmap(getPathForImage('youmagine-text.png'))), (0,0), span=(1,6), flag=wx.ALIGN_CENTRE | wx.ALL)
-               s.Add(wx.StaticText(p, -1, 'Design name:'), (1, 1))
-               s.Add(self._designName, (1, 2), span=(1,2), flag=wx.EXPAND|wx.ALL)
-               s.Add(wx.StaticText(p, -1, 'Description:'), (2, 1))
-               s.Add(self._designDescription, (2, 2), span=(1,2), flag=wx.EXPAND|wx.ALL)
-               s.Add(wx.StaticText(p, -1, 'Category:'), (3, 1))
-               s.Add(self._category, (3, 2), span=(1,2), flag=wx.ALL)
-               s.Add(wx.StaticText(p, -1, 'License:'), (4, 1))
-               s.Add(self._designLicense, (4, 2), span=(1,2), flag=wx.ALL)
-               s.Add(wx.StaticLine(p, -1), (5,0), span=(1,6), flag=wx.EXPAND|wx.ALL)
-               s.Add(wx.StaticText(p, -1, 'Images:'), (6, 1))
-               s.Add(self._imageScroll, (6, 2), span=(1, 2), flag=wx.EXPAND|wx.ALL)
-               s.Add(wx.StaticLine(p, -1), (7,0), span=(1,6), flag=wx.EXPAND|wx.ALL)
-               s.Add(self._shareButton, (8, 2), flag=wx.ALL)
-               s.Add(self._publish, (8, 3), flag=wx.ALL|wx.ALIGN_CENTER_VERTICAL)
+               s.Add(wx.StaticBitmap(p, -1, wx.Bitmap(getPathForImage('youmagine-text.png'))), (0,0), span=(1,3), flag=wx.ALIGN_CENTRE | wx.ALL, border=5)
+               s.Add(wx.StaticText(p, -1, 'Design name:'), (1, 0), flag=wx.LEFT|wx.TOP, border=5)
+               s.Add(self._designName, (1, 1), span=(1,2), flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=5)
+               s.Add(wx.StaticText(p, -1, 'Description:'), (2, 0), flag=wx.LEFT|wx.TOP, border=5)
+               s.Add(self._designDescription, (2, 1), span=(1,2), flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=5)
+               s.Add(wx.StaticText(p, -1, 'Category:'), (3, 0), flag=wx.LEFT|wx.TOP, border=5)
+               s.Add(self._category, (3, 1), span=(1,2), flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=5)
+               s.Add(wx.StaticText(p, -1, 'License:'), (4, 0), flag=wx.LEFT|wx.TOP, border=5)
+               s.Add(self._designLicense, (4, 1), span=(1,2), flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=5)
+               s.Add(wx.StaticLine(p, -1), (5,0), span=(1,3), flag=wx.EXPAND|wx.ALL)
+               s.Add(wx.StaticText(p, -1, 'Images:'), (6, 0), flag=wx.LEFT|wx.TOP, border=5)
+               s.Add(self._imageScroll, (6, 1), span=(1, 2), flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=5)
+               s.Add(wx.StaticLine(p, -1), (7,0), span=(1,3), flag=wx.EXPAND|wx.ALL)
+               s.Add(self._shareButton, (8, 1), flag=wx.BOTTOM, border=15)
+               s.Add(self._publish, (8, 2), flag=wx.BOTTOM|wx.ALIGN_CENTER_VERTICAL, border=15)
 
                s.AddGrowableRow(2)
-               s.AddGrowableCol(3)
+               s.AddGrowableCol(2)
 
                self.Bind(wx.EVT_BUTTON, self.OnShare, self._shareButton)
                self.Bind(wx.EVT_BUTTON, self.OnAddImage, self._addImageButton)