Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-13 08:01:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed Stud Style checkbox and renamed options to match LDraw.

Browse source
This commit is contained in:
Leonardo Zide 2021-01-22 13:49:10 -08:00
parent eb70a09961
commit 590cce8a77
3 changed files with 54 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
qt/lc_qpreferencesdialog.cpp
View file

@ -162,16 +162,9 @@ lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogO
ui->PreviewViewSphereSizeCombo->setCurrentIndex(0);
if (!lcGetPiecesLibrary()->SupportsStudStyle())
{
ui->studStyle->setEnabled(false);
ui->studStyleCombo->setEnabled(false);
}
ui->studStyle->setChecked(mOptions->StudStyle);
if (ui->studStyle->isChecked())
ui->studStyleCombo->setCurrentIndex(mOptions->StudStyle - 1);
else
ui->studStyleCombo->setCurrentIndex(mOptions->StudStyle);
ui->studStyleCombo->setCurrentIndex(mOptions->StudStyle);
if (!gSupportsShaderObjects)
ui->ShadingMode->removeItem(static_cast<int>(lcShadingMode::DefaultLights));
@ -203,7 +196,6 @@ lcQPreferencesDialog::lcQPreferencesDialog(QWidget* Parent, lcPreferencesDialogO
SetButtonPixmap(mOptions->Preferences.mViewSphereTextColor, ui->ViewSphereTextColorButton);
SetButtonPixmap(mOptions->Preferences.mViewSphereHighlightColor, ui->ViewSphereHighlightColorButton);
on_studStyle_toggled();
on_antiAliasing_toggled();
on_edgeLines_toggled();
on_LineWidthSlider_valueChanged();
@ -303,10 +295,7 @@ void lcQPreferencesDialog::accept()
mOptions->Preferences.mShadingMode = (lcShadingMode)ui->ShadingMode->currentIndex();
if (ui->studStyleCombo->isEnabled())
mOptions->StudStyle = ui->studStyleCombo->currentIndex() + 1;
else
mOptions->StudStyle = 0;
mOptions->StudStyle = ui->studStyleCombo->currentIndex();
mOptions->Preferences.mDrawPreviewAxis = ui->PreviewAxisIconCheckBox->isChecked();
mOptions->Preferences.mPreviewViewSphereEnabled = ui->PreviewViewSphereSizeCombo->currentIndex() > 0;
@ -504,12 +493,6 @@ void lcQPreferencesDialog::ColorButtonClicked()
((QToolButton*)Button)->setIcon(pix);
}
void lcQPreferencesDialog::on_studStyle_toggled()
{
if (lcGetPiecesLibrary()->SupportsStudStyle())
ui->studStyleCombo->setEnabled(ui->studStyle->isChecked());
}
void lcQPreferencesDialog::on_antiAliasing_toggled()
{
ui->antiAliasingSamples->setEnabled(ui->antiAliasing->isChecked());

1
qt/lc_qpreferencesdialog.h
View file

@ -94,7 +94,6 @@ public slots:
void on_MouseImportButton_clicked();
void on_MouseExportButton_clicked();
void on_mouseReset_clicked();
void on_studStyle_toggled();
void MouseTreeItemChanged(QTreeWidgetItem* Current);
private:

100
qt/lc_qpreferencesdialog.ui
View file

@ -386,52 +386,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="studStyleCombo">
<item>
<property name="text">
<string>1 LDraw Single Wire</string>
</property>
</item>
<item>
<property name="text">
<string>2 LDraw Double Wire</string>
</property>
</item>
<item>
<property name="text">
<string>3 LDraw Raised Floating</string>
</property>
</item>
<item>
<property name="text">
<string>4 LDraw Raised Rounded </string>
</property>
</item>
<item>
<property name="text">
<string>5 LDraw Subtle Rounded</string>
</property>
</item>
<item>
<property name="text">
<string>6 LEGO Without Logo</string>
</property>
</item>
<item>
<property name="text">
<string>7 LEGO Single Wire</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="studStyle">
<property name="text">
<string>Stud Style</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="antiAliasing">
<property name="text">
@ -532,6 +486,57 @@
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QComboBox" name="studStyleCombo">
<item>
<property name="text">
<string>Plain</string>
</property>
</item>
<item>
<property name="text">
<string>Thin Lines Logo</string>
</property>
</item>
<item>
<property name="text">
<string>Outline Logo</string>
</property>
</item>
<item>
<property name="text">
<string>Sharp Top Logo</string>
</property>
</item>
<item>
<property name="text">
<string>Rounded Top Logo</string>
</property>
</item>
<item>
<property name="text">
<string>Flattened Logo</string>
</property>
</item>
<item>
<property name="text">
<string>High Contrast</string>
</property>
</item>
<item>
<property name="text">
<string>High Contrast with Logo</string>
</property>
</item>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>Stud Style</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -1703,8 +1708,6 @@
<tabstop>RestoreTabLayout</tabstop>
<tabstop>antiAliasing</tabstop>
<tabstop>antiAliasingSamples</tabstop>
<tabstop>studStyle</tabstop>
<tabstop>studStyleCombo</tabstop>
<tabstop>edgeLines</tabstop>
<tabstop>LineWidthSlider</tabstop>
<tabstop>MeshLOD</tabstop>
@ -1713,6 +1716,7 @@
<tabstop>FadeStepsColor</tabstop>
<tabstop>HighlightNewParts</tabstop>
<tabstop>HighlightNewPartsColor</tabstop>
<tabstop>studStyleCombo</tabstop>
<tabstop>ShadingMode</tabstop>
<tabstop>ViewSphereSizeCombo</tabstop>
<tabstop>ViewSphereLocationCombo</tabstop>