Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-28 12:50:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove search button

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-05-30 00:14:37 +03:00
parent 6d60a6f4e3
commit 469f051e30
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
9 changed files with 29 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/ui/pages/modplatform/ModPage.cpp
View File

@ -58,7 +58,6 @@ namespace ResourceDownload {
ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
{
connect(m_ui->searchButton, &QPushButton::clicked, this, &ModPage::triggerSearch);
connect(m_ui->resourceFilterButton, &QPushButton::clicked, this, &ModPage::filterMods);
connect(m_ui->packView, &QListView::doubleClicked, this, &ModPage::onResourceSelected);
}
@ -68,16 +67,17 @@ void ModPage::setFilterWidget(unique_qobject_ptr<ModFilterWidget>& widget)
if (m_filter_widget)
disconnect(m_filter_widget.get(), nullptr, nullptr, nullptr);
m_ui->splitter->replaceWidget(0, widget.get());
auto old = m_ui->splitter->replaceWidget(0, widget.get());
// because we replaced the widget we also need to delete it
if (old) {
delete old;
}
m_filter_widget.swap(widget);
m_filter = m_filter_widget->getFilter();
connect(m_filter_widget.get(), &ModFilterWidget::filterChanged, this, &ModPage::triggerSearch);
connect(m_filter_widget.get(), &ModFilterWidget::filterChanged, this,
[&] { m_ui->searchButton->setStyleSheet("text-decoration: underline"); });
connect(m_filter_widget.get(), &ModFilterWidget::filterUnchanged, this,
[&] { m_ui->searchButton->setStyleSheet("text-decoration: none"); });
prepareProviderCategories();
}

1
launcher/ui/pages/modplatform/ResourcePackPage.cpp
View File

@ -15,7 +15,6 @@ namespace ResourceDownload {
ResourcePackResourcePage::ResourcePackResourcePage(ResourceDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
{
connect(m_ui->searchButton, &QPushButton::clicked, this, &ResourcePackResourcePage::triggerSearch);
connect(m_ui->packView, &QListView::doubleClicked, this, &ResourcePackResourcePage::onResourceSelected);
}

9
launcher/ui/pages/modplatform/ResourcePage.cpp
View File

@ -67,11 +67,18 @@ ResourcePage::ResourcePage(ResourceDownloadDialog* parent, BaseInstance& base_in
connect(&m_search_timer, &QTimer::timeout, this, &ResourcePage::triggerSearch);
// hide both progress bars to prevent weird artifact
m_ui->fetchProgress->hide();
m_fetch_progress.hide();
m_fetch_progress.hideIfInactive(true);
m_fetch_progress.setFixedHeight(24);
m_fetch_progress.progressFormat("");
layout()->replaceWidget(m_ui->fetchProgress, &m_fetch_progress);
auto old = layout()->replaceWidget(m_ui->fetchProgress, &m_fetch_progress);
// because we replaced the widget we also need to delete it
if (old) {
delete old;
}
m_ui->packView->setItemDelegate(new ProjectItemDelegate(this));
m_ui->packView->installEventFilter(this);

2
launcher/ui/pages/modplatform/ResourcePage.h
View File

@ -84,7 +84,7 @@ class ResourcePage : public QWidget, public BasePage {
bool hasSelectedPacks() { return !(m_model->selectedPacks().isEmpty()); }
protected slots:
virtual void triggerSearch() {}
virtual void triggerSearch() = 0;
void onSelectionChanged(QModelIndex first, QModelIndex second);
void onVersionSelectionChanged(QString data);

36
launcher/ui/pages/modplatform/ResourcePage.ui
View File

@ -10,15 +10,8 @@
<height>685</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="ProgressWidget" name="fetchProgress" native="true">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="resourceFilterButton">
@ -30,19 +23,19 @@
<item>
<widget class="QLineEdit" name="searchEdit"/>
</item>
<item>
<widget class="QPushButton" name="searchButton">
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<item>
<widget class="ProgressWidget" name="fetchProgress" native="true">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="childrenCollapsible">
<bool>false</bool>
@ -50,7 +43,7 @@
<widget class="QWidget" name="filterWidget" native="true"/>
<widget class="QListView" name="packView">
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
@ -72,7 +65,7 @@
</widget>
</widget>
</item>
<item row="4" column="0">
<item>
<layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0">
<item row="0" column="2">
<widget class="QComboBox" name="versionSelectionBox"/>
@ -83,7 +76,7 @@
<string>Version selected:</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@ -111,7 +104,6 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>searchButton</tabstop>
<tabstop>packView</tabstop>
<tabstop>packDescription</tabstop>
<tabstop>sortByBox</tabstop>

1
launcher/ui/pages/modplatform/ShaderPackPage.cpp
View File

@ -16,7 +16,6 @@ namespace ResourceDownload {
ShaderPackResourcePage::ShaderPackResourcePage(ShaderPackDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
{
connect(m_ui->searchButton, &QPushButton::clicked, this, &ShaderPackResourcePage::triggerSearch);
connect(m_ui->packView, &QListView::doubleClicked, this, &ShaderPackResourcePage::onResourceSelected);
}

1
launcher/ui/pages/modplatform/TexturePackPage.h
View File

@ -41,7 +41,6 @@ class TexturePackResourcePage : public ResourcePackResourcePage {
protected:
TexturePackResourcePage(TexturePackDownloadDialog* dialog, BaseInstance& instance) : ResourcePackResourcePage(dialog, instance)
{
connect(m_ui->searchButton, &QPushButton::clicked, this, &TexturePackResourcePage::triggerSearch);
connect(m_ui->packView, &QListView::doubleClicked, this, &TexturePackResourcePage::onResourceSelected);
}
};

9
launcher/ui/widgets/ModFilterWidget.cpp
View File

@ -122,7 +122,6 @@ ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended, QWi
auto ModFilterWidget::getFilter() -> std::shared_ptr<Filter>
{
m_filter_changed = false;
emit filterUnchanged();
return m_filter;
}
@ -199,8 +198,6 @@ void ModFilterWidget::onVersionFilterChanged(int)
m_filter->versions = current_list;
if (m_filter_changed)
emit filterChanged();
else
emit filterUnchanged();
}
void ModFilterWidget::onLoadersFilterChanged()
@ -218,8 +215,6 @@ void ModFilterWidget::onLoadersFilterChanged()
m_filter->loaders = loaders;
if (m_filter_changed)
emit filterChanged();
else
emit filterUnchanged();
}
void ModFilterWidget::onSideFilterChanged()
@ -240,8 +235,6 @@ void ModFilterWidget::onSideFilterChanged()
m_filter->side = side;
if (m_filter_changed)
emit filterChanged();
else
emit filterUnchanged();
}
void ModFilterWidget::onHideInstalledFilterChanged()
@ -251,8 +244,6 @@ void ModFilterWidget::onHideInstalledFilterChanged()
m_filter->hideInstalled = hide;
if (m_filter_changed)
emit filterChanged();
else
emit filterUnchanged();
}
void ModFilterWidget::onVersionFilterTextChanged(const QString& version)

1
launcher/ui/widgets/ModFilterWidget.h
View File

@ -81,7 +81,6 @@ class ModFilterWidget : public QTabWidget {
signals:
void filterChanged();
void filterUnchanged();
public slots:
void setCategories(const QList<ModPlatform::Category>&);