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

Use PrefFontBox for TD Label Font Selection

Browse Source 
- was PrefLineEdit.
This commit is contained in:
WandererFan
2018-02-27 14:30:21 -05:00
parent 314dcaa3cd
commit 032d2feda7
2 changed files with 91 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
View File

@@ -159,29 +159,6 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_TemplateDot">
<property name="text">
<string>Template Dot Size</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="Gui::PrefDoubleSpinBox" name="dsb_TemplateDot">
<property name="toolTip">
<string>EditableText Dot Size in mm</string>
</property>
<property name="value">
<double>3.000000000000000</double>
</property>
<property name="prefEntry" stdset="0">
<cstring>TemplateDotSize</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>/Mod/TechDraw/General</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item>
@@ -603,7 +580,23 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0">
<layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0" columnstretch="0,0,0">
<item row="0" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2">
<widget class="Gui::PrefDoubleSpinBox" name="dsb_LabelSize">
<property name="toolTip">
@@ -623,22 +616,6 @@
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_LabelFont">
<property name="text">
@@ -646,19 +623,6 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="Gui::PrefLineEdit" name="le_LabelFont">
<property name="text">
<string>osifont</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>LabelFont</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/TechDraw/Labels</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
@@ -666,6 +630,73 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="Gui::PrefFontBox" name="pfb_LabelFont">
<property name="toolTip">
<string>Font for View Labels</string>
</property>
<property name="currentFont">
<font>
<family>osifont</family>
</font>
</property>
<property name="prefEntry" stdset="0">
<cstring>LabelFont</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>/Mod/TechDraw/Labels</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_TemplateDot">
<property name="text">
<string>Template Dot Size</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="Gui::PrefDoubleSpinBox" name="dsb_TemplateDot">
<property name="toolTip">
<string>EditableText Dot Size in mm</string>
</property>
<property name="value">
<double>3.000000000000000</double>
</property>
<property name="prefEntry" stdset="0">
<cstring>TemplateDotSize</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>/Mod/TechDraw/General</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer_6">
<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="2" column="1">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
@@ -740,6 +771,11 @@
<extends>QDoubleSpinBox</extends>
<header>Gui/PrefWidgets.h</header>
</customwidget>
<customwidget>
<class>Gui::PrefFontBox</class>
<extends>QFontComboBox</extends>
<header>Gui/PrefWidgets.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>

4
src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
View File

@@ -58,7 +58,7 @@ void DlgPrefsTechDrawImp::saveSettings()
pcb_Background->onSave();
pcb_Hatch->onSave();
le_LabelFont->onSave();
pfb_LabelFont->onSave();
dsb_LabelSize->onSave();
pfc_DefTemp->onSave();
@@ -85,7 +85,7 @@ void DlgPrefsTechDrawImp::loadSettings()
pcb_Background->onRestore();
pcb_Hatch->onRestore();
le_LabelFont->onRestore();
pfb_LabelFont->onRestore();
dsb_LabelSize->onRestore();
pfc_DefTemp->onRestore();