jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-16 23:42:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add icons and search help, proper variables for quick filter widgets.

Browse source
This commit is contained in:
Lukas Brübach 2025-03-02 11:49:57 +01:00
parent b206b3e450
commit 14d916e0f5
3 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -22,6 +22,7 @@ public:
CardDatabaseDisplayModel *databaseDisplayModel; CardDatabaseDisplayModel *databaseDisplayModel;
public slots: public slots:
void showSearchSyntaxHelp();
CardInfoPtr currentCardInfo() const; CardInfoPtr currentCardInfo() const;
void setFilterTree(FilterTree *filterTree); void setFilterTree(FilterTree *filterTree);
void clearAllDatabaseFilters(); void clearAllDatabaseFilters();
@ -42,7 +43,6 @@ private:
QWidget *centralWidget; QWidget *centralWidget;
private slots: private slots:
void showSearchSyntaxHelp();
void retranslateUi(); void retranslateUi();
void updateSearch(const QString &search); void updateSearch(const QString &search);
void updateCard(const QModelIndex &current, const QModelIndex &); void updateCard(const QModelIndex &current, const QModelIndex &);

45
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp
View file

@ -6,6 +6,7 @@
#include "../../../../game/filters/filter_tree_model.h" #include "../../../../game/filters/filter_tree_model.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "../../../../utility/card_info_comparator.h" #include "../../../../utility/card_info_comparator.h"
#include "../../pixel_map_generator.h"
#include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_info_picture_with_text_overlay_widget.h"
#include "../quick_settings/settings_button_widget.h" #include "../quick_settings/settings_button_widget.h"
#include "visual_database_display_color_filter_widget.h" #include "visual_database_display_color_filter_widget.h"
@ -36,8 +37,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
mainLayout = new QVBoxLayout(this); mainLayout = new QVBoxLayout(this);
setLayout(mainLayout); setLayout(mainLayout);
auto quickFilterWidget = new SettingsButtonWidget(this);
searchContainer = new QWidget(this); searchContainer = new QWidget(this);
searchLayout = new QHBoxLayout(searchContainer); searchLayout = new QHBoxLayout(searchContainer);
searchContainer->setLayout(searchLayout); searchContainer->setLayout(searchLayout);
@ -46,8 +45,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
searchEdit->setObjectName("searchEdit"); searchEdit->setObjectName("searchEdit");
searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)")); searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)"));
searchEdit->setClearButtonEnabled(true); searchEdit->setClearButtonEnabled(true);
// searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
// auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition); auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);
searchEdit->installEventFilter(&searchKeySignals); searchEdit->installEventFilter(&searchKeySignals);
setFocusProxy(searchEdit); setFocusProxy(searchEdit);
@ -57,24 +56,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
filterModel->setObjectName("filterModel"); filterModel->setObjectName("filterModel");
databaseDisplayModel->setFilterTree(filterModel->filterTree()); databaseDisplayModel->setFilterTree(filterModel->filterTree());
auto saveLoadWidget =
new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel, "/home/ascor/Cockatrice_presets/");
quickFilterWidget->addSettingsWidget(saveLoadWidget);
auto nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel);
quickFilterWidget->addSettingsWidget(nameFilterWidget);
auto mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
quickFilterWidget->addSettingsWidget(mainTypeFilterWidget);
auto subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
quickFilterWidget->addSettingsWidget(subTypeFilterWidget);
auto setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
quickFilterWidget->addSettingsWidget(setFilterWidget);
colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel);
connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::searchModelChanged); connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::searchModelChanged);
searchKeySignals.setObjectName("searchKeySignals"); searchKeySignals.setObjectName("searchKeySignals");
@ -87,7 +68,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
connect(&searchKeySignals, SIGNAL(onCtrlAltEnter()), this, SLOT(actAddCardToSideboard())); connect(&searchKeySignals, SIGNAL(onCtrlAltEnter()), this, SLOT(actAddCardToSideboard()));
connect(&searchKeySignals, SIGNAL(onCtrlEnter()), this, SLOT(actAddCardToSideboard())); connect(&searchKeySignals, SIGNAL(onCtrlEnter()), this, SLOT(actAddCardToSideboard()));
connect(&searchKeySignals, SIGNAL(onCtrlC()), this, SLOT(copyDatabaseCellContents()));*/ connect(&searchKeySignals, SIGNAL(onCtrlC()), this, SLOT(copyDatabaseCellContents()));*/
// connect(help, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::showSearchSyntaxHelp); connect(help, &QAction::triggered, deckEditor->databaseDisplayDockWidget,
&DeckEditorDatabaseDisplayWidget::showSearchSyntaxHelp);
/*databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this); /*databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
databaseModel->setObjectName("databaseModel"); databaseModel->setObjectName("databaseModel");
@ -112,6 +94,23 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
searchEdit->setTreeView(databaseView); searchEdit->setTreeView(databaseView);
colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel);
quickFilterWidget = new SettingsButtonWidget(this);
saveLoadWidget =
new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel, "/home/ascor/Cockatrice_presets/");
nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel);
mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
quickFilterWidget->addSettingsWidget(saveLoadWidget);
quickFilterWidget->addSettingsWidget(nameFilterWidget);
quickFilterWidget->addSettingsWidget(mainTypeFilterWidget);
quickFilterWidget->addSettingsWidget(subTypeFilterWidget);
quickFilterWidget->addSettingsWidget(setFilterWidget);
searchLayout->addWidget(colorFilterWidget); searchLayout->addWidget(colorFilterWidget);
searchLayout->addWidget(quickFilterWidget); searchLayout->addWidget(quickFilterWidget);
searchLayout->addWidget(searchEdit); searchLayout->addWidget(searchEdit);

17
cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h
View file

@ -14,6 +14,11 @@
#include "../general/layout_containers/flow_widget.h" #include "../general/layout_containers/flow_widget.h"
#include "../general/layout_containers/overlap_control_widget.h" #include "../general/layout_containers/overlap_control_widget.h"
#include "visual_database_display_color_filter_widget.h" #include "visual_database_display_color_filter_widget.h"
#include "visual_database_display_filter_save_load_widget.h"
#include "visual_database_display_main_type_filter_widget.h"
#include "visual_database_display_name_filter_widget.h"
#include "visual_database_display_set_filter_widget.h"
#include "visual_database_display_sub_type_filter_widget.h"
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QTreeView> #include <QTreeView>
@ -64,6 +69,12 @@ protected slots:
void updateSearch(const QString &search); void updateSearch(const QString &search);
private: private:
SettingsButtonWidget *quickFilterWidget;
VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget;
VisualDatabaseDisplayNameFilterWidget *nameFilterWidget;
VisualDatabaseDisplayMainTypeFilterWidget *mainTypeFilterWidget;
VisualDatabaseDisplaySubTypeFilterWidget *subTypeFilterWidget;
VisualDatabaseDisplaySetFilterWidget *setFilterWidget;
KeySignals searchKeySignals; KeySignals searchKeySignals;
AbstractTabDeckEditor *deckEditor; AbstractTabDeckEditor *deckEditor;
CardDatabaseModel *databaseModel; CardDatabaseModel *databaseModel;
@ -73,9 +84,9 @@ private:
QVBoxLayout *mainLayout; QVBoxLayout *mainLayout;
QScrollArea *scrollArea; QScrollArea *scrollArea;
FlowWidget *flowWidget; FlowWidget *flowWidget;
QWidget *overlap_categories; QWidget *overlapCategories;
QVBoxLayout *overlap_categories_layout; QVBoxLayout *overlapCategoriesLayout;
OverlapControlWidget *overlap_control_widget; OverlapControlWidget *overlapControlWidget;
CardSizeWidget *cardSizeWidget; CardSizeWidget *cardSizeWidget;
QWidget *container; QWidget *container;
QTimer *debounceTimer; QTimer *debounceTimer;