Removed action icons in the parts widget edits.

leozide · Oct 17, 2024 · e69bbf5 · e69bbf5
1 parent 9edd8f9
commit e69bbf5
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 17 deletions.
diff --git 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
@@ -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
@@ -110,8 +110,6 @@
         <file>resources/piece_show_earlier.png</file>
         <file>resources/piece_show_later.png</file>
         <file>resources/time_add_keys.png</file>
-        <file>resources/parts_search.png</file>
-        <file>resources/parts_cancel.png</file>
         <file>resources/archive.png</file>
         <file>resources/library.zip</file>
         <file>resources/studlogo1.zip</file>

diff --git a/resources/parts_cancel.png b/resources/parts_cancel.png
diff --git a/resources/parts_search.png b/resources/parts_search.png
diff --git a/resources/stylesheet/close.png b/resources/stylesheet/close.png
diff --git a/resources/stylesheet/close.svg b/resources/stylesheet/close.svg
diff --git a/resources/stylesheet/stylesheet.qrc b/resources/stylesheet/stylesheet.qrc
@@ -6,7 +6,7 @@
         <file>branch_more.png</file>
         <file>branch_open.png</file>
         <file>branch_vline.png</file>
-        <file>close.png</file>
+        <file>close.svg</file>
         <file>undock.png</file>
     </qresource>
 </RCC>
diff --git 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;
 }