Skip to content

Commit

Permalink
[Sketch] remove unused code
Browse files Browse the repository at this point in the history 
fixes bug #4522

as discussed in https://forum.freecadweb.org/viewtopic.php?f=10&t=53587&p=460823#p460777

also remove superfluous verticalSpacer
  • Loading branch information
@wwmayer
donovaly authored and wwmayer committed Dec 28, 2020
1 parent 6b017f9 commit cc29af4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 125 deletions.
16 changes: 0 additions & 16 deletions src/Mod/Sketcher/Gui/SketcherSettings.cpp
View file
Expand Up @@ -231,14 +231,6 @@ SketcherSettingsColors::SketcherSettingsColors(QWidget* parent)
: PreferencePage(parent), ui(new Ui_SketcherSettingsColors)
{
ui->setupUi(this);

// Don't need them at the moment
ui->label_16->hide();
ui->SketcherDatumWidth->hide();
ui->label_12->hide();
ui->DefaultSketcherVertexWidth->hide();
ui->label_13->hide();
ui->DefaultSketcherLineWidth->hide();
}

/**
Expand Down Expand Up @@ -272,10 +264,6 @@ void SketcherSettingsColors::saveSettings()
ui->ExprBasedConstrDimColor->onSave();
ui->DeactivatedConstrDimColor->onSave();

ui->SketcherDatumWidth->onSave();
ui->DefaultSketcherVertexWidth->onSave();
ui->DefaultSketcherLineWidth->onSave();

ui->CursorTextColor->onSave();
ui->CursorCrosshairColor->onSave();
ui->CreateLineColor->onSave();
Expand Down Expand Up @@ -303,10 +291,6 @@ void SketcherSettingsColors::loadSettings()
ui->ExprBasedConstrDimColor->onRestore();
ui->DeactivatedConstrDimColor->onRestore();

ui->SketcherDatumWidth->onRestore();
ui->DefaultSketcherVertexWidth->onRestore();
ui->DefaultSketcherLineWidth->onRestore();

ui->CursorTextColor->onRestore();
ui->CursorCrosshairColor->onRestore();
ui->CreateLineColor->onRestore();
Expand Down
113 changes: 4 additions & 109 deletions src/Mod/Sketcher/Gui/SketcherSettingsColors.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>438</width>
<height>711</height>
<height>627</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -599,111 +599,6 @@
</widget>
</item>
<item row="18" column="0">
<widget class="QLabel" name="label_16">
<property name="minimumSize">
<size>
<width>182</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Datum text size</string>
</property>
</widget>
</item>
<item row="18" column="1">
<widget class="Gui::PrefSpinBox" name="SketcherDatumWidth">
<property name="toolTip">
<string>The default line thickness for new shapes</string>
</property>
<property name="suffix">
<string>px</string>
</property>
<property name="maximum">
<number>9</number>
</property>
<property name="value">
<number>2</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>DefaultSketcherVertexWidth</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="19" column="0">
<widget class="QLabel" name="label_12">
<property name="minimumSize">
<size>
<width>182</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Default vertex size</string>
</property>
</widget>
</item>
<item row="19" column="1">
<widget class="Gui::PrefSpinBox" name="DefaultSketcherVertexWidth">
<property name="toolTip">
<string>The default line thickness for new shapes</string>
</property>
<property name="suffix">
<string>px</string>
</property>
<property name="maximum">
<number>9</number>
</property>
<property name="value">
<number>2</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>DefaultSketcherVertexWidth</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="20" column="0">
<widget class="QLabel" name="label_13">
<property name="minimumSize">
<size>
<width>182</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Default line width</string>
</property>
</widget>
</item>
<item row="20" column="1">
<widget class="Gui::PrefSpinBox" name="DefaultSketcherLineWidth">
<property name="toolTip">
<string>The default line thickness for new shapes</string>
</property>
<property name="suffix">
<string>px</string>
</property>
<property name="maximum">
<number>9</number>
</property>
<property name="value">
<number>2</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>DefaultShapeLineWidth</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="21" column="0">
<widget class="QLabel" name="label_5">
<property name="minimumSize">
<size>
Expand All @@ -716,7 +611,7 @@
</property>
</widget>
</item>
<item row="21" column="1">
<item row="18" column="1">
<widget class="Gui::PrefColorButton" name="CursorTextColor">
<property name="toolTip">
<string>Text color of the coordinates</string>
Expand All @@ -736,7 +631,7 @@
</property>
</widget>
</item>
<item row="22" column="0">
<item row="19" column="0">
<widget class="QLabel" name="label_19">
<property name="minimumSize">
<size>
Expand All @@ -749,7 +644,7 @@
</property>
</widget>
</item>
<item row="22" column="1">
<item row="19" column="1">
<widget class="Gui::PrefColorButton" name="CursorCrosshairColor">
<property name="toolTip">
<string>Color of crosshair cursor.
Expand Down

0 comments on commit cc29af4

Please sign in to comment.