Download as
Browse Code »

Commit 6d45778d5062ed4d898d53602247ab354d66ad0a

Authored by Thiago Franco de Moraes
1 parent 63ae5129
Exists in ffill_gui

Added ok and cancel buttons

Showing 1 changed file with 46 additions and 33 deletions   Show diff stats
invesalius/gui/dialogs.py
  Diff comments   View file @6d45778
@@ -1920,8 +1920,8 @@ class FFillOptionsDialog(wx.Dialog): @@ -1920,8 +1920,8 @@ class FFillOptionsDialog(wx.Dialog):
1920 """ 1920 """
1921 Create the widgets. 1921 Create the widgets.
1922 """ 1922 """
1923 - # Target  
1924 1923
  1924 + # Target
1925 if sys.platform == "win32": 1925 if sys.platform == "win32":
1926 border_style = wx.SIMPLE_BORDER 1926 border_style = wx.SIMPLE_BORDER
1927 else: 1927 else:
@@ -2042,43 +2042,56 @@ class SelectPartsOptionsDialog(wx.Dialog): @@ -2042,43 +2042,56 @@ class SelectPartsOptionsDialog(wx.Dialog):
2042 else: 2042 else:
2043 self.conect3D_6.SetValue(1) 2043 self.conect3D_6.SetValue(1)
2044 2044
2045 - sizer_t = wx.BoxSizer(wx.HORIZONTAL)  
2046 - sizer_t.AddSpacer(7)  
2047 - sizer_t.Add(wx.StaticText(self, -1, _(u"Target mask name")), 1, wx.ALIGN_CENTRE_VERTICAL)  
2048 - sizer_t.AddSpacer(7)  
2049 - sizer_t.Add(self.target_name, 1, wx.EXPAND)  
2050 - sizer_t.AddSpacer(7)  
2051 -  
2052 - sizer_c = wx.BoxSizer(wx.HORIZONTAL)  
2053 - sizer_c.AddSpacer(7)  
2054 - sizer_c.Add(self.conect3D_6)  
2055 - sizer_c.AddSpacer(7)  
2056 - sizer_c.Add(self.conect3D_18)  
2057 - sizer_c.AddSpacer(7)  
2058 - sizer_c.Add(self.conect3D_26) 2045 + self.btn_ok = wx.Button(self, wx.ID_OK)
  2046 + self.btn_cancel = wx.Button(self, wx.ID_CANCEL)
  2047 +
  2048 + # sizer_t = wx.BoxSizer(wx.HORIZONTAL)
  2049 + # sizer_t.AddSpacer(7)
  2050 + # sizer_t.Add(wx.StaticText(self, -1, _(u"Target mask name")), 1, wx.ALIGN_CENTRE_VERTICAL)
  2051 + # sizer_t.AddSpacer(7)
  2052 + # sizer_t.Add(self.target_name, 1, wx.EXPAND)
  2053 + # sizer_t.AddSpacer(7)
  2054 +
  2055 + # sizer_c = wx.BoxSizer(wx.HORIZONTAL)
  2056 + # sizer_c.AddSpacer(7)
  2057 + # sizer_c.Add(self.conect3D_6)
  2058 + # sizer_c.AddSpacer(7)
  2059 + # sizer_c.Add(self.conect3D_18)
  2060 + # sizer_c.AddSpacer(7)
  2061 + # sizer_c.Add(self.conect3D_26)
  2062 +
  2063 + # sizer = wx.BoxSizer(wx.VERTICAL)
  2064 + # sizer.AddSpacer(7)
  2065 + # sizer.Add(sizer_t, 1, wx.EXPAND)
  2066 + # sizer.AddSpacer(7)
  2067 + # sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), 0, wx.LEFT, 7)
  2068 + # sizer.AddSpacer(5)
  2069 + # sizer.Add(sizer_c)
  2070 + # sizer.AddSpacer(7)
2059 2071
2060 - sizer = wx.BoxSizer(wx.VERTICAL)  
2061 - sizer.AddSpacer(7)  
2062 - sizer.Add(sizer_t, 1, wx.EXPAND)  
2063 - sizer.AddSpacer(7)  
2064 - sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), 0, wx.LEFT, 7)  
2065 - sizer.AddSpacer(5)  
2066 - sizer.Add(sizer_c)  
2067 - sizer.AddSpacer(7) 2072 + sizer = wx.GridBagSizer(5, 5)
  2073 +
  2074 + sizer.AddStretchSpacer((0, 0))
  2075 +
  2076 + sizer.Add(wx.StaticText(self, -1, _(u"Target mask name")), (1, 0), (1, 6), flag=wx.LEFT|wx.ALIGN_BOTTOM|wx.EXPAND, border=5)
  2077 + sizer.Add(self.target_name, (2, 0), (1, 6), flag=wx.LEFT|wx.EXPAND|wx.RIGHT|wx.ALIGN_TOP, border=9)
  2078 +
  2079 + sizer.AddStretchSpacer((3, 0))
  2080 +
  2081 + sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), (4, 0), (1, 6), flag=wx.LEFT, border=5)
  2082 + sizer.Add(self.conect3D_6, (5, 0), flag=wx.LEFT, border=9)
  2083 + sizer.Add(self.conect3D_18, (5, 1), flag=wx.LEFT, border=9)
  2084 + sizer.Add(self.conect3D_26, (5, 2), flag=wx.LEFT, border=9)
2068 2085
2069 - # sizer = wx.GridBagSizer(11, 6)  
2070 - # sizer.AddStretchSpacer((0, 0)) 2086 + sizer.AddStretchSpacer((6, 0))
2071 2087
2072 - # sizer.Add(wx.StaticText(self, -1, _(u"Target mask name")), (1, 0), (1, 6), flag=wx.LEFT|wx.ALIGN_BOTTOM|wx.EXPAND, border=7)  
2073 - # sizer.Add(self.target_name, (2, 0), (1, 6), flag=wx.LEFT|wx.EXPAND|wx.RIGHT|wx.ALIGN_TOP, border=9) 2088 + btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
  2089 + btn_sizer.Add(self.btn_ok, 0, flag=wx.RIGHT|wx.ALIGN_RIGHT, border=5)
  2090 + btn_sizer.Add(self.btn_cancel, 0, flag=wx.RIGHT|wx.ALIGN_RIGHT, border=5)
2074 2091
2075 - # # sizer.AddStretchSpacer((3, 0)) 2092 + sizer.AddSizer(btn_sizer, (7, 0), (1, 6), flag=wx.EXPAND|wx.RIGHT|wx.LEFT|wx.ALIGN_RIGHT, border=5)
2076 2093
2077 - # sizer.Add(wx.StaticText(self, -1, _(u"3D Connectivity")), (3, 0), (1, 6), flag=wx.LEFT, border=7)  
2078 - # sizer.Add(self.conect3D_6, (4, 0), flag=wx.LEFT, border=9)  
2079 - # sizer.Add(self.conect3D_18, (4, 1), flag=wx.LEFT, border=9)  
2080 - # sizer.Add(self.conect3D_26, (4, 2), flag=wx.LEFT, border=9)  
2081 - # sizer.AddStretchSpacer((5, 0)) 2094 + sizer.AddStretchSpacer((8, 0))
2082 2095
2083 self.SetSizer(sizer) 2096 self.SetSizer(sizer)
2084 sizer.Fit(self) 2097 sizer.Fit(self)