diff --git a/common/lc_findreplacewidget.cpp b/common/lc_findreplacewidget.cpp index e49cf958..8e4cefc6 100644 --- a/common/lc_findreplacewidget.cpp +++ b/common/lc_findreplacewidget.cpp @@ -84,7 +84,7 @@ lcFindReplaceWidget::lcFindReplaceWidget(QWidget* Parent, lcModel* Model, bool R QToolButton* CloseButton = new QToolButton(this); CloseButton->setAutoRaise(true); - CloseButton->setIcon(QIcon(":/stylesheet/close.png")); + CloseButton->setIcon(QIcon(":/stylesheet/close.svg")); CloseButton->setToolTip(tr("Close")); Layout->addWidget(CloseButton, 0, 5); diff --git a/common/lc_partselectionwidget.cpp b/common/lc_partselectionwidget.cpp index 7393316e..ae8599c4 100644 --- a/common/lc_partselectionwidget.cpp +++ b/common/lc_partselectionwidget.cpp @@ -627,7 +627,7 @@ void lcPartSelectionListView::startDrag(Qt::DropActions SupportedActions) } lcPartSelectionWidget::lcPartSelectionWidget(QWidget* Parent) - : QWidget(Parent), mFilterAction(nullptr) + : QWidget(Parent) { mSplitter = new QSplitter(this); mSplitter->setOrientation(Qt::Vertical); @@ -645,8 +645,6 @@ lcPartSelectionWidget::lcPartSelectionWidget(QWidget* Parent) mFilterCategoriesWidget = new QLineEdit(CategoriesGroupWidget); mFilterCategoriesWidget->setPlaceholderText(tr("Filter Categories")); - mFilterCategoriesAction = mFilterCategoriesWidget->addAction(QIcon(":/resources/filter.png"), QLineEdit::TrailingPosition); - connect(mFilterCategoriesAction, SIGNAL(triggered()), this, SLOT(FilterCategoriesTriggered())); FilterCategoriesLayout->addWidget(mFilterCategoriesWidget); mFilterCaseAction = new QAction(); @@ -679,8 +677,6 @@ lcPartSelectionWidget::lcPartSelectionWidget(QWidget* Parent) mFilterWidget = new QLineEdit(PartsGroupWidget); mFilterWidget->setPlaceholderText(tr("Search Parts")); - mFilterAction = mFilterWidget->addAction(QIcon(":/resources/parts_search.png"), QLineEdit::TrailingPosition); - connect(mFilterAction, SIGNAL(triggered()), this, SLOT(FilterTriggered())); SearchLayout->addWidget(mFilterWidget); QToolButton* OptionsButton = new QToolButton(); @@ -814,9 +810,18 @@ void lcPartSelectionWidget::FilterCategoriesChanged(const QString& Text) if (mFilterCategoriesAction) { if (Text.isEmpty()) - mFilterCategoriesAction->setIcon(QIcon(":/resources/filter.png")); - else - mFilterCategoriesAction->setIcon(QIcon(":/resources/parts_cancel.png")); + { + delete mFilterCategoriesAction; + mFilterCategoriesAction = nullptr; + } + } + else + { + if (!Text.isEmpty()) + { + mFilterCategoriesAction = mFilterCategoriesWidget->addAction(QIcon(":/stylesheet/close.svg"), QLineEdit::TrailingPosition); + connect(mFilterCategoriesAction, &QAction::triggered, this, &lcPartSelectionWidget::FilterCategoriesTriggered); + } } bool Hide = true; @@ -839,9 +844,18 @@ void lcPartSelectionWidget::FilterChanged(const QString& Text) if (mFilterAction) { if (Text.isEmpty()) - mFilterAction->setIcon(QIcon(":/resources/parts_search.png")); - else - mFilterAction->setIcon(QIcon(":/resources/parts_cancel.png")); + { + delete mFilterAction; + mFilterAction = nullptr; + } + } + else + { + if (!Text.isEmpty()) + { + mFilterAction = mFilterWidget->addAction(QIcon(":/stylesheet/close.svg"), QLineEdit::TrailingPosition); + connect(mFilterAction, &QAction::triggered, this, &lcPartSelectionWidget::FilterTriggered); + } } mPartsWidget->GetListModel()->SetFilter(Text); diff --git a/leocad.qrc b/leocad.qrc index b510eba2..cd75d207 100644 --- a/leocad.qrc +++ b/leocad.qrc @@ -110,8 +110,6 @@ resources/piece_show_earlier.png resources/piece_show_later.png resources/time_add_keys.png - resources/parts_search.png - resources/parts_cancel.png resources/archive.png resources/library.zip resources/studlogo1.zip diff --git a/resources/parts_cancel.png b/resources/parts_cancel.png deleted file mode 100644 index 8e01c8cc..00000000 Binary files a/resources/parts_cancel.png and /dev/null differ diff --git a/resources/parts_search.png b/resources/parts_search.png deleted file mode 100644 index 45ed87e6..00000000 Binary files a/resources/parts_search.png and /dev/null differ diff --git a/resources/stylesheet/close.png b/resources/stylesheet/close.png deleted file mode 100644 index 3e6b9d83..00000000 Binary files a/resources/stylesheet/close.png and /dev/null differ diff --git a/resources/stylesheet/close.svg b/resources/stylesheet/close.svg new file mode 100644 index 00000000..682610a9 --- /dev/null +++ b/resources/stylesheet/close.svg @@ -0,0 +1,54 @@ + + + + + + + S Close 18 N + + + diff --git a/resources/stylesheet/stylesheet.qrc b/resources/stylesheet/stylesheet.qrc index 63e20a16..0d4c75f4 100644 --- a/resources/stylesheet/stylesheet.qrc +++ b/resources/stylesheet/stylesheet.qrc @@ -6,7 +6,7 @@ branch_more.png branch_open.png branch_vline.png - close.png + close.svg undock.png diff --git a/resources/stylesheet/stylesheet.qss b/resources/stylesheet/stylesheet.qss index bfde827e..842de794 100644 --- a/resources/stylesheet/stylesheet.qss +++ b/resources/stylesheet/stylesheet.qss @@ -48,7 +48,7 @@ QTreeView::branch:open:has-children:!has-siblings { } QDockWidget { - titlebar-close-icon: url(:/stylesheet/close.png); + titlebar-close-icon: url(:/stylesheet/close.svg); titlebar-normal-icon: url(:/stylesheet/undock.png); } @@ -85,7 +85,7 @@ QDockWidget::float-button:pressed { } QTabBar::close-button { - background-image: url(:/stylesheet/close.png); + background-image: url(:/stylesheet/close.svg); background-position: center center; background-repeat: none; }