minor layout improvements

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@27 bbaffbd6-741e-11dd-a85d-61de82d9cad9

pycam/Gui/SimpleGui.py

@@ -281,11 +281,11 @@ class SimpleGui(Frame):
     def createWidgets(self):
         self.ogl = OpenglWidget(self, width=600, height=500)
 
-        self.TopFrame = Frame(self).pack(side=TOP, expand=1, fill=X)
+        self.TopFrame = Frame(self).pack(side=TOP, expand=0, fill=X)
 
         self.InputFileFrame = Frame(self.TopFrame)
-        self.InputFileFrame.pack(side=TOP, anchor=W, expand=1, fill=X)
-        Label(self.InputFileFrame, width=10, text="Input File: ").pack(side=LEFT, anchor=W)
+        self.InputFileFrame.pack(side=TOP, anchor=W, expand=0, fill=X)
+        Label(self.InputFileFrame, text="Input File: ").pack(side=LEFT, anchor=W)
         self.InputFileName = StringVar()
         Entry(self.InputFileFrame, textvariable=self.InputFileName).pack(side=LEFT, expand=1, fill=X)
         Button(self.InputFileFrame, text="Import...",command=self.browseOpen).pack(side=RIGHT)
@@ -299,7 +299,7 @@ class SimpleGui(Frame):
             Radiobutton(self.CutterFrame, text=cutter, variable=self.CutterName, value=cutter).pack(side=LEFT)
 
         self.PathGeneratorFrame = Frame(self.TopFrame)
-        self.PathGeneratorFrame.pack(side=TOP, anchor=W)
+        self.PathGeneratorFrame.pack(side=TOP, expand=0, anchor=W)
         Label(self.PathGeneratorFrame, text="PathGenerator: ").pack(side=LEFT)
         self.PathGeneratorName = StringVar()
         self.PathGeneratorName.set(PathGenerators.list[0])
@@ -307,7 +307,7 @@ class SimpleGui(Frame):
             Radiobutton(self.PathGeneratorFrame, text=PathGenerator, variable=self.PathGeneratorName, value=PathGenerator).pack(side=LEFT)
 
         self.PathProcessorFrame = Frame(self.TopFrame)
-        self.PathProcessorFrame.pack(side=TOP, anchor=W)
+        self.PathProcessorFrame.pack(side=TOP, expand=0, anchor=W)
         Label(self.PathProcessorFrame, text="Postprocessor: ").pack(side=LEFT)
         self.PathProcessorName = StringVar()
         self.PathProcessorName.set(PathProcessors.list[0])
@@ -315,7 +315,7 @@ class SimpleGui(Frame):
             Radiobutton(self.PathProcessorFrame, text=option, variable=self.PathProcessorName, value=option).pack(side=LEFT)
 
         self.ConfigurationFrame = Frame(self.TopFrame)
-        self.ConfigurationFrame.pack(side=TOP, anchor=W, expand=1, fill=X)
+        self.ConfigurationFrame.pack(side=TOP, anchor=W, expand=0, fill=X)
         Label(self.ConfigurationFrame, text="Tool Radius: ").pack(side=LEFT)
         self.ToolRadius = StringVar()
         self.ToolRadius.set("1.0")
@@ -356,26 +356,24 @@ class SimpleGui(Frame):
         self.MaxZ = StringVar()
         self.MaxZ.set("+3")
 
-        self.StockModelFrame1 = Frame(self.TopFrame)
-        self.StockModelFrame1.pack(side=TOP, anchor=W, expand=1, fill=X)
-        Label(self.StockModelFrame1, text="Min X").pack(side=LEFT)
-        Entry(self.StockModelFrame1, textvariable=self.MinX, width=6).pack(side=LEFT)
-        Label(self.StockModelFrame1, text="Min Y").pack(side=LEFT)
-        Entry(self.StockModelFrame1, textvariable=self.MinY, width=6).pack(side=LEFT)
-        Label(self.StockModelFrame1, text="Min Z").pack(side=LEFT)
-        Entry(self.StockModelFrame1, textvariable=self.MinZ, width=6).pack(side=LEFT)
-
-        self.StockModelFrame2 = Frame(self.TopFrame)
-        self.StockModelFrame2.pack(side=TOP, anchor=W, expand=1, fill=X)
-        Label(self.StockModelFrame2, text="Max X").pack(side=LEFT)
-        Entry(self.StockModelFrame2, textvariable=self.MaxX, width=6).pack(side=LEFT)
-        Label(self.StockModelFrame2, text="Max Y").pack(side=LEFT)
-        Entry(self.StockModelFrame2, textvariable=self.MaxY, width=6).pack(side=LEFT)
-        Label(self.StockModelFrame2, text="Max Z").pack(side=LEFT)
-        Entry(self.StockModelFrame2, textvariable=self.MaxZ, width=6).pack(side=LEFT)
+        self.StockModelFrame = Frame(self.TopFrame)
+        self.StockModelFrame.pack(side=TOP, anchor=W, expand=0, fill=X)
+        Label(self.StockModelFrame, text="Min X").pack(side=LEFT)
+        Entry(self.StockModelFrame, textvariable=self.MinX, width=6).pack(side=LEFT)
+        Label(self.StockModelFrame, text="Min Y").pack(side=LEFT)
+        Entry(self.StockModelFrame, textvariable=self.MinY, width=6).pack(side=LEFT)
+        Label(self.StockModelFrame, text="Min Z").pack(side=LEFT)
+        Entry(self.StockModelFrame, textvariable=self.MinZ, width=6).pack(side=LEFT)
+
+        Label(self.StockModelFrame, text="Max X").pack(side=LEFT)
+        Entry(self.StockModelFrame, textvariable=self.MaxX, width=6).pack(side=LEFT)
+        Label(self.StockModelFrame, text="Max Y").pack(side=LEFT)
+        Entry(self.StockModelFrame, textvariable=self.MaxY, width=6).pack(side=LEFT)
+        Label(self.StockModelFrame, text="Max Z").pack(side=LEFT)
+        Entry(self.StockModelFrame, textvariable=self.MaxZ, width=6).pack(side=LEFT)
 
         self.ConfigFrame = Frame(self.TopFrame)
-        self.ConfigFrame.pack(side=TOP, anchor=W, expand=1, fill=X)
+        self.ConfigFrame.pack(side=TOP, anchor=W, expand=0, fill=X)
         self.Layers = StringVar()
         self.Layers.set("1")
         Label(self.ConfigFrame, text="Layers").pack(side=LEFT)
@@ -391,8 +389,8 @@ class SimpleGui(Frame):
         Button(self.ConfigFrame, text="Generate Toolpath", command=self.generateToolpath).pack(side=RIGHT)
 
         self.OutputFileFrame = Frame(self.TopFrame)
-        self.OutputFileFrame.pack(side=TOP, anchor=W, expand=1, fill=X)
-        Label(self.OutputFileFrame, width=10, text= "Output File: ").pack(side=LEFT)
+        self.OutputFileFrame.pack(side=TOP, anchor=W, expand=0, fill=X)
+        Label(self.OutputFileFrame, text= "Output File: ").pack(side=LEFT)
         self.OutputFileName = StringVar()
         self.OutputFileField = Entry(self.OutputFileFrame, textvariable=self.OutputFileName).pack(side=LEFT, expand=1, fill=X)
         self.OutputFileBrowse = Button(self.OutputFileFrame, text="Export...", command=self.browseSaveAs).pack(side=RIGHT)