Parcourir la source

- replaced setFixedWidth calls with setMinimumWidth

Marius Stanciu il y a 6 ans
Parent
commit
258d3463e7

+ 1 - 0
README.md

@@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing.
 - fixed issue in the isolation function, if the isolation can't be done there will be generated no Geometry object 
 - fixed issue in the isolation function, if the isolation can't be done there will be generated no Geometry object 
 - some minor UI changes
 - some minor UI changes
 - strings added and translations updated
 - strings added and translations updated
+- replaced setFixedWidth calls with setMinimumWidth
 
 
 5.08.2019
 5.08.2019
 
 

+ 5 - 5
flatcamEditors/FlatCAMGeoEditor.py

@@ -641,16 +641,16 @@ class TransformEditorTool(FlatCAMTool):
         self.transform_lay.addWidget(title_label)
         self.transform_lay.addWidget(title_label)
 
 
         self.empty_label = QtWidgets.QLabel("")
         self.empty_label = QtWidgets.QLabel("")
-        self.empty_label.setFixedWidth(50)
+        self.empty_label.setMinimumWidth(50)
 
 
         self.empty_label1 = QtWidgets.QLabel("")
         self.empty_label1 = QtWidgets.QLabel("")
-        self.empty_label1.setFixedWidth(70)
+        self.empty_label1.setMinimumWidth(70)
         self.empty_label2 = QtWidgets.QLabel("")
         self.empty_label2 = QtWidgets.QLabel("")
-        self.empty_label2.setFixedWidth(70)
+        self.empty_label2.setMinimumWidth(70)
         self.empty_label3 = QtWidgets.QLabel("")
         self.empty_label3 = QtWidgets.QLabel("")
-        self.empty_label3.setFixedWidth(70)
+        self.empty_label3.setMinimumWidth(70)
         self.empty_label4 = QtWidgets.QLabel("")
         self.empty_label4 = QtWidgets.QLabel("")
-        self.empty_label4.setFixedWidth(70)
+        self.empty_label4.setMinimumWidth(70)
         self.transform_lay.addWidget(self.empty_label)
         self.transform_lay.addWidget(self.empty_label)
 
 
         # Rotate Title
         # Rotate Title

+ 31 - 31
flatcamEditors/FlatCAMGrbEditor.py

@@ -2604,7 +2604,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
         self.pad_array_size_label.setToolTip(
         self.pad_array_size_label.setToolTip(
             _("Specify how many pads to be in the array.")
             _("Specify how many pads to be in the array.")
         )
         )
-        self.pad_array_size_label.setFixedWidth(100)
+        self.pad_array_size_label.setMinimumWidth(100)
 
 
         self.pad_array_size_entry = LengthEntry()
         self.pad_array_size_entry = LengthEntry()
         self.array_form.addRow(self.pad_array_size_label, self.pad_array_size_entry)
         self.array_form.addRow(self.pad_array_size_label, self.pad_array_size_entry)
@@ -2626,7 +2626,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
               "- 'Y' - vertical axis or \n"
               "- 'Y' - vertical axis or \n"
               "- 'Angle' - a custom angle for the array inclination")
               "- 'Angle' - a custom angle for the array inclination")
         )
         )
-        self.pad_axis_label.setFixedWidth(100)
+        self.pad_axis_label.setMinimumWidth(100)
 
 
         self.pad_axis_radio = RadioSet([{'label': _('X'), 'value': 'X'},
         self.pad_axis_radio = RadioSet([{'label': _('X'), 'value': 'X'},
                                         {'label': _('Y'), 'value': 'Y'},
                                         {'label': _('Y'), 'value': 'Y'},
@@ -2638,7 +2638,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
         self.pad_pitch_label.setToolTip(
         self.pad_pitch_label.setToolTip(
             _("Pitch = Distance between elements of the array.")
             _("Pitch = Distance between elements of the array.")
         )
         )
-        self.pad_pitch_label.setFixedWidth(100)
+        self.pad_pitch_label.setMinimumWidth(100)
 
 
         self.pad_pitch_entry = LengthEntry()
         self.pad_pitch_entry = LengthEntry()
         self.linear_form.addRow(self.pad_pitch_label, self.pad_pitch_entry)
         self.linear_form.addRow(self.pad_pitch_label, self.pad_pitch_entry)
@@ -2650,7 +2650,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
               "Min value is: -359.99 degrees.\n"
               "Min value is: -359.99 degrees.\n"
               "Max value is:  360.00 degrees.")
               "Max value is:  360.00 degrees.")
         )
         )
-        self.linear_angle_label.setFixedWidth(100)
+        self.linear_angle_label.setMinimumWidth(100)
 
 
         self.linear_angle_spinner = FCDoubleSpinner()
         self.linear_angle_spinner = FCDoubleSpinner()
         self.linear_angle_spinner.set_precision(2)
         self.linear_angle_spinner.set_precision(2)
@@ -2669,7 +2669,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
            _("Direction for circular array."
            _("Direction for circular array."
              "Can be CW = clockwise or CCW = counter clockwise.")
              "Can be CW = clockwise or CCW = counter clockwise.")
         )
         )
-        self.pad_direction_label.setFixedWidth(100)
+        self.pad_direction_label.setMinimumWidth(100)
 
 
         self.circular_form = QtWidgets.QFormLayout()
         self.circular_form = QtWidgets.QFormLayout()
         self.circular_box.addLayout(self.circular_form)
         self.circular_box.addLayout(self.circular_form)
@@ -2683,7 +2683,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
         self.pad_angle_label.setToolTip(
         self.pad_angle_label.setToolTip(
             _("Angle at which each element in circular array is placed.")
             _("Angle at which each element in circular array is placed.")
         )
         )
-        self.pad_angle_label.setFixedWidth(100)
+        self.pad_angle_label.setMinimumWidth(100)
 
 
         self.pad_angle_entry = LengthEntry()
         self.pad_angle_entry = LengthEntry()
         self.circular_form.addRow(self.pad_angle_label, self.pad_angle_entry)
         self.circular_form.addRow(self.pad_angle_label, self.pad_angle_entry)
@@ -4719,16 +4719,16 @@ class TransformEditorTool(FlatCAMTool):
         self.transform_lay.addWidget(title_label)
         self.transform_lay.addWidget(title_label)
 
 
         self.empty_label = QtWidgets.QLabel("")
         self.empty_label = QtWidgets.QLabel("")
-        self.empty_label.setFixedWidth(50)
+        self.empty_label.setMinimumWidth(50)
 
 
         self.empty_label1 = QtWidgets.QLabel("")
         self.empty_label1 = QtWidgets.QLabel("")
-        self.empty_label1.setFixedWidth(70)
+        self.empty_label1.setMinimumWidth(70)
         self.empty_label2 = QtWidgets.QLabel("")
         self.empty_label2 = QtWidgets.QLabel("")
-        self.empty_label2.setFixedWidth(70)
+        self.empty_label2.setMinimumWidth(70)
         self.empty_label3 = QtWidgets.QLabel("")
         self.empty_label3 = QtWidgets.QLabel("")
-        self.empty_label3.setFixedWidth(70)
+        self.empty_label3.setMinimumWidth(70)
         self.empty_label4 = QtWidgets.QLabel("")
         self.empty_label4 = QtWidgets.QLabel("")
-        self.empty_label4.setFixedWidth(70)
+        self.empty_label4.setMinimumWidth(70)
         self.transform_lay.addWidget(self.empty_label)
         self.transform_lay.addWidget(self.empty_label)
 
 
         # Rotate Title
         # Rotate Title
@@ -4747,7 +4747,7 @@ class TransformEditorTool(FlatCAMTool):
               "Positive numbers for CW motion.\n"
               "Positive numbers for CW motion.\n"
               "Negative numbers for CCW motion.")
               "Negative numbers for CCW motion.")
         )
         )
-        self.rotate_label.setFixedWidth(50)
+        self.rotate_label.setMinimumWidth(50)
 
 
         self.rotate_entry = FCEntry()
         self.rotate_entry = FCEntry()
         # self.rotate_entry.setFixedWidth(60)
         # self.rotate_entry.setFixedWidth(60)
@@ -4760,7 +4760,7 @@ class TransformEditorTool(FlatCAMTool):
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected shapes.")
               "the bounding box for all selected shapes.")
         )
         )
-        self.rotate_button.setFixedWidth(60)
+        self.rotate_button.setMinimumWidth(60)
 
 
         form_child.addWidget(self.rotate_entry)
         form_child.addWidget(self.rotate_entry)
         form_child.addWidget(self.rotate_button)
         form_child.addWidget(self.rotate_button)
@@ -4784,7 +4784,7 @@ class TransformEditorTool(FlatCAMTool):
             _("Angle for Skew action, in degrees.\n"
             _("Angle for Skew action, in degrees.\n"
               "Float number between -360 and 359.")
               "Float number between -360 and 359.")
         )
         )
-        self.skewx_label.setFixedWidth(50)
+        self.skewx_label.setMinimumWidth(50)
         self.skewx_entry = FCEntry()
         self.skewx_entry = FCEntry()
         self.skewx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.skewx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.skewx_entry.setFixedWidth(60)
         # self.skewx_entry.setFixedWidth(60)
@@ -4795,14 +4795,14 @@ class TransformEditorTool(FlatCAMTool):
             _("Skew/shear the selected shape(s).\n"
             _("Skew/shear the selected shape(s).\n"
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected shapes."))
               "the bounding box for all selected shapes."))
-        self.skewx_button.setFixedWidth(60)
+        self.skewx_button.setMinimumWidth(60)
 
 
         self.skewy_label = QtWidgets.QLabel(_("Angle Y:"))
         self.skewy_label = QtWidgets.QLabel(_("Angle Y:"))
         self.skewy_label.setToolTip(
         self.skewy_label.setToolTip(
             _("Angle for Skew action, in degrees.\n"
             _("Angle for Skew action, in degrees.\n"
               "Float number between -360 and 359.")
               "Float number between -360 and 359.")
         )
         )
-        self.skewy_label.setFixedWidth(50)
+        self.skewy_label.setMinimumWidth(50)
         self.skewy_entry = FCEntry()
         self.skewy_entry = FCEntry()
         self.skewy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.skewy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.skewy_entry.setFixedWidth(60)
         # self.skewy_entry.setFixedWidth(60)
@@ -4813,7 +4813,7 @@ class TransformEditorTool(FlatCAMTool):
             _("Skew/shear the selected shape(s).\n"
             _("Skew/shear the selected shape(s).\n"
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected shapes."))
               "the bounding box for all selected shapes."))
-        self.skewy_button.setFixedWidth(60)
+        self.skewy_button.setMinimumWidth(60)
 
 
         form1_child_1.addWidget(self.skewx_entry)
         form1_child_1.addWidget(self.skewx_entry)
         form1_child_1.addWidget(self.skewx_button)
         form1_child_1.addWidget(self.skewx_button)
@@ -4840,7 +4840,7 @@ class TransformEditorTool(FlatCAMTool):
         self.scalex_label.setToolTip(
         self.scalex_label.setToolTip(
             _("Factor for Scale action over X axis.")
             _("Factor for Scale action over X axis.")
         )
         )
-        self.scalex_label.setFixedWidth(50)
+        self.scalex_label.setMinimumWidth(50)
         self.scalex_entry = FCEntry()
         self.scalex_entry = FCEntry()
         self.scalex_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.scalex_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.scalex_entry.setFixedWidth(60)
         # self.scalex_entry.setFixedWidth(60)
@@ -4851,13 +4851,13 @@ class TransformEditorTool(FlatCAMTool):
             _("Scale the selected shape(s).\n"
             _("Scale the selected shape(s).\n"
               "The point of reference depends on \n"
               "The point of reference depends on \n"
               "the Scale reference checkbox state."))
               "the Scale reference checkbox state."))
-        self.scalex_button.setFixedWidth(60)
+        self.scalex_button.setMinimumWidth(60)
 
 
         self.scaley_label = QtWidgets.QLabel(_("Factor Y:"))
         self.scaley_label = QtWidgets.QLabel(_("Factor Y:"))
         self.scaley_label.setToolTip(
         self.scaley_label.setToolTip(
             _("Factor for Scale action over Y axis.")
             _("Factor for Scale action over Y axis.")
         )
         )
-        self.scaley_label.setFixedWidth(50)
+        self.scaley_label.setMinimumWidth(50)
         self.scaley_entry = FCEntry()
         self.scaley_entry = FCEntry()
         self.scaley_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.scaley_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.scaley_entry.setFixedWidth(60)
         # self.scaley_entry.setFixedWidth(60)
@@ -4868,7 +4868,7 @@ class TransformEditorTool(FlatCAMTool):
             _("Scale the selected shape(s).\n"
             _("Scale the selected shape(s).\n"
               "The point of reference depends on \n"
               "The point of reference depends on \n"
               "the Scale reference checkbox state."))
               "the Scale reference checkbox state."))
-        self.scaley_button.setFixedWidth(60)
+        self.scaley_button.setMinimumWidth(60)
 
 
         self.scale_link_cb = FCCheckBox()
         self.scale_link_cb = FCCheckBox()
         self.scale_link_cb.set_value(True)
         self.scale_link_cb.set_value(True)
@@ -4876,7 +4876,7 @@ class TransformEditorTool(FlatCAMTool):
         self.scale_link_cb.setToolTip(
         self.scale_link_cb.setToolTip(
             _("Scale the selected shape(s)\n"
             _("Scale the selected shape(s)\n"
               "using the Scale Factor X for both axis."))
               "using the Scale Factor X for both axis."))
-        self.scale_link_cb.setFixedWidth(50)
+        self.scale_link_cb.setMinimumWidth(50)
 
 
         self.scale_zero_ref_cb = FCCheckBox()
         self.scale_zero_ref_cb = FCCheckBox()
         self.scale_zero_ref_cb.set_value(True)
         self.scale_zero_ref_cb.set_value(True)
@@ -4915,7 +4915,7 @@ class TransformEditorTool(FlatCAMTool):
         self.offx_label.setToolTip(
         self.offx_label.setToolTip(
             _("Value for Offset action on X axis.")
             _("Value for Offset action on X axis.")
         )
         )
-        self.offx_label.setFixedWidth(50)
+        self.offx_label.setMinimumWidth(50)
         self.offx_entry = FCEntry()
         self.offx_entry = FCEntry()
         self.offx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.offx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.offx_entry.setFixedWidth(60)
         # self.offx_entry.setFixedWidth(60)
@@ -4927,13 +4927,13 @@ class TransformEditorTool(FlatCAMTool):
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected shapes.\n")
               "the bounding box for all selected shapes.\n")
         )
         )
-        self.offx_button.setFixedWidth(60)
+        self.offx_button.setMinimumWidth(60)
 
 
         self.offy_label = QtWidgets.QLabel(_("Value Y:"))
         self.offy_label = QtWidgets.QLabel(_("Value Y:"))
         self.offy_label.setToolTip(
         self.offy_label.setToolTip(
             _("Value for Offset action on Y axis.")
             _("Value for Offset action on Y axis.")
         )
         )
-        self.offy_label.setFixedWidth(50)
+        self.offy_label.setMinimumWidth(50)
         self.offy_entry = FCEntry()
         self.offy_entry = FCEntry()
         self.offy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.offy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.offy_entry.setFixedWidth(60)
         # self.offy_entry.setFixedWidth(60)
@@ -4945,7 +4945,7 @@ class TransformEditorTool(FlatCAMTool):
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected shapes.\n")
               "the bounding box for all selected shapes.\n")
         )
         )
-        self.offy_button.setFixedWidth(60)
+        self.offy_button.setMinimumWidth(60)
 
 
         form3_child_1.addWidget(self.offx_entry)
         form3_child_1.addWidget(self.offx_entry)
         form3_child_1.addWidget(self.offx_button)
         form3_child_1.addWidget(self.offx_button)
@@ -4975,7 +4975,7 @@ class TransformEditorTool(FlatCAMTool):
             _("Flip the selected shape(s) over the X axis.\n"
             _("Flip the selected shape(s) over the X axis.\n"
               "Does not create a new shape.")
               "Does not create a new shape.")
         )
         )
-        self.flipx_button.setFixedWidth(60)
+        self.flipx_button.setMinimumWidth(60)
 
 
         self.flipy_button = FCButton()
         self.flipy_button = FCButton()
         self.flipy_button.set_value(_("Flip on Y"))
         self.flipy_button.set_value(_("Flip on Y"))
@@ -4983,7 +4983,7 @@ class TransformEditorTool(FlatCAMTool):
             _("Flip the selected shape(s) over the X axis.\n"
             _("Flip the selected shape(s) over the X axis.\n"
               "Does not create a new shape.")
               "Does not create a new shape.")
         )
         )
-        self.flipy_button.setFixedWidth(60)
+        self.flipy_button.setMinimumWidth(60)
 
 
         self.flip_ref_cb = FCCheckBox()
         self.flip_ref_cb = FCCheckBox()
         self.flip_ref_cb.set_value(True)
         self.flip_ref_cb.set_value(True)
@@ -4999,7 +4999,7 @@ class TransformEditorTool(FlatCAMTool):
               "Or enter the coords in format (x, y) in the\n"
               "Or enter the coords in format (x, y) in the\n"
               "Point Entry field and click Flip on X(Y)")
               "Point Entry field and click Flip on X(Y)")
         )
         )
-        self.flip_ref_cb.setFixedWidth(50)
+        self.flip_ref_cb.setMinimumWidth(50)
 
 
         self.flip_ref_label = QtWidgets.QLabel(_("Point:"))
         self.flip_ref_label = QtWidgets.QLabel(_("Point:"))
         self.flip_ref_label.setToolTip(
         self.flip_ref_label.setToolTip(
@@ -5007,7 +5007,7 @@ class TransformEditorTool(FlatCAMTool):
               "The 'x' in (x, y) will be used when using Flip on X and\n"
               "The 'x' in (x, y) will be used when using Flip on X and\n"
               "the 'y' in (x, y) will be used when using Flip on Y.")
               "the 'y' in (x, y) will be used when using Flip on Y.")
         )
         )
-        self.flip_ref_label.setFixedWidth(50)
+        self.flip_ref_label.setMinimumWidth(50)
         self.flip_ref_entry = EvalEntry2("(0, 0)")
         self.flip_ref_entry = EvalEntry2("(0, 0)")
         self.flip_ref_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.flip_ref_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.flip_ref_entry.setFixedWidth(60)
         # self.flip_ref_entry.setFixedWidth(60)
@@ -5019,7 +5019,7 @@ class TransformEditorTool(FlatCAMTool):
               "left click on canvas together with pressing\n"
               "left click on canvas together with pressing\n"
               "SHIFT key. Then click Add button to insert.")
               "SHIFT key. Then click Add button to insert.")
         )
         )
-        self.flip_ref_button.setFixedWidth(60)
+        self.flip_ref_button.setMinimumWidth(60)
 
 
         form4_child_hlay.addStretch()
         form4_child_hlay.addStretch()
         form4_child_hlay.addWidget(self.flipx_button)
         form4_child_hlay.addWidget(self.flipx_button)

+ 18 - 18
flatcamGUI/FlatCAMGUI.py

@@ -1656,12 +1656,12 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         self.buttonPreview = QtWidgets.QPushButton(_('Print Preview'))
         self.buttonPreview = QtWidgets.QPushButton(_('Print Preview'))
         self.buttonPrint = QtWidgets.QPushButton(_('Print Code'))
         self.buttonPrint = QtWidgets.QPushButton(_('Print Code'))
         self.buttonFind = QtWidgets.QPushButton(_('Find in Code'))
         self.buttonFind = QtWidgets.QPushButton(_('Find in Code'))
-        self.buttonFind.setFixedWidth(100)
-        self.buttonPreview.setFixedWidth(100)
+        self.buttonFind.setMinimumWidth(100)
+        self.buttonPreview.setMinimumWidth(100)
         self.entryFind = FCEntry()
         self.entryFind = FCEntry()
         self.entryFind.setMaximumWidth(200)
         self.entryFind.setMaximumWidth(200)
         self.buttonReplace = QtWidgets.QPushButton(_('Replace With'))
         self.buttonReplace = QtWidgets.QPushButton(_('Replace With'))
-        self.buttonReplace.setFixedWidth(100)
+        self.buttonReplace.setMinimumWidth(100)
         self.entryReplace = FCEntry()
         self.entryReplace = FCEntry()
         self.entryReplace.setMaximumWidth(200)
         self.entryReplace.setMaximumWidth(200)
         self.sel_all_cb = QtWidgets.QCheckBox(_('All'))
         self.sel_all_cb = QtWidgets.QCheckBox(_('All'))
@@ -3417,7 +3417,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         self.pf_color_alpha_slider.setSingleStep(1)
         self.pf_color_alpha_slider.setSingleStep(1)
 
 
         self.pf_color_alpha_spinner = FCSpinner()
         self.pf_color_alpha_spinner = FCSpinner()
-        self.pf_color_alpha_spinner.setFixedWidth(70)
+        self.pf_color_alpha_spinner.setMinimumWidth(70)
         self.pf_color_alpha_spinner.setMinimum(0)
         self.pf_color_alpha_spinner.setMinimum(0)
         self.pf_color_alpha_spinner.setMaximum(255)
         self.pf_color_alpha_spinner.setMaximum(255)
 
 
@@ -3467,7 +3467,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         self.sf_color_alpha_slider.setSingleStep(1)
         self.sf_color_alpha_slider.setSingleStep(1)
 
 
         self.sf_color_alpha_spinner = FCSpinner()
         self.sf_color_alpha_spinner = FCSpinner()
-        self.sf_color_alpha_spinner.setFixedWidth(70)
+        self.sf_color_alpha_spinner.setMinimumWidth(70)
         self.sf_color_alpha_spinner.setMinimum(0)
         self.sf_color_alpha_spinner.setMinimum(0)
         self.sf_color_alpha_spinner.setMaximum(255)
         self.sf_color_alpha_spinner.setMaximum(255)
 
 
@@ -3517,7 +3517,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         self.alt_sf_color_alpha_slider.setSingleStep(1)
         self.alt_sf_color_alpha_slider.setSingleStep(1)
 
 
         self.alt_sf_color_alpha_spinner = FCSpinner()
         self.alt_sf_color_alpha_spinner = FCSpinner()
-        self.alt_sf_color_alpha_spinner.setFixedWidth(70)
+        self.alt_sf_color_alpha_spinner.setMinimumWidth(70)
         self.alt_sf_color_alpha_spinner.setMinimum(0)
         self.alt_sf_color_alpha_spinner.setMinimum(0)
         self.alt_sf_color_alpha_spinner.setMaximum(255)
         self.alt_sf_color_alpha_spinner.setMaximum(255)
 
 
@@ -4291,7 +4291,7 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
         self.format_whole_entry = IntEntry()
         self.format_whole_entry = IntEntry()
         self.format_whole_entry.setMaxLength(1)
         self.format_whole_entry.setMaxLength(1)
         self.format_whole_entry.setAlignment(QtCore.Qt.AlignRight)
         self.format_whole_entry.setAlignment(QtCore.Qt.AlignRight)
-        self.format_whole_entry.setFixedWidth(30)
+        self.format_whole_entry.setMinimumWidth(30)
         self.format_whole_entry.setToolTip(
         self.format_whole_entry.setToolTip(
             _("This numbers signify the number of digits in\n"
             _("This numbers signify the number of digits in\n"
               "the whole part of Gerber coordinates.")
               "the whole part of Gerber coordinates.")
@@ -4305,7 +4305,7 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
         self.format_dec_entry = IntEntry()
         self.format_dec_entry = IntEntry()
         self.format_dec_entry.setMaxLength(1)
         self.format_dec_entry.setMaxLength(1)
         self.format_dec_entry.setAlignment(QtCore.Qt.AlignRight)
         self.format_dec_entry.setAlignment(QtCore.Qt.AlignRight)
-        self.format_dec_entry.setFixedWidth(30)
+        self.format_dec_entry.setMinimumWidth(30)
         self.format_dec_entry.setToolTip(
         self.format_dec_entry.setToolTip(
             _("This numbers signify the number of digits in\n"
             _("This numbers signify the number of digits in\n"
               "the decimal part of Gerber coordinates.")
               "the decimal part of Gerber coordinates.")
@@ -4439,7 +4439,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         self.excellon_format_upper_in_entry = IntEntry()
         self.excellon_format_upper_in_entry = IntEntry()
         self.excellon_format_upper_in_entry.setMaxLength(1)
         self.excellon_format_upper_in_entry.setMaxLength(1)
         self.excellon_format_upper_in_entry.setAlignment(QtCore.Qt.AlignRight)
         self.excellon_format_upper_in_entry.setAlignment(QtCore.Qt.AlignRight)
-        self.excellon_format_upper_in_entry.setFixedWidth(30)
+        self.excellon_format_upper_in_entry.setMinimumWidth(30)
         self.excellon_format_upper_in_entry.setToolTip(
         self.excellon_format_upper_in_entry.setToolTip(
            _("This numbers signify the number of digits in\n"
            _("This numbers signify the number of digits in\n"
              "the whole part of Excellon coordinates.")
              "the whole part of Excellon coordinates.")
@@ -4453,7 +4453,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         self.excellon_format_lower_in_entry = IntEntry()
         self.excellon_format_lower_in_entry = IntEntry()
         self.excellon_format_lower_in_entry.setMaxLength(1)
         self.excellon_format_lower_in_entry.setMaxLength(1)
         self.excellon_format_lower_in_entry.setAlignment(QtCore.Qt.AlignRight)
         self.excellon_format_lower_in_entry.setAlignment(QtCore.Qt.AlignRight)
-        self.excellon_format_lower_in_entry.setFixedWidth(30)
+        self.excellon_format_lower_in_entry.setMinimumWidth(30)
         self.excellon_format_lower_in_entry.setToolTip(
         self.excellon_format_lower_in_entry.setToolTip(
             _("This numbers signify the number of digits in\n"
             _("This numbers signify the number of digits in\n"
               "the decimal part of Excellon coordinates.")
               "the decimal part of Excellon coordinates.")
@@ -4472,7 +4472,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         self.excellon_format_upper_mm_entry = IntEntry()
         self.excellon_format_upper_mm_entry = IntEntry()
         self.excellon_format_upper_mm_entry.setMaxLength(1)
         self.excellon_format_upper_mm_entry.setMaxLength(1)
         self.excellon_format_upper_mm_entry.setAlignment(QtCore.Qt.AlignRight)
         self.excellon_format_upper_mm_entry.setAlignment(QtCore.Qt.AlignRight)
-        self.excellon_format_upper_mm_entry.setFixedWidth(30)
+        self.excellon_format_upper_mm_entry.setMinimumWidth(30)
         self.excellon_format_upper_mm_entry.setToolTip(
         self.excellon_format_upper_mm_entry.setToolTip(
             _("This numbers signify the number of digits in\n"
             _("This numbers signify the number of digits in\n"
               "the whole part of Excellon coordinates.")
               "the whole part of Excellon coordinates.")
@@ -4486,7 +4486,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
         self.excellon_format_lower_mm_entry = IntEntry()
         self.excellon_format_lower_mm_entry = IntEntry()
         self.excellon_format_lower_mm_entry.setMaxLength(1)
         self.excellon_format_lower_mm_entry.setMaxLength(1)
         self.excellon_format_lower_mm_entry.setAlignment(QtCore.Qt.AlignRight)
         self.excellon_format_lower_mm_entry.setAlignment(QtCore.Qt.AlignRight)
-        self.excellon_format_lower_mm_entry.setFixedWidth(30)
+        self.excellon_format_lower_mm_entry.setMinimumWidth(30)
         self.excellon_format_lower_mm_entry.setToolTip(
         self.excellon_format_lower_mm_entry.setToolTip(
             _("This numbers signify the number of digits in\n"
             _("This numbers signify the number of digits in\n"
               "the decimal part of Excellon coordinates.")
               "the decimal part of Excellon coordinates.")
@@ -4778,7 +4778,7 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
         # Adding the Excellon Format Defaults Button
         # Adding the Excellon Format Defaults Button
         self.excellon_defaults_button = QtWidgets.QPushButton()
         self.excellon_defaults_button = QtWidgets.QPushButton()
         self.excellon_defaults_button.setText(str(_("Defaults")))
         self.excellon_defaults_button.setText(str(_("Defaults")))
-        self.excellon_defaults_button.setFixedWidth(80)
+        self.excellon_defaults_button.setMinimumWidth(80)
         grid4.addWidget(self.excellon_defaults_button, 0, 0, QtCore.Qt.AlignRight)
         grid4.addWidget(self.excellon_defaults_button, 0, 0, QtCore.Qt.AlignRight)
 
 
         self.layout.addStretch()
         self.layout.addStretch()
@@ -4945,7 +4945,7 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
         self.format_whole_entry = IntEntry()
         self.format_whole_entry = IntEntry()
         self.format_whole_entry.setMaxLength(1)
         self.format_whole_entry.setMaxLength(1)
         self.format_whole_entry.setAlignment(QtCore.Qt.AlignRight)
         self.format_whole_entry.setAlignment(QtCore.Qt.AlignRight)
-        self.format_whole_entry.setFixedWidth(30)
+        self.format_whole_entry.setMinimumWidth(30)
         self.format_whole_entry.setToolTip(
         self.format_whole_entry.setToolTip(
             _("This numbers signify the number of digits in\n"
             _("This numbers signify the number of digits in\n"
               "the whole part of Excellon coordinates.")
               "the whole part of Excellon coordinates.")
@@ -4959,7 +4959,7 @@ class ExcellonExpPrefGroupUI(OptionsGroupUI):
         self.format_dec_entry = IntEntry()
         self.format_dec_entry = IntEntry()
         self.format_dec_entry.setMaxLength(1)
         self.format_dec_entry.setMaxLength(1)
         self.format_dec_entry.setAlignment(QtCore.Qt.AlignRight)
         self.format_dec_entry.setAlignment(QtCore.Qt.AlignRight)
-        self.format_dec_entry.setFixedWidth(30)
+        self.format_dec_entry.setMinimumWidth(30)
         self.format_dec_entry.setToolTip(
         self.format_dec_entry.setToolTip(
             _("This numbers signify the number of digits in\n"
             _("This numbers signify the number of digits in\n"
               "the decimal part of Excellon coordinates.")
               "the decimal part of Excellon coordinates.")
@@ -5074,7 +5074,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         self.drill_array_size_label.setToolTip(
         self.drill_array_size_label.setToolTip(
             _("Specify how many drills to be in the array.")
             _("Specify how many drills to be in the array.")
         )
         )
-        # self.drill_array_size_label.setFixedWidth(100)
+        # self.drill_array_size_label.setMinimumWidth(100)
 
 
         self.drill_array_size_entry = LengthEntry()
         self.drill_array_size_entry = LengthEntry()
 
 
@@ -5092,7 +5092,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
               "- 'Y' - vertical axis or \n"
               "- 'Y' - vertical axis or \n"
               "- 'Angle' - a custom angle for the array inclination")
               "- 'Angle' - a custom angle for the array inclination")
         )
         )
-        # self.drill_axis_label.setFixedWidth(100)
+        # self.drill_axis_label.setMinimumWidth(100)
         self.drill_axis_radio = RadioSet([{'label': _('X'), 'value': 'X'},
         self.drill_axis_radio = RadioSet([{'label': _('X'), 'value': 'X'},
                                           {'label': _('Y'), 'value': 'Y'},
                                           {'label': _('Y'), 'value': 'Y'},
                                           {'label': _('Angle'), 'value': 'A'}])
                                           {'label': _('Angle'), 'value': 'A'}])
@@ -5105,7 +5105,7 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
         self.drill_pitch_label.setToolTip(
         self.drill_pitch_label.setToolTip(
             _("Pitch = Distance between elements of the array.")
             _("Pitch = Distance between elements of the array.")
         )
         )
-        # self.drill_pitch_label.setFixedWidth(100)
+        # self.drill_pitch_label.setMinimumWidth(100)
         self.drill_pitch_entry = LengthEntry()
         self.drill_pitch_entry = LengthEntry()
 
 
         grid0.addWidget(self.drill_pitch_label, 5, 0)
         grid0.addWidget(self.drill_pitch_label, 5, 0)

+ 1 - 1
flatcamGUI/GUIElements.py

@@ -1634,7 +1634,7 @@ class Dialog_box(QtWidgets.QWidget):
         self.ok = False
         self.ok = False
 
 
         dialog_box = QtWidgets.QInputDialog()
         dialog_box = QtWidgets.QInputDialog()
-        dialog_box.setFixedWidth(290)
+        dialog_box.setMinimumWidth(290)
         self.setWindowIcon(icon)
         self.setWindowIcon(icon)
 
 
         self.location, self.ok = dialog_box.getText(self, title, label, text="0, 0")
         self.location, self.ok = dialog_box.getText(self, title, label, text="0, 0")

+ 20 - 20
flatcamGUI/ObjectUI.py

@@ -101,7 +101,7 @@ class ObjectUI(QtWidgets.QWidget):
         self.scale_button.setToolTip(
         self.scale_button.setToolTip(
             _("Perform scaling operation.")
             _("Perform scaling operation.")
         )
         )
-        self.scale_button.setFixedWidth(70)
+        self.scale_button.setMinimumWidth(70)
         self.scale_grid.addWidget(self.scale_button, 0, 2)
         self.scale_grid.addWidget(self.scale_button, 0, 2)
 
 
         # ### Offset ####
         # ### Offset ####
@@ -128,7 +128,7 @@ class ObjectUI(QtWidgets.QWidget):
         self.offset_button.setToolTip(
         self.offset_button.setToolTip(
             _("Perform the offset operation.")
             _("Perform the offset operation.")
         )
         )
-        self.offset_button.setFixedWidth(70)
+        self.offset_button.setMinimumWidth(70)
         self.offset_grid.addWidget(self.offset_button, 0, 2)
         self.offset_grid.addWidget(self.offset_button, 0, 2)
 
 
         layout.addStretch()
         layout.addStretch()
@@ -148,7 +148,7 @@ class GerberObjectUI(ObjectUI):
         self.custom_box.addLayout(grid0)
         self.custom_box.addLayout(grid0)
 
 
         self.plot_options_label = QtWidgets.QLabel(_("<b>Plot Options:</b>"))
         self.plot_options_label = QtWidgets.QLabel(_("<b>Plot Options:</b>"))
-        self.plot_options_label.setFixedWidth(90)
+        self.plot_options_label.setMinimumWidth(90)
 
 
         grid0.addWidget(self.plot_options_label, 0, 0)
         grid0.addWidget(self.plot_options_label, 0, 0)
 
 
@@ -157,7 +157,7 @@ class GerberObjectUI(ObjectUI):
         self.solid_cb.setToolTip(
         self.solid_cb.setToolTip(
             _("Solid color polygons.")
             _("Solid color polygons.")
         )
         )
-        self.solid_cb.setFixedWidth(50)
+        self.solid_cb.setMinimumWidth(50)
         grid0.addWidget(self.solid_cb, 0, 1)
         grid0.addWidget(self.solid_cb, 0, 1)
 
 
         # Multicolored CB
         # Multicolored CB
@@ -165,7 +165,7 @@ class GerberObjectUI(ObjectUI):
         self.multicolored_cb.setToolTip(
         self.multicolored_cb.setToolTip(
             _("Draw polygons in different colors.")
             _("Draw polygons in different colors.")
         )
         )
-        self.multicolored_cb.setFixedWidth(55)
+        self.multicolored_cb.setMinimumWidth(55)
         grid0.addWidget(self.multicolored_cb, 0, 2)
         grid0.addWidget(self.multicolored_cb, 0, 2)
 
 
         # Plot CB
         # Plot CB
@@ -173,7 +173,7 @@ class GerberObjectUI(ObjectUI):
         self.plot_cb.setToolTip(
         self.plot_cb.setToolTip(
             _("Plot (show) this object.")
             _("Plot (show) this object.")
         )
         )
-        self.plot_cb.setFixedWidth(59)
+        self.plot_cb.setMinimumWidth(59)
         grid0.addWidget(self.plot_cb, 0, 3)
         grid0.addWidget(self.plot_cb, 0, 3)
 
 
         # ## Object name
         # ## Object name
@@ -193,7 +193,7 @@ class GerberObjectUI(ObjectUI):
         self.apertures_table_label.setToolTip(
         self.apertures_table_label.setToolTip(
             _("Apertures Table for the Gerber Object.")
             _("Apertures Table for the Gerber Object.")
         )
         )
-        self.apertures_table_label.setFixedWidth(90)
+        self.apertures_table_label.setMinimumWidth(90)
 
 
         hlay_plot.addWidget(self.apertures_table_label)
         hlay_plot.addWidget(self.apertures_table_label)
 
 
@@ -264,7 +264,7 @@ class GerberObjectUI(ObjectUI):
               "feature, use a negative value for\n"
               "feature, use a negative value for\n"
               "this parameter.")
               "this parameter.")
         )
         )
-        tdlabel.setFixedWidth(90)
+        tdlabel.setMinimumWidth(90)
         grid1.addWidget(tdlabel, 0, 0)
         grid1.addWidget(tdlabel, 0, 0)
         self.iso_tool_dia_entry = LengthEntry()
         self.iso_tool_dia_entry = LengthEntry()
         grid1.addWidget(self.iso_tool_dia_entry, 0, 1)
         grid1.addWidget(self.iso_tool_dia_entry, 0, 1)
@@ -274,7 +274,7 @@ class GerberObjectUI(ObjectUI):
             _("Width of the isolation gap in\n"
             _("Width of the isolation gap in\n"
               "number (integer) of tool widths.")
               "number (integer) of tool widths.")
         )
         )
-        passlabel.setFixedWidth(90)
+        passlabel.setMinimumWidth(90)
         grid1.addWidget(passlabel, 1, 0)
         grid1.addWidget(passlabel, 1, 0)
         self.iso_width_entry = IntEntry()
         self.iso_width_entry = IntEntry()
         grid1.addWidget(self.iso_width_entry, 1, 1)
         grid1.addWidget(self.iso_width_entry, 1, 1)
@@ -285,7 +285,7 @@ class GerberObjectUI(ObjectUI):
               "Example:\n"
               "Example:\n"
               "A value here of 0.25 means an overlap of 25% from the tool diameter found above.")
               "A value here of 0.25 means an overlap of 25% from the tool diameter found above.")
         )
         )
-        overlabel.setFixedWidth(90)
+        overlabel.setMinimumWidth(90)
         grid1.addWidget(overlabel, 2, 0)
         grid1.addWidget(overlabel, 2, 0)
         self.iso_overlap_entry = FloatEntry()
         self.iso_overlap_entry = FloatEntry()
         grid1.addWidget(self.iso_overlap_entry, 2, 1)
         grid1.addWidget(self.iso_overlap_entry, 2, 1)
@@ -337,7 +337,7 @@ class GerberObjectUI(ObjectUI):
         self.custom_box.addLayout(hlay_1)
         self.custom_box.addLayout(hlay_1)
 
 
         self.padding_area_label = QtWidgets.QLabel('')
         self.padding_area_label = QtWidgets.QLabel('')
-        self.padding_area_label.setFixedWidth(90)
+        self.padding_area_label.setMinimumWidth(90)
         hlay_1.addWidget(self.padding_area_label)
         hlay_1.addWidget(self.padding_area_label)
 
 
         self.generate_iso_button = QtWidgets.QPushButton(_('FULL Geo'))
         self.generate_iso_button = QtWidgets.QPushButton(_('FULL Geo'))
@@ -346,7 +346,7 @@ class GerberObjectUI(ObjectUI):
               "for isolation routing. It contains both\n"
               "for isolation routing. It contains both\n"
               "the interiors and exteriors geometry.")
               "the interiors and exteriors geometry.")
         )
         )
-        self.generate_iso_button.setFixedWidth(90)
+        self.generate_iso_button.setMinimumWidth(90)
         hlay_1.addWidget(self.generate_iso_button, alignment=Qt.AlignLeft)
         hlay_1.addWidget(self.generate_iso_button, alignment=Qt.AlignLeft)
 
 
         # hlay_1.addStretch()
         # hlay_1.addStretch()
@@ -357,7 +357,7 @@ class GerberObjectUI(ObjectUI):
               "for isolation routing containing\n"
               "for isolation routing containing\n"
               "only the exteriors geometry.")
               "only the exteriors geometry.")
         )
         )
-        # self.generate_ext_iso_button.setFixedWidth(100)
+        # self.generate_ext_iso_button.setMinimumWidth(100)
         hlay_1.addWidget(self.generate_ext_iso_button)
         hlay_1.addWidget(self.generate_ext_iso_button)
 
 
         self.generate_int_iso_button = QtWidgets.QPushButton(_('Int Geo'))
         self.generate_int_iso_button = QtWidgets.QPushButton(_('Int Geo'))
@@ -366,7 +366,7 @@ class GerberObjectUI(ObjectUI):
               "for isolation routing containing\n"
               "for isolation routing containing\n"
               "only the interiors geometry.")
               "only the interiors geometry.")
         )
         )
-        # self.generate_ext_iso_button.setFixedWidth(90)
+        # self.generate_ext_iso_button.setMinimumWidth(90)
         hlay_1.addWidget(self.generate_int_iso_button)
         hlay_1.addWidget(self.generate_int_iso_button)
 
 
         # when the follow checkbox is checked then the exteriors and interiors isolation generation buttons
         # when the follow checkbox is checked then the exteriors and interiors isolation generation buttons
@@ -383,7 +383,7 @@ class GerberObjectUI(ObjectUI):
             _("Create a Geometry object with\n"
             _("Create a Geometry object with\n"
               "toolpaths to cut all non-copper regions.")
               "toolpaths to cut all non-copper regions.")
         )
         )
-        self.clearcopper_label.setFixedWidth(90)
+        self.clearcopper_label.setMinimumWidth(90)
         grid2.addWidget(self.clearcopper_label, 0, 0)
         grid2.addWidget(self.clearcopper_label, 0, 0)
 
 
         self.generate_ncc_button = QtWidgets.QPushButton(_('NCC Tool'))
         self.generate_ncc_button = QtWidgets.QPushButton(_('NCC Tool'))
@@ -431,7 +431,7 @@ class GerberObjectUI(ObjectUI):
               "objects with this minimum\n"
               "objects with this minimum\n"
               "distance.")
               "distance.")
         )
         )
-        bmlabel.setFixedWidth(90)
+        bmlabel.setMinimumWidth(90)
         grid4.addWidget(bmlabel, 0, 0)
         grid4.addWidget(bmlabel, 0, 0)
         self.noncopper_margin_entry = LengthEntry()
         self.noncopper_margin_entry = LengthEntry()
         grid4.addWidget(self.noncopper_margin_entry, 0, 1)
         grid4.addWidget(self.noncopper_margin_entry, 0, 1)
@@ -441,7 +441,7 @@ class GerberObjectUI(ObjectUI):
         self.noncopper_rounded_cb.setToolTip(
         self.noncopper_rounded_cb.setToolTip(
             _("Resulting geometry will have rounded corners.")
             _("Resulting geometry will have rounded corners.")
         )
         )
-        self.noncopper_rounded_cb.setFixedWidth(90)
+        self.noncopper_rounded_cb.setMinimumWidth(90)
         grid4.addWidget(self.noncopper_rounded_cb, 1, 0)
         grid4.addWidget(self.noncopper_rounded_cb, 1, 0)
 
 
         self.generate_noncopper_button = QtWidgets.QPushButton(_('Generate Geo'))
         self.generate_noncopper_button = QtWidgets.QPushButton(_('Generate Geo'))
@@ -463,7 +463,7 @@ class GerberObjectUI(ObjectUI):
             _("Distance of the edges of the box\n"
             _("Distance of the edges of the box\n"
               "to the nearest polygon.")
               "to the nearest polygon.")
         )
         )
-        bbmargin.setFixedWidth(90)
+        bbmargin.setMinimumWidth(90)
         grid5.addWidget(bbmargin, 0, 0)
         grid5.addWidget(bbmargin, 0, 0)
         self.bbmargin_entry = LengthEntry()
         self.bbmargin_entry = LengthEntry()
         grid5.addWidget(self.bbmargin_entry, 0, 1)
         grid5.addWidget(self.bbmargin_entry, 0, 1)
@@ -475,7 +475,7 @@ class GerberObjectUI(ObjectUI):
               "their radius is equal to\n"
               "their radius is equal to\n"
               "the margin.")
               "the margin.")
         )
         )
-        self.bbrounded_cb.setFixedWidth(90)
+        self.bbrounded_cb.setMinimumWidth(90)
         grid5.addWidget(self.bbrounded_cb, 1, 0)
         grid5.addWidget(self.bbrounded_cb, 1, 0)
 
 
         self.generate_bb_button = QtWidgets.QPushButton(_('Generate Geo'))
         self.generate_bb_button = QtWidgets.QPushButton(_('Generate Geo'))
@@ -957,7 +957,7 @@ class GeometryObjectUI(ObjectUI):
         self.tool_offset_entry = FloatEntry()
         self.tool_offset_entry = FloatEntry()
         self.tool_offset_entry.setValidator(QtGui.QDoubleValidator(-9999.9999, 9999.9999, 4))
         self.tool_offset_entry.setValidator(QtGui.QDoubleValidator(-9999.9999, 9999.9999, 4))
         spacer_lbl = QtWidgets.QLabel(" ")
         spacer_lbl = QtWidgets.QLabel(" ")
-        spacer_lbl.setFixedWidth(80)
+        spacer_lbl.setMinimumWidth(80)
 
 
         self.grid1.addWidget(self.tool_offset_entry, 0, 1)
         self.grid1.addWidget(self.tool_offset_entry, 0, 1)
         self.grid1.addWidget(spacer_lbl, 0, 2)
         self.grid1.addWidget(spacer_lbl, 0, 2)

+ 3 - 3
flatcamTools/ToolCutOut.py

@@ -58,7 +58,7 @@ class CutOut(FlatCAMTool):
               "What is selected here will dictate the kind\n"
               "What is selected here will dictate the kind\n"
               "of objects that will populate the 'Object' combobox.")
               "of objects that will populate the 'Object' combobox.")
         )
         )
-        self.type_obj_combo_label.setFixedWidth(60)
+        self.type_obj_combo_label.setMinimumWidth(60)
         form_layout.addRow(self.type_obj_combo_label, self.type_obj_combo)
         form_layout.addRow(self.type_obj_combo_label, self.type_obj_combo)
 
 
         # Object to be cutout
         # Object to be cutout
@@ -158,7 +158,7 @@ class CutOut(FlatCAMTool):
               "- 2tb  - 2*top + 2*bottom\n"
               "- 2tb  - 2*top + 2*bottom\n"
               "- 8     - 2*left + 2*right +2*top + 2*bottom")
               "- 8     - 2*left + 2*right +2*top + 2*bottom")
         )
         )
-        gaps_label.setFixedWidth(60)
+        gaps_label.setMinimumWidth(60)
 
 
         self.gaps = FCComboBox()
         self.gaps = FCComboBox()
         gaps_items = ['LR', 'TB', '4', '2LR', '2TB', '8']
         gaps_items = ['LR', 'TB', '4', '2LR', '2TB', '8']
@@ -232,7 +232,7 @@ class CutOut(FlatCAMTool):
         self.man_object_label.setToolTip(
         self.man_object_label.setToolTip(
             _("Geometry object used to create the manual cutout.")
             _("Geometry object used to create the manual cutout.")
         )
         )
-        self.man_object_label.setFixedWidth(60)
+        self.man_object_label.setMinimumWidth(60)
         # e_lab_0 = QtWidgets.QLabel('')
         # e_lab_0 = QtWidgets.QLabel('')
 
 
         form_layout_3.addRow(self.man_object_label, self.man_object_combo)
         form_layout_3.addRow(self.man_object_label, self.man_object_combo)

+ 6 - 6
flatcamTools/ToolDblSided.py

@@ -55,7 +55,7 @@ class DblSidedTool(FlatCAMTool):
               "the specified axis. Does not create a new \n"
               "the specified axis. Does not create a new \n"
               "object, but modifies it.")
               "object, but modifies it.")
         )
         )
-        self.mirror_gerber_button.setFixedWidth(60)
+        self.mirror_gerber_button.setMinimumWidth(60)
 
 
         # grid_lay.addRow("Bottom Layer:", self.object_combo)
         # grid_lay.addRow("Bottom Layer:", self.object_combo)
         grid_lay.addWidget(self.botlay_label, 0, 0)
         grid_lay.addWidget(self.botlay_label, 0, 0)
@@ -79,7 +79,7 @@ class DblSidedTool(FlatCAMTool):
               "the specified axis. Does not create a new \n"
               "the specified axis. Does not create a new \n"
               "object, but modifies it.")
               "object, but modifies it.")
         )
         )
-        self.mirror_exc_button.setFixedWidth(60)
+        self.mirror_exc_button.setMinimumWidth(60)
 
 
         # grid_lay.addRow("Bottom Layer:", self.object_combo)
         # grid_lay.addRow("Bottom Layer:", self.object_combo)
         grid_lay.addWidget(self.excobj_label, 2, 0)
         grid_lay.addWidget(self.excobj_label, 2, 0)
@@ -103,7 +103,7 @@ class DblSidedTool(FlatCAMTool):
               "the specified axis. Does not create a new \n"
               "the specified axis. Does not create a new \n"
               "object, but modifies it.")
               "object, but modifies it.")
         )
         )
-        self.mirror_geo_button.setFixedWidth(60)
+        self.mirror_geo_button.setMinimumWidth(60)
 
 
         # grid_lay.addRow("Bottom Layer:", self.object_combo)
         # grid_lay.addRow("Bottom Layer:", self.object_combo)
         grid_lay.addWidget(self.geoobj_label, 4, 0)
         grid_lay.addWidget(self.geoobj_label, 4, 0)
@@ -164,7 +164,7 @@ class DblSidedTool(FlatCAMTool):
               "The (x, y) coordinates are captured by pressing SHIFT key\n"
               "The (x, y) coordinates are captured by pressing SHIFT key\n"
               "and left mouse button click on canvas or you can enter the coords manually.")
               "and left mouse button click on canvas or you can enter the coords manually.")
         )
         )
-        self.add_point_button.setFixedWidth(60)
+        self.add_point_button.setMinimumWidth(60)
 
 
         grid_lay2.addWidget(self.pb_label, 10, 0)
         grid_lay2.addWidget(self.pb_label, 10, 0)
         grid_lay2.addLayout(self.point_box_container, 11, 0)
         grid_lay2.addLayout(self.point_box_container, 11, 0)
@@ -214,7 +214,7 @@ class DblSidedTool(FlatCAMTool):
               "- press SHIFT key and left mouse clicking on canvas. Then RMB click in the field and click Paste.\n"
               "- press SHIFT key and left mouse clicking on canvas. Then RMB click in the field and click Paste.\n"
               "- by entering the coords manually in the format: (x1, y1), (x2, y2), ...")
               "- by entering the coords manually in the format: (x1, y1), (x2, y2), ...")
         )
         )
-        self.add_drill_point_button.setFixedWidth(60)
+        self.add_drill_point_button.setMinimumWidth(60)
 
 
         grid_lay3.addWidget(self.alignment_holes, 0, 0)
         grid_lay3.addWidget(self.alignment_holes, 0, 0)
         grid_lay3.addWidget(self.add_drill_point_button, 0, 1)
         grid_lay3.addWidget(self.add_drill_point_button, 0, 1)
@@ -255,7 +255,7 @@ class DblSidedTool(FlatCAMTool):
         self.reset_button.setToolTip(
         self.reset_button.setToolTip(
             _("Resets all the fields.")
             _("Resets all the fields.")
         )
         )
-        self.reset_button.setFixedWidth(60)
+        self.reset_button.setMinimumWidth(60)
         hlay2.addWidget(self.reset_button)
         hlay2.addWidget(self.reset_button)
 
 
         self.layout.addStretch()
         self.layout.addStretch()

+ 25 - 25
flatcamTools/ToolTransform.py

@@ -44,16 +44,16 @@ class ToolTransform(FlatCAMTool):
         self.transform_lay.addWidget(title_label)
         self.transform_lay.addWidget(title_label)
 
 
         self.empty_label = QtWidgets.QLabel("")
         self.empty_label = QtWidgets.QLabel("")
-        self.empty_label.setFixedWidth(70)
+        self.empty_label.setMinimumWidth(70)
 
 
         self.empty_label1 = QtWidgets.QLabel("")
         self.empty_label1 = QtWidgets.QLabel("")
-        self.empty_label1.setFixedWidth(70)
+        self.empty_label1.setMinimumWidth(70)
         self.empty_label2 = QtWidgets.QLabel("")
         self.empty_label2 = QtWidgets.QLabel("")
-        self.empty_label2.setFixedWidth(70)
+        self.empty_label2.setMinimumWidth(70)
         self.empty_label3 = QtWidgets.QLabel("")
         self.empty_label3 = QtWidgets.QLabel("")
-        self.empty_label3.setFixedWidth(70)
+        self.empty_label3.setMinimumWidth(70)
         self.empty_label4 = QtWidgets.QLabel("")
         self.empty_label4 = QtWidgets.QLabel("")
-        self.empty_label4.setFixedWidth(70)
+        self.empty_label4.setMinimumWidth(70)
         self.transform_lay.addWidget(self.empty_label)
         self.transform_lay.addWidget(self.empty_label)
 
 
         # ## Rotate Title
         # ## Rotate Title
@@ -72,7 +72,7 @@ class ToolTransform(FlatCAMTool):
               "Positive numbers for CW motion.\n"
               "Positive numbers for CW motion.\n"
               "Negative numbers for CCW motion.")
               "Negative numbers for CCW motion.")
         )
         )
-        self.rotate_label.setFixedWidth(70)
+        self.rotate_label.setMinimumWidth(70)
 
 
         self.rotate_entry = FCEntry()
         self.rotate_entry = FCEntry()
         # self.rotate_entry.setFixedWidth(70)
         # self.rotate_entry.setFixedWidth(70)
@@ -85,7 +85,7 @@ class ToolTransform(FlatCAMTool):
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected objects.")
               "the bounding box for all selected objects.")
         )
         )
-        self.rotate_button.setFixedWidth(90)
+        self.rotate_button.setMinimumWidth(90)
 
 
         form_child.addWidget(self.rotate_entry)
         form_child.addWidget(self.rotate_entry)
         form_child.addWidget(self.rotate_button)
         form_child.addWidget(self.rotate_button)
@@ -109,7 +109,7 @@ class ToolTransform(FlatCAMTool):
             _("Angle for Skew action, in degrees.\n"
             _("Angle for Skew action, in degrees.\n"
               "Float number between -360 and 359.")
               "Float number between -360 and 359.")
         )
         )
-        self.skewx_label.setFixedWidth(70)
+        self.skewx_label.setMinimumWidth(70)
         self.skewx_entry = FCEntry()
         self.skewx_entry = FCEntry()
         self.skewx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.skewx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.skewx_entry.setFixedWidth(70)
         # self.skewx_entry.setFixedWidth(70)
@@ -120,14 +120,14 @@ class ToolTransform(FlatCAMTool):
             _("Skew/shear the selected object(s).\n"
             _("Skew/shear the selected object(s).\n"
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected objects."))
               "the bounding box for all selected objects."))
-        self.skewx_button.setFixedWidth(90)
+        self.skewx_button.setMinimumWidth(90)
 
 
         self.skewy_label = QtWidgets.QLabel(_("Angle Y:"))
         self.skewy_label = QtWidgets.QLabel(_("Angle Y:"))
         self.skewy_label.setToolTip(
         self.skewy_label.setToolTip(
             _("Angle for Skew action, in degrees.\n"
             _("Angle for Skew action, in degrees.\n"
               "Float number between -360 and 359.")
               "Float number between -360 and 359.")
         )
         )
-        self.skewy_label.setFixedWidth(70)
+        self.skewy_label.setMinimumWidth(70)
         self.skewy_entry = FCEntry()
         self.skewy_entry = FCEntry()
         self.skewy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.skewy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.skewy_entry.setFixedWidth(70)
         # self.skewy_entry.setFixedWidth(70)
@@ -138,7 +138,7 @@ class ToolTransform(FlatCAMTool):
             _("Skew/shear the selected object(s).\n"
             _("Skew/shear the selected object(s).\n"
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected objects."))
               "the bounding box for all selected objects."))
-        self.skewy_button.setFixedWidth(90)
+        self.skewy_button.setMinimumWidth(90)
 
 
         form1_child_1.addWidget(self.skewx_entry)
         form1_child_1.addWidget(self.skewx_entry)
         form1_child_1.addWidget(self.skewx_button)
         form1_child_1.addWidget(self.skewx_button)
@@ -165,7 +165,7 @@ class ToolTransform(FlatCAMTool):
         self.scalex_label.setToolTip(
         self.scalex_label.setToolTip(
             _("Factor for Scale action over X axis.")
             _("Factor for Scale action over X axis.")
         )
         )
-        self.scalex_label.setFixedWidth(70)
+        self.scalex_label.setMinimumWidth(70)
         self.scalex_entry = FCEntry()
         self.scalex_entry = FCEntry()
         self.scalex_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.scalex_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.scalex_entry.setFixedWidth(70)
         # self.scalex_entry.setFixedWidth(70)
@@ -176,13 +176,13 @@ class ToolTransform(FlatCAMTool):
             _("Scale the selected object(s).\n"
             _("Scale the selected object(s).\n"
               "The point of reference depends on \n"
               "The point of reference depends on \n"
               "the Scale reference checkbox state."))
               "the Scale reference checkbox state."))
-        self.scalex_button.setFixedWidth(90)
+        self.scalex_button.setMinimumWidth(90)
 
 
         self.scaley_label = QtWidgets.QLabel(_("Factor Y:"))
         self.scaley_label = QtWidgets.QLabel(_("Factor Y:"))
         self.scaley_label.setToolTip(
         self.scaley_label.setToolTip(
             _("Factor for Scale action over Y axis.")
             _("Factor for Scale action over Y axis.")
         )
         )
-        self.scaley_label.setFixedWidth(70)
+        self.scaley_label.setMinimumWidth(70)
         self.scaley_entry = FCEntry()
         self.scaley_entry = FCEntry()
         self.scaley_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.scaley_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.scaley_entry.setFixedWidth(70)
         # self.scaley_entry.setFixedWidth(70)
@@ -193,7 +193,7 @@ class ToolTransform(FlatCAMTool):
             _("Scale the selected object(s).\n"
             _("Scale the selected object(s).\n"
               "The point of reference depends on \n"
               "The point of reference depends on \n"
               "the Scale reference checkbox state."))
               "the Scale reference checkbox state."))
-        self.scaley_button.setFixedWidth(90)
+        self.scaley_button.setMinimumWidth(90)
 
 
         self.scale_link_cb = FCCheckBox()
         self.scale_link_cb = FCCheckBox()
         self.scale_link_cb.set_value(True)
         self.scale_link_cb.set_value(True)
@@ -201,7 +201,7 @@ class ToolTransform(FlatCAMTool):
         self.scale_link_cb.setToolTip(
         self.scale_link_cb.setToolTip(
             _("Scale the selected object(s)\n"
             _("Scale the selected object(s)\n"
               "using the Scale Factor X for both axis."))
               "using the Scale Factor X for both axis."))
-        self.scale_link_cb.setFixedWidth(70)
+        self.scale_link_cb.setMinimumWidth(70)
 
 
         self.scale_zero_ref_cb = FCCheckBox()
         self.scale_zero_ref_cb = FCCheckBox()
         self.scale_zero_ref_cb.set_value(True)
         self.scale_zero_ref_cb.set_value(True)
@@ -239,7 +239,7 @@ class ToolTransform(FlatCAMTool):
         self.offx_label.setToolTip(
         self.offx_label.setToolTip(
             _("Value for Offset action on X axis.")
             _("Value for Offset action on X axis.")
         )
         )
-        self.offx_label.setFixedWidth(70)
+        self.offx_label.setMinimumWidth(70)
         self.offx_entry = FCEntry()
         self.offx_entry = FCEntry()
         self.offx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.offx_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.offx_entry.setFixedWidth(70)
         # self.offx_entry.setFixedWidth(70)
@@ -250,13 +250,13 @@ class ToolTransform(FlatCAMTool):
             _("Offset the selected object(s).\n"
             _("Offset the selected object(s).\n"
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected objects.\n"))
               "the bounding box for all selected objects.\n"))
-        self.offx_button.setFixedWidth(90)
+        self.offx_button.setMinimumWidth(90)
 
 
         self.offy_label = QtWidgets.QLabel(_("Value Y:"))
         self.offy_label = QtWidgets.QLabel(_("Value Y:"))
         self.offy_label.setToolTip(
         self.offy_label.setToolTip(
             _("Value for Offset action on Y axis.")
             _("Value for Offset action on Y axis.")
         )
         )
-        self.offy_label.setFixedWidth(70)
+        self.offy_label.setMinimumWidth(70)
         self.offy_entry = FCEntry()
         self.offy_entry = FCEntry()
         self.offy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.offy_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.offy_entry.setFixedWidth(70)
         # self.offy_entry.setFixedWidth(70)
@@ -267,7 +267,7 @@ class ToolTransform(FlatCAMTool):
             _("Offset the selected object(s).\n"
             _("Offset the selected object(s).\n"
               "The point of reference is the middle of\n"
               "The point of reference is the middle of\n"
               "the bounding box for all selected objects.\n"))
               "the bounding box for all selected objects.\n"))
-        self.offy_button.setFixedWidth(90)
+        self.offy_button.setMinimumWidth(90)
 
 
         form3_child_1.addWidget(self.offx_entry)
         form3_child_1.addWidget(self.offx_entry)
         form3_child_1.addWidget(self.offx_button)
         form3_child_1.addWidget(self.offx_button)
@@ -297,7 +297,7 @@ class ToolTransform(FlatCAMTool):
             _("Flip the selected object(s) over the X axis.\n"
             _("Flip the selected object(s) over the X axis.\n"
               "Does not create a new object.\n ")
               "Does not create a new object.\n ")
         )
         )
-        self.flipx_button.setFixedWidth(100)
+        self.flipx_button.setMinimumWidth(100)
 
 
         self.flipy_button = FCButton()
         self.flipy_button = FCButton()
         self.flipy_button.set_value(_("Flip on Y"))
         self.flipy_button.set_value(_("Flip on Y"))
@@ -305,7 +305,7 @@ class ToolTransform(FlatCAMTool):
             _("Flip the selected object(s) over the X axis.\n"
             _("Flip the selected object(s) over the X axis.\n"
               "Does not create a new object.\n ")
               "Does not create a new object.\n ")
         )
         )
-        self.flipy_button.setFixedWidth(90)
+        self.flipy_button.setMinimumWidth(90)
 
 
         self.flip_ref_cb = FCCheckBox()
         self.flip_ref_cb = FCCheckBox()
         self.flip_ref_cb.set_value(True)
         self.flip_ref_cb.set_value(True)
@@ -320,7 +320,7 @@ class ToolTransform(FlatCAMTool):
               "Then click Add button to insert coordinates.\n"
               "Then click Add button to insert coordinates.\n"
               "Or enter the coords in format (x, y) in the\n"
               "Or enter the coords in format (x, y) in the\n"
               "Point Entry field and click Flip on X(Y)"))
               "Point Entry field and click Flip on X(Y)"))
-        self.flip_ref_cb.setFixedWidth(70)
+        self.flip_ref_cb.setMinimumWidth(70)
 
 
         self.flip_ref_label = QtWidgets.QLabel(_("Point:"))
         self.flip_ref_label = QtWidgets.QLabel(_("Point:"))
         self.flip_ref_label.setToolTip(
         self.flip_ref_label.setToolTip(
@@ -328,7 +328,7 @@ class ToolTransform(FlatCAMTool):
               "The 'x' in (x, y) will be used when using Flip on X and\n"
               "The 'x' in (x, y) will be used when using Flip on X and\n"
               "the 'y' in (x, y) will be used when using Flip on Y and")
               "the 'y' in (x, y) will be used when using Flip on Y and")
         )
         )
-        self.flip_ref_label.setFixedWidth(70)
+        self.flip_ref_label.setMinimumWidth(70)
         self.flip_ref_entry = EvalEntry2("(0, 0)")
         self.flip_ref_entry = EvalEntry2("(0, 0)")
         self.flip_ref_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         self.flip_ref_entry.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
         # self.flip_ref_entry.setFixedWidth(70)
         # self.flip_ref_entry.setFixedWidth(70)
@@ -339,7 +339,7 @@ class ToolTransform(FlatCAMTool):
             _("The point coordinates can be captured by\n"
             _("The point coordinates can be captured by\n"
               "left click on canvas together with pressing\n"
               "left click on canvas together with pressing\n"
               "SHIFT key. Then click Add button to insert."))
               "SHIFT key. Then click Add button to insert."))
-        self.flip_ref_button.setFixedWidth(90)
+        self.flip_ref_button.setMinimumWidth(90)
 
 
         form4_child_hlay.addStretch()
         form4_child_hlay.addStretch()
         form4_child_hlay.addWidget(self.flipx_button)
         form4_child_hlay.addWidget(self.flipx_button)