Michel2/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad.git synced 2026-07-27 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed find color checkbox.

Browse Source
This commit is contained in:
Leonardo Zide
2021-01-31 17:32:38 -08:00
parent dc0ffbc8bb
commit c182daa10d
10 changed files with 197 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_findreplacewidget.cpp
+14 -20
View File
@@ -20,10 +20,7 @@ lcFindReplaceWidget::lcFindReplaceWidget(QWidget* Parent, lcModel* Model, bool R
Layout->addWidget(new QLabel(tr("Find:")), 0, 0);
QCheckBox* FindColorCheckBox = new QCheckBox(this);
Layout->addWidget(FindColorCheckBox, 0, 1);
lcQColorPicker* FindColorPicker = new lcQColorPicker(this);
lcQColorPicker* FindColorPicker = new lcQColorPicker(this, true);
Layout->addWidget(FindColorPicker, 0, 2);
mFindPartComboBox = new QComboBox(this);
@@ -41,19 +38,10 @@ lcFindReplaceWidget::lcFindReplaceWidget(QWidget* Parent, lcModel* Model, bool R
FindAllButton ->setDefaultAction(gMainWindow->mActions[LC_EDIT_FIND_ALL]);
Layout->addWidget(FindAllButton, 0, 6);
connect(FindColorCheckBox, &QCheckBox::toggled, [this](bool Checked)
{
mFindReplaceParams.MatchColor = Checked;
});
connect(FindColorPicker, &lcQColorPicker::colorChanged, [this](int ColorIndex)
{
mFindReplaceParams.ColorIndex = ColorIndex;
});
connect(FindColorPicker, &lcQColorPicker::colorChanged, this, &lcFindReplaceWidget::FindColorIndexChanged);
connect(mFindPartComboBox->lineEdit(), &QLineEdit::returnPressed, gMainWindow->mActions[LC_EDIT_FIND_NEXT], &QAction::trigger);
connect(mFindPartComboBox->lineEdit(), &QLineEdit::textEdited, this, &lcFindReplaceWidget::FindTextEdited);
connect(mFindPartComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &lcFindReplaceWidget::FindIndexChanged);
connect(mFindPartComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &lcFindReplaceWidget::FindActivated);
QCheckBox* ReplaceColorCheckBox = nullptr;
lcQColorPicker* ReplaceColorPicker = nullptr;
@@ -139,37 +127,43 @@ lcFindReplaceWidget::lcFindReplaceWidget(QWidget* Parent, lcModel* Model, bool R
if (Focus)
{
mFindReplaceParams.FindInfo = Focus->mPieceInfo;
mFindReplaceParams.FindColorIndex = Focus->GetColorIndex();
mFindReplaceParams.ColorIndex = Focus->GetColorIndex();
FindColorCheckBox->setChecked(true);
FindColorPicker->setCurrentColor(mFindReplaceParams.ColorIndex);
FindColorPicker->setCurrentColor(mFindReplaceParams.FindColorIndex);
mFindPartComboBox->setCurrentIndex(mFindPartComboBox->findData(QVariant::fromValue((void*)mFindReplaceParams.FindInfo)));
if (Replace)
{
ReplaceColorCheckBox->setChecked(true);
ReplaceColorPicker->setCurrentColor(mFindReplaceParams.ColorIndex);
ReplaceColorPicker->setCurrentColor(mFindReplaceParams.FindColorIndex);
ReplacePartCheckBox->setChecked(true);
ReplacePartComboBox->setCurrentIndex(ReplacePartComboBox->findData(QVariant::fromValue((void*)mFindReplaceParams.FindInfo)));
}
}
else
{
FindColorPicker->setCurrentColor(lcGetColorIndex(LC_COLOR_NOCOLOR));
mFindPartComboBox->setEditText(QString());
}
mFindPartComboBox->setFocus();
adjustSize();
move(1, 1);
show();
}
void lcFindReplaceWidget::FindColorIndexChanged(int ColorIndex)
{
mFindReplaceParams.FindColorIndex = ColorIndex;
}
void lcFindReplaceWidget::FindTextEdited(const QString& Text)
{
mFindReplaceParams.FindString = Text;
mFindReplaceParams.FindInfo = nullptr;
}
void lcFindReplaceWidget::FindIndexChanged(int Index)
void lcFindReplaceWidget::FindActivated(int Index)
{
mFindReplaceParams.FindString.clear();
mFindReplaceParams.FindInfo = (PieceInfo*)mFindPartComboBox->itemData(Index).value<void*>();