kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #15652 from kadet1090/ui-fixes

Browse Source 
Gui: Cosmetic Fixes
This commit is contained in:
Chris Hennes
2024-07-29 11:26:58 -05:00
committed by GitHub
parent 5d90969c82 484199dbce
commit 369a2f7654
16 changed files with 163 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Gui/DlgPreferencesImp.cpp
View File

@@ -287,9 +287,19 @@ PreferencePage* DlgPreferencesImp::createPreferencePage(const std::string& pageN
return nullptr;
}
auto resetMargins = [](QWidget* widget) {
widget->setContentsMargins(0, 0, 0, 0);
widget->layout()->setContentsMargins(0, 0, 0, 0);
};
// settings layout already takes care for margins, we need to reset everything to 0
page->setContentsMargins(0, 0, 0, 0);
page->layout()->setContentsMargins(0, 0, 0, 0);
resetMargins(page);
// special handling for PreferenceUiForm to reset margins for forms too
if (auto uiFormPage = qobject_cast<PreferenceUiForm*>(page)) {
resetMargins(uiFormPage->form());
}
page->setProperty(GroupNameProperty, QString::fromStdString(groupName));
page->setProperty(PageNameProperty, QString::fromStdString(pageName));
@@ -352,15 +362,20 @@ int DlgPreferencesImp::minimumPageWidth() const
int DlgPreferencesImp::minimumDialogWidth(int pageWidth) const
{
// this is additional safety spacing to ensure that everything fits with scrollbar etc.
const auto additionalMargin = style()->pixelMetric(QStyle::PM_ScrollBarExtent) + 8;
QSize size = ui->groupWidgetStack->sizeHint();
int diff = pageWidth - size.width();
int dw = width();
if (diff > 0) {
const int offset = 2;
dw += diff + offset;
}
return dw;
return dw + additionalMargin;
}
void DlgPreferencesImp::updatePageDependentWidgets()

46
src/Gui/PreferencePages/DlgSettingsNavigation.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>516</width>
<height>687</height>
<width>548</width>
<height>762</height>
</rect>
</property>
<property name="windowTitle">
@@ -65,7 +65,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>91</width>
<width>20</width>
<height>20</height>
</size>
</property>
@@ -217,6 +217,9 @@
<property name="toolTip">
<string>Opacity of the navigation cube when not focused</string>
</property>
<property name="suffix">
<string notr="true">%</string>
</property>
<property name="minimum">
<number>1</number>
</property>
@@ -226,9 +229,6 @@
<property name="value">
<number>50</number>
</property>
<property name="suffix">
<string notr="true">%</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>InactiveOpacity</cstring>
</property>
@@ -249,7 +249,7 @@
<property name="toolTip">
<string>Base color for all elements</string>
</property>
<property name="color">
<property name="color" stdset="0">
<color alpha="128">
<red>226</red>
<green>232</green>
@@ -305,16 +305,16 @@
<number>1</number>
</property>
<property name="minimum">
<double>1.0</double>
<double>1.000000000000000</double>
</property>
<property name="maximum">
<double>100.0</double>
<double>100.000000000000000</double>
</property>
<property name="singleStep">
<double>0.5</double>
<double>0.500000000000000</double>
</property>
<property name="value">
<double>5.0</double>
<double>5.000000000000000</double>
</property>
<property name="prefEntry" stdset="0">
<cstring>RotationCenterSize</cstring>
@@ -566,19 +566,7 @@ Free Turntable: the part will be rotated around the z-axis.</string>
</widget>
</item>
<item row="4" column="2">
<widget class="PrefUnitSpinBox" name="qspinNewDocScale" native="true">
<property name="minimumSize">
<size>
<width>120</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<widget class="Gui::PrefUnitSpinBox" name="qspinNewDocScale">
<property name="toolTip">
<string>Sets camera zoom for new documents.
The value is the diameter of the sphere to fit on the screen.</string>
@@ -831,6 +819,11 @@ Mouse tilting is not disabled by this setting.</string>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QWidget</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
<customwidget>
<class>Gui::ColorButton</class>
<extends>QPushButton</extends>
@@ -862,10 +855,9 @@ Mouse tilting is not disabled by this setting.</string>
<header>Gui/PrefWidgets.h</header>
</customwidget>
<customwidget>
<class>PrefUnitSpinBox</class>
<extends>QWidget</extends>
<class>Gui::PrefUnitSpinBox</class>
<extends>Gui::QuantitySpinBox</extends>
<header>Gui/PrefWidgets.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>

23
src/Gui/PropertyPage.cpp
View File

@@ -124,19 +124,19 @@ void PreferencePage::requireRestart()
PreferenceUiForm::PreferenceUiForm(const QString& fn, QWidget* parent)
: PreferencePage(parent)
, form(nullptr)
, _form(nullptr)
{
auto loader = UiLoader::newInstance();
loader->setWorkingDirectory(QFileInfo(fn).absolutePath());
QFile file(fn);
if (file.open(QFile::ReadOnly)) {
form = loader->load(&file, this);
_form = loader->load(&file, this);
}
file.close();
if (form) {
this->setWindowTitle(form->windowTitle());
if (_form) {
this->setWindowTitle(_form->windowTitle());
auto layout = new QVBoxLayout;
layout->addWidget(form);
layout->addWidget(_form);
setLayout(layout);
}
else {
@@ -155,7 +155,7 @@ void PreferenceUiForm::changeEvent(QEvent *e)
template <typename PW>
void PreferenceUiForm::loadPrefWidgets()
{
QList<PW> pw = form->findChildren<PW>();
QList<PW> pw = _form->findChildren<PW>();
for (typename QList<PW>::iterator it = pw.begin(); it != pw.end(); ++it)
(*it)->onRestore();
}
@@ -163,14 +163,14 @@ void PreferenceUiForm::loadPrefWidgets()
template <typename PW>
void PreferenceUiForm::savePrefWidgets()
{
QList<PW> pw = form->findChildren<PW>();
QList<PW> pw = _form->findChildren<PW>();
for (typename QList<PW>::iterator it = pw.begin(); it != pw.end(); ++it)
(*it)->onSave();
}
void PreferenceUiForm::loadSettings()
{
if (!form)
if (!_form)
return;
// search for all pref widgets to restore their settings
@@ -191,7 +191,7 @@ void PreferenceUiForm::loadSettings()
void PreferenceUiForm::saveSettings()
{
if (!form)
if (!_form)
return;
// search for all pref widgets to save their settings
@@ -210,6 +210,11 @@ void PreferenceUiForm::saveSettings()
savePrefWidgets<Gui::PrefQuantitySpinBox*>();
}
QWidget* Gui::Dialog::PreferenceUiForm::form()
{
return _form;
}
void PreferencePage::resetSettingsToDefaults()
{
auto prefs = this->findChildren<QObject*>();

8
src/Gui/PropertyPage.h
View File

@@ -75,6 +75,10 @@ public:
bool isRestartRequired() const;
void requireRestart();
// this fixes issue with wordWrap on labels affecting size hints:
// https://stackoverflow.com/questions/78276854/layout-ignoring-sizehints-when-qlabel-with-text-wrap-is-present
bool hasHeightForWidth() const override { return false; }
public Q_SLOTS:
virtual void loadSettings()=0;
@@ -102,6 +106,8 @@ public:
void loadSettings() override;
void saveSettings() override;
QWidget* form();
protected:
void changeEvent(QEvent *e) override;
@@ -112,7 +118,7 @@ private:
void savePrefWidgets();
private:
QWidget* form;
QWidget* _form;
};
/** Base class for custom pages.

16
src/Gui/Tree.cpp
View File

@@ -97,6 +97,11 @@ static bool isVisibilityIconEnabled() {
return TreeParams::getVisibilityIcon();
}
static bool isOnlyNameColumnDisplayed() {
return TreeParams::getHideInternalNames()
&& TreeParams::getHideColumn();
}
static bool isSelectionCheckBoxesEnabled() {
return TreeParams::getCheckBoxesSelection();
}
@@ -478,19 +483,18 @@ void TreeWidgetItemDelegate::paint(QPainter *painter,
auto tree = static_cast<TreeWidget*>(parent());
auto style = tree->style();
// If the second column is not shown, we'll trim the color background when
// If only the first column is shown, we'll trim the color background when
// rendering as transparent overlay.
bool trimBG = TreeParams::getHideColumn() || TreeParams::getHideInternalNames();
bool trimColumnSize = isOnlyNameColumnDisplayed();
if (index.column() == 0) {
if (tree->testAttribute(Qt::WA_NoSystemBackground)
&& (trimBG || (opt.backgroundBrush.style() == Qt::NoBrush
&& (trimColumnSize || (opt.backgroundBrush.style() == Qt::NoBrush
&& _TreeItemBackground.style() != Qt::NoBrush)))
{
QRect rect = calculateItemRect(option);
if (trimBG && opt.backgroundBrush.style() == Qt::NoBrush) {
if (trimColumnSize && opt.backgroundBrush.style() == Qt::NoBrush) {
painter->fillRect(rect, _TreeItemBackground);
} else if (!opt.state.testFlag(QStyle::State_Selected)) {
painter->fillRect(rect, _TreeItemBackground);
@@ -527,7 +531,7 @@ void TreeWidgetItemDelegate::initStyleOption(QStyleOptionViewItem *option,
);
}
if (TreeParams::getHideColumn()) {
if (isOnlyNameColumnDisplayed()) {
option->rect = calculateItemRect(*option);
// we need to extend this shape a bit, 3px on each side

17
src/Mod/AddonManager/AddonManagerOptions.ui
View File

@@ -7,13 +7,16 @@
<x>0</x>
<y>0</y>
<width>757</width>
<height>621</height>
<height>783</height>
</rect>
</property>
<property name="windowTitle">
<string>Addon manager options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="Gui::PrefCheckBox" name="guiprefcheckboxcheckupdates">
<property name="toolTip">
@@ -298,12 +301,6 @@ installed addons will be checked for available updates</string>
</item>
<item>
<widget class="Gui::PrefLineEdit" name="guipreflineedituserproxy">
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="prefEntry" stdset="0">
<cstring>ProxyUrl</cstring>
</property>
@@ -332,15 +329,15 @@ installed addons will be checked for available updates</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>The URL for the Addon Score data (see Addon Manager wiki page for formatting and hosting details).</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>AddonsScoreURL</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Addons</cstring>
</property>
<property name="toolTip">
<string>The URL for the Addon Score data (see Addon Manager wiki page for formatting and hosting details).</string>
</property>
</widget>
</item>
</layout>

11
src/Mod/BIM/Resources/ui/preferences-ifc-export.ui
View File

@@ -17,16 +17,7 @@
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>9</number>
</property>
<item>

11
src/Mod/BIM/Resources/ui/preferences-ifc.ui
View File

@@ -17,16 +17,7 @@
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>9</number>
</property>
<item>

11
src/Mod/Draft/Resources/ui/preferences-dxf.ui
View File

@@ -17,16 +17,7 @@
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>9</number>
</property>
<item>

25
src/Mod/Material/Gui/DlgSettingsDefaultMaterial.ui
View File

@@ -21,11 +21,34 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="MatGui::PrefMaterialTreeWidget" name="widgetMaterial" native="true"/>
<widget class="MatGui::PrefMaterialTreeWidget" name="widgetMaterial" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>

12
src/Mod/Material/Gui/DlgSettingsMaterial.ui
View File

@@ -131,18 +131,6 @@ will be listed as available.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="prefEntry" stdset="0">
<cstring>CustomMaterialsDir</cstring>
</property>

123
src/Mod/Part/Gui/DlgExportStep.ui
View File

@@ -14,33 +14,30 @@
<string notr="true">STEP</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Export</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Scheme</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Units for export of STEP</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<item row="5" column="1">
<widget class="QComboBox" name="comboBoxUnits">
<item>
<property name="text">
@@ -59,30 +56,49 @@
</item>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="checkBoxPcurves">
<property name="text">
<string>Write out curves in parametric space of surface</string>
</property>
<item row="6" column="1">
<widget class="QComboBox" name="comboBoxSchema">
<item>
<property name="text">
<string notr="true">AP203</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AP214 Committee Draft</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AP214 Draft International Standard</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AP214 International Standard</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AP242 Draft International Standard</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxExportHiddenObj">
<property name="toolTip">
<string>Uncheck this to skip invisible objects when exporting, which is useful for CADs that do not support invisibility STEP styling.</string>
</property>
<item row="4" column="0" colspan="2">
<widget class="Gui::PrefCheckBox" name="checkBoxExportLegacy">
<property name="text">
<string>Export invisible objects</string>
<string>Use legacy export function</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExportHiddenObject</cstring>
<cstring>ExportLegacy</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Import</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="3" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxKeepPlacement">
<property name="toolTip">
<string>Check this option to keep the placement information when exporting
@@ -101,55 +117,27 @@ it inside the Placement property.</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxExportLegacy">
<item row="2" column="0" colspan="2">
<widget class="Gui::PrefCheckBox" name="checkBoxExportHiddenObj">
<property name="toolTip">
<string>Uncheck this to skip invisible objects when exporting, which is useful for CADs that do not support invisibility STEP styling.</string>
</property>
<property name="text">
<string>Use legacy export function</string>
<string>Export invisible objects</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExportLegacy</cstring>
<cstring>ExportHiddenObject</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Import</cstring>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Scheme</string>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxPcurves">
<property name="text">
<string>Write out curves in parametric space of surface</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QComboBox" name="comboBoxSchema">
<item>
<property name="text">
<string notr="true">AP203</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AP214 Committee Draft</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AP214 Draft International Standard</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AP214 International Standard</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">AP242 Draft International Standard</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
@@ -165,7 +153,6 @@ it inside the Placement property.</string>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>comboBoxUnits</tabstop>
<tabstop>checkBoxPcurves</tabstop>
<tabstop>checkBoxExportHiddenObj</tabstop>
</tabstops>

72
src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui
View File

@@ -22,18 +22,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>Advanced</string>
</property>
@@ -48,12 +36,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -109,12 +91,6 @@
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Size of selection area around edges
Each unit is approx. 0.1 mm wide</string>
@@ -138,18 +114,6 @@ Each unit is approx. 0.1 mm wide</string>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_5">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Edge Fuzz</string>
</property>
@@ -179,12 +143,6 @@ Each unit is approx. 0.1 mm wide</string>
</item>
<item row="10" column="2">
<widget class="Gui::PrefSpinBox" name="sbMaxPat">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="toolTip">
<string>Maximum hatch line segments to use
when hatching a face with a PAT pattern</string>
@@ -214,12 +172,6 @@ when hatching a face with a PAT pattern</string>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_4">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Mark Fuzz</string>
</property>
@@ -252,12 +204,6 @@ when hatching a face with a PAT pattern</string>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Selection area around center marks
Each unit is approx. 0.1 mm wide</string>
@@ -288,12 +234,6 @@ Each unit is approx. 0.1 mm wide</string>
</item>
<item row="9" column="2">
<widget class="Gui::PrefSpinBox" name="sbMaxTiles">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="toolTip">
<string>Limit of 64x64 pixel SVG tiles used to hatch a single face.
For large scalings you might get an error about too many SVG tiles.
@@ -330,12 +270,6 @@ Then you need to increase the tile limit.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="toolTip">
<string>Dump intermediate results during Detail view processing</string>
</property>
@@ -358,12 +292,6 @@ Then you need to increase the tile limit.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="toolTip">
<string>Highlights border of section cut in section views</string>
</property>

87
src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui
View File

@@ -22,12 +22,6 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>Annotation</string>
</property>
@@ -42,18 +36,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Length of balloon leader line kink</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<double>5.000000000000000</double>
</property>
@@ -104,12 +89,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Style for balloon leader line ends</string>
</property>
@@ -257,12 +236,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Restrict Filled Triangle line end to vertical or horizontal directions</string>
</property>
@@ -288,12 +261,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Show arc centers in printed output</string>
</property>
@@ -316,12 +283,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -352,12 +313,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -394,12 +349,6 @@
</item>
<item row="0" column="2">
<widget class="Gui::PrefComboBox" name="cbCutSurface">
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Default appearance of cut surface in section view</string>
</property>
@@ -442,12 +391,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Outline shape for detail views</string>
</property>
@@ -467,12 +410,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Shape of balloon annotations</string>
</property>
@@ -606,12 +543,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Standard to be used to draw non-continuous lines.</string>
</property>
@@ -634,12 +565,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="prefEntry" stdset="0">
<cstring>LineGroup</cstring>
</property>
@@ -748,12 +673,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="font">
<font>
<italic>false</italic>
@@ -883,6 +802,12 @@ if you are planning to use a drawing as a 1:1 cutting guide.
<property name="toolTip">
<string>Style of line to be used in BrokenView.</string>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="prefEntry" stdset="0">
<cstring>LineStyleBreak</cstring>
</property>

93
src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui
View File

@@ -28,18 +28,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>Dimensions</string>
</property>
@@ -54,18 +42,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Arrowhead size</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<double>5.000000000000000</double>
</property>
@@ -97,12 +76,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Arrowhead style</string>
</property>
@@ -132,12 +105,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>184</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Standard to be used for dimensional values</string>
</property>
@@ -189,12 +156,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Append unit to dimension values</string>
</property>
@@ -211,12 +172,6 @@
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_16">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -235,18 +190,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Dimension text font size</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<double>4.000000000000000</double>
</property>
@@ -309,9 +255,6 @@ Multiplier of 'Font Size'</string>
<property name="accessibleName">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
@@ -328,12 +271,6 @@ Multiplier of 'Font Size'</string>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_LabelFont">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
@@ -361,18 +298,9 @@ Multiplier of 'Font Size'</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Number of decimals if 'Use Global Decimals' is not used</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<number>2</number>
</property>
@@ -392,12 +320,6 @@ Multiplier of 'Font Size'</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
@@ -409,9 +331,6 @@ Multiplier of 'Font Size'</string>
<property name="text">
<string notr="true">⌀</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="prefEntry" stdset="0">
<cstring>DiameterSymbol</cstring>
</property>
@@ -495,9 +414,6 @@ Multiplier of 'Font Size'</string>
<property name="toolTip">
<string>Leave blank for automatic dimension format. Use %f, %g or %w specifiers to override.</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="prefEntry" stdset="0">
<cstring>formatSpec</cstring>
</property>
@@ -528,9 +444,6 @@ Multiplier of 'Font Size'</string>
Value * linewidth is the gap.
Normally, no gap is used. If using a gap, the recommended value is 8.</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
@@ -548,9 +461,6 @@ Multiplier of 'Font Size'</string>
<string>Controls the size of the gap between the dimension point and the start of the extension line for ASME dimensions. Value * linewidth is the gap.
Normally, no gap is used. If using a gap, the recommended value is 6.</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
@@ -583,9 +493,6 @@ Multiplier of 'Font Size'</string>
<string>Controls the size of spacing between dimension line and dimension text.
Value * linewidth is the line spacing.</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<double>2.000000000000000</double>
</property>

174
src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui
View File

@@ -31,18 +31,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>200</height>
</size>
</property>
<property name="title">
<string>Drawing Update</string>
</property>
@@ -82,12 +70,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="toolTip">
<string>Whether or not a page's 'Keep Updated' property
can override the global 'Update With 3D' parameter</string>
@@ -145,12 +127,6 @@ This can slow down the response time.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -187,12 +163,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>85</height>
</size>
</property>
<property name="title">
<string>Labels</string>
</property>
@@ -201,12 +171,6 @@ for ProjectionGroups</string>
<layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0" columnstretch="1,0,1">
<item row="0" column="0">
<widget class="QLabel" name="lbl_LabelFont">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
@@ -246,18 +210,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
@@ -339,18 +291,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>85</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>500</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
@@ -391,12 +331,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>184</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Use first- or third-angle multiview projection convention</string>
</property>
@@ -434,12 +368,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>184</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Standard to be used to draw section lines. This affects the position of arrows and symbol.</string>
</property>
@@ -489,12 +417,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>481</width>
<height>225</height>
</size>
</property>
<property name="title">
<string>Files</string>
</property>
@@ -516,12 +438,6 @@ for ProjectionGroups</string>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_9">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -540,12 +456,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>191</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Preferred SVG or bitmap file for hatching. This value will also control the initial directory for choosing hatch patterns. You can use this to get hatch files from a local directory.</string>
</property>
@@ -565,12 +475,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>191</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Alternate file for personal LineGroup definition</string>
</property>
@@ -590,12 +494,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>191</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Default template file for new pages</string>
</property>
@@ -609,12 +507,6 @@ for ProjectionGroups</string>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_11">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -633,12 +525,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>191</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Default PAT pattern definition file for geometric hatching</string>
</property>
@@ -658,12 +544,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>191</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Default directory for welding symbols</string>
</property>
@@ -686,12 +566,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>191</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Starting directory for menu 'Insert Page using Template'</string>
</property>
@@ -708,12 +582,6 @@ for ProjectionGroups</string>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Template Directory</string>
</property>
@@ -743,12 +611,6 @@ for ProjectionGroups</string>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_Hatch">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -761,12 +623,6 @@ for ProjectionGroups</string>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Default Template</string>
</property>
@@ -792,12 +648,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>191</width>
<height>22</height>
</size>
</property>
<property name="toolTip">
<string>Name of the default PAT pattern</string>
</property>
@@ -817,12 +667,6 @@ for ProjectionGroups</string>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_10">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -835,12 +679,6 @@ for ProjectionGroups</string>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_8">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<italic>true</italic>
@@ -945,18 +783,6 @@ for ProjectionGroups</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>100</height>
</size>
</property>
<property name="title">
<string>Selection</string>
</property>