From 1b3919aca75e2e758ae54fe272e0861d58f41fd8 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 23 Oct 2020 19:03:13 +0300 Subject: [PATCH] - minor changes in the Properties Tool --- CHANGELOG.md | 1 + appTool.py | 2 +- appTools/ToolProperties.py | 13 +++++-------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 848179fb..d666463e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ CHANGELOG for FlatCAM beta - some minor changes in the AppTextEditor.py file - removed Hungarian language since it's looking like is no longer being translated - added a default properties tab which will hold a set of information's about the application +- minor changes in the Properties Tool 22.10.2020 diff --git a/appTool.py b/appTool.py index 7fc4e36c..0df3976f 100644 --- a/appTool.py +++ b/appTool.py @@ -90,7 +90,7 @@ class AppTool(QtWidgets.QWidget): # Remove anything else in the appGUI self.app.ui.tool_scroll_area.takeWidget() - # Put ourself in the appGUI + # Put ourselves in the appGUI self.app.ui.tool_scroll_area.setWidget(self) # Switch notebook to tool page diff --git a/appTools/ToolProperties.py b/appTools/ToolProperties.py index d50f140e..577b3135 100644 --- a/appTools/ToolProperties.py +++ b/appTools/ToolProperties.py @@ -35,9 +35,10 @@ class Properties(AppTool): def __init__(self, app): AppTool.__init__(self, app) - self.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Ignored) + # self.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Ignored) self.decimals = self.app.decimals + self.layout.setContentsMargins(0, 0, 0, 0) # this way I can hide/show the frame self.properties_frame = QtWidgets.QFrame() @@ -58,16 +59,12 @@ class Properties(AppTool): # """) # self.properties_box.addWidget(title_label) - # self.layout.setMargin(0) # PyQt4 - self.properties_box.setContentsMargins(0, 0, 0, 0) # PyQt5 - self.vlay = QtWidgets.QVBoxLayout() - self.properties_box.addLayout(self.vlay) - self.treeWidget = FCTree(columns=2) + self.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) self.treeWidget.setStyleSheet("QTreeWidget {border: 0px;}") - self.vlay.addWidget(self.treeWidget) - self.vlay.setStretch(0, 0) + self.properties_box.addWidget(self.treeWidget) + # self.properties_box.setStretch(0, 0) self.calculations_finished.connect(self.show_area_chull)