From d18f3bce47c13952622a73d400df75148c6b045f Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Mon, 11 May 2026 20:23:29 -0700 Subject: [PATCH] [VisualDatabaseDisplayWidget] Refactor: Make all fields private (#6875) --- .../tabs/tab_visual_database_display.h | 4 ++-- ...database_display_filter_toolbar_widget.cpp | 2 +- .../visual_database_display_widget.cpp | 5 +++++ .../visual_database_display_widget.h | 22 ++++++++++++++----- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h index 66f38fb3d..4fe4d3e8f 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h +++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h @@ -23,8 +23,8 @@ public: void retranslateUi() override; [[nodiscard]] QString getTabText() const override { - return visualDatabaseDisplayWidget->displayModeButton->isChecked() ? tr("Database Display") - : tr("Visual Database Display"); + return visualDatabaseDisplayWidget->isVisualDisplayMode() ? tr("Visual Database Display") + : tr("Database Display"); } }; diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp index 3cc1bf23b..790ac771a 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp @@ -101,7 +101,7 @@ void VisualDatabaseDisplayFilterToolbarWidget::initialize() filterLayout->setAlignment(Qt::AlignLeft); // create settings widgets - auto filterModel = visualDatabaseDisplay->filterModel; + auto filterModel = visualDatabaseDisplay->getFilterModel(); saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel); nameFilterWidget = diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index b9f8dab51..25b3c33f8 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -237,6 +237,11 @@ void VisualDatabaseDisplayWidget::updateSearch(const QString &search) const QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); } +bool VisualDatabaseDisplayWidget::isVisualDisplayMode() const +{ + return !displayModeButton->isChecked(); +} + void VisualDatabaseDisplayWidget::onSearchModelChanged() { if (flowWidget->isVisible()) { diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index 3aa8d7f8e..5c112b4e4 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -62,12 +62,15 @@ public: return databaseView; } - QWidget *searchContainer; - QHBoxLayout *searchLayout; - SearchLineEdit *searchEdit; - QPushButton *displayModeButton; - FilterTreeModel *filterModel; - VisualDatabaseDisplayColorFilterWidget *colorFilterWidget; + FilterTreeModel *getFilterModel() + { + return filterModel; + } + + /** + * @return False if the widget is in database display mode and true if it's in visual display mode + */ + bool isVisualDisplayMode() const; public slots: void onSearchModelChanged(); @@ -88,6 +91,13 @@ protected slots: void onDisplayModeChanged(bool checked); private: + QWidget *searchContainer; + QHBoxLayout *searchLayout; + SearchLineEdit *searchEdit; + QPushButton *displayModeButton; + FilterTreeModel *filterModel; + VisualDatabaseDisplayColorFilterWidget *colorFilterWidget; + QLabel *databaseLoadIndicator; QToolButton *clearFilterWidget;