mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: rename FilterWidget2 to FilterWidget

Browse source 
The name "FilterWidget2" is historical and has no meaning anymore,
since the current version has little to nothing to do with the
"second" version of the widget.

Rename the class and source files accordingly.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-09-26 11:40:54 +02:00 • committed by Dirk Hohndel
parent 068194b2e5
commit 7337ff386b
6 changed files with 53 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/CMakeLists.txt
View file

@ -27,7 +27,7 @@ set (SUBSURFACE_UI
diveplanner.ui
diveshareexportdialog.ui
downloadfromdivecomputer.ui
filterwidget2.ui
filterwidget.ui
findmovedimagesdialog.ui
importgps.ui
listfilter.ui
@ -80,8 +80,8 @@ set(SUBSURFACE_INTERFACE
downloadfromdivecomputer.h
filterconstraintwidget.cpp
filterconstraintwidget.h
filterwidget2.cpp
filterwidget2.h
filterwidget.cpp
filterwidget.h
findmovedimagesdialog.cpp
findmovedimagesdialog.h
groupedlineedit.cpp

76
desktop-widgets/filterwidget2.cpp → desktop-widgets/filterwidget.cpp
View file

@ -1,4 +1,4 @@
#include "desktop-widgets/filterwidget2.h"
#include "desktop-widgets/filterwidget.h"
#include "desktop-widgets/filterconstraintwidget.h"
#include "desktop-widgets/simplewidgets.h"
#include "desktop-widgets/mainwindow.h"
@ -8,7 +8,7 @@
#include "core/settings/qPrefUnit.h"
#include "qt-models/filterpresetmodel.h"
FilterWidget2::FilterWidget2(QWidget* parent) :
FilterWidget::FilterWidget(QWidget* parent) :
QWidget(parent),
ignoreSignal(false),
presetModified(false)
@ -31,36 +31,36 @@ FilterWidget2::FilterWidget2(QWidget* parent) :
ui.presetTable->setSelectionBehavior(QAbstractItemView::SelectRows);
ui.presetTable->setSelectionMode(QAbstractItemView::SingleSelection);
connect(ui.clear, &QToolButton::clicked, this, &FilterWidget2::clearFilter);
connect(ui.close, &QToolButton::clicked, this, &FilterWidget2::closeFilter);
connect(ui.fullText, &QLineEdit::textChanged, this, &FilterWidget2::filterChanged);
connect(ui.fulltextStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &FilterWidget2::filterChanged);
connect(ui.presetTable, &QTableView::clicked, this, &FilterWidget2::presetClicked);
connect(ui.presetTable->selectionModel(), &QItemSelectionModel::selectionChanged, this, &FilterWidget2::presetSelected);
connect(ui.clear, &QToolButton::clicked, this, &FilterWidget::clearFilter);
connect(ui.close, &QToolButton::clicked, this, &FilterWidget::closeFilter);
connect(ui.fullText, &QLineEdit::textChanged, this, &FilterWidget::filterChanged);
connect(ui.fulltextStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &FilterWidget::filterChanged);
connect(ui.presetTable, &QTableView::clicked, this, &FilterWidget::presetClicked);
connect(ui.presetTable->selectionModel(), &QItemSelectionModel::selectionChanged, this, &FilterWidget::presetSelected);
connect(&constraintModel, &FilterConstraintModel::rowsInserted, this, &FilterWidget2::constraintAdded);
connect(&constraintModel, &FilterConstraintModel::rowsRemoved, this, &FilterWidget2::constraintRemoved);
connect(&constraintModel, &FilterConstraintModel::dataChanged, this, &FilterWidget2::constraintChanged);
connect(&constraintModel, &FilterConstraintModel::modelReset, this, &FilterWidget2::constraintsReset);
connect(&constraintModel, &FilterConstraintModel::rowsInserted, this, &FilterWidget::constraintAdded);
connect(&constraintModel, &FilterConstraintModel::rowsRemoved, this, &FilterWidget::constraintRemoved);
connect(&constraintModel, &FilterConstraintModel::dataChanged, this, &FilterWidget::constraintChanged);
connect(&constraintModel, &FilterConstraintModel::modelReset, this, &FilterWidget::constraintsReset);
// QDataWidgetMapper might be the more civilized way to keep the menus up to data.
// For now, let's be blunt and fully reload the context menu if the presets list changes.
// This gives us more flexibility in populating the menus.
QAbstractItemModel *presetModel = FilterPresetModel::instance();
connect(presetModel, &QAbstractItemModel::rowsInserted, this, &FilterWidget2::updatePresetMenu);
connect(presetModel, &QAbstractItemModel::rowsRemoved, this, &FilterWidget2::updatePresetMenu);
connect(presetModel, &QAbstractItemModel::dataChanged, this, &FilterWidget2::updatePresetMenu);
connect(presetModel, &QAbstractItemModel::modelReset, this, &FilterWidget2::updatePresetMenu);
connect(presetModel, &QAbstractItemModel::rowsInserted, this, &FilterWidget::updatePresetMenu);
connect(presetModel, &QAbstractItemModel::rowsRemoved, this, &FilterWidget::updatePresetMenu);
connect(presetModel, &QAbstractItemModel::dataChanged, this, &FilterWidget::updatePresetMenu);
connect(presetModel, &QAbstractItemModel::modelReset, this, &FilterWidget::updatePresetMenu);
clearFilter();
updatePresetMenu();
}
FilterWidget2::~FilterWidget2()
FilterWidget::~FilterWidget()
{
}
void FilterWidget2::updatePresetMenu()
void FilterWidget::updatePresetMenu()
{
loadFilterPresetMenu.reset(new QMenu);
QAbstractItemModel *model = FilterPresetModel::instance();
@ -78,7 +78,7 @@ void FilterWidget2::updatePresetMenu()
ui.loadSetButton->setMenu(loadFilterPresetMenu.get());
}
void FilterWidget2::selectPreset(int i)
void FilterWidget::selectPreset(int i)
{
QAbstractItemModel *model = FilterPresetModel::instance();
QItemSelectionModel *selectionModel = ui.presetTable->selectionModel();
@ -87,7 +87,7 @@ void FilterWidget2::selectPreset(int i)
selectionModel->select(idx, QItemSelectionModel::Select | QItemSelectionModel::Rows);
}
void FilterWidget2::loadPreset(int index)
void FilterWidget::loadPreset(int index)
{
ignoreSignal = true; // When reloading the filter UI, we get numerous constraintChanged signals. Ignore them.
FilterData filter = filter_preset_get(index);
@ -97,7 +97,7 @@ void FilterWidget2::loadPreset(int index)
updateFilter();
}
void FilterWidget2::constraintAdded(const QModelIndex &parent, int first, int last)
void FilterWidget::constraintAdded(const QModelIndex &parent, int first, int last)
{
if (parent.isValid() || last < first)
return; // We only support one level
@ -111,7 +111,7 @@ void FilterWidget2::constraintAdded(const QModelIndex &parent, int first, int la
filterChanged();
}
void FilterWidget2::constraintRemoved(const QModelIndex &parent, int first, int last)
void FilterWidget::constraintRemoved(const QModelIndex &parent, int first, int last)
{
if (parent.isValid() || last < first)
return; // We only support one level
@ -121,7 +121,7 @@ void FilterWidget2::constraintRemoved(const QModelIndex &parent, int first, int
filterChanged();
}
void FilterWidget2::presetClicked(const QModelIndex &index)
void FilterWidget::presetClicked(const QModelIndex &index)
{
if (!index.isValid())
return;
@ -130,7 +130,7 @@ void FilterWidget2::presetClicked(const QModelIndex &index)
Command::removeFilterPreset(index.row());
}
void FilterWidget2::presetSelected(const QItemSelection &selected, const QItemSelection &)
void FilterWidget::presetSelected(const QItemSelection &selected, const QItemSelection &)
{
if (selected.indexes().isEmpty())
return clearFilter();
@ -140,7 +140,7 @@ void FilterWidget2::presetSelected(const QItemSelection &selected, const QItemSe
loadPreset(index.row());
}
void FilterWidget2::constraintChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
void FilterWidget::constraintChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
{
// Note: this may appear strange, but we don't update the widget if we get
// a constraint-changed signal from the model. The reason being that the user
@ -149,7 +149,7 @@ void FilterWidget2::constraintChanged(const QModelIndex &topLeft, const QModelIn
filterChanged();
}
void FilterWidget2::constraintsReset()
void FilterWidget::constraintsReset()
{
constraintWidgets.clear();
int count = constraintModel.rowCount(QModelIndex());
@ -160,7 +160,7 @@ void FilterWidget2::constraintsReset()
updateFilter();
}
void FilterWidget2::clearFilter()
void FilterWidget::clearFilter()
{
ignoreSignal = true; // Prevent signals to force filter recalculation (TODO: check if necessary)
presetModified = false;
@ -172,12 +172,12 @@ void FilterWidget2::clearFilter()
constraintModel.reload({}); // Causes a filter reload
}
void FilterWidget2::closeFilter()
void FilterWidget::closeFilter()
{
MainWindow::instance()->setApplicationState(ApplicationState::Default);
}
FilterData FilterWidget2::createFilterData() const
FilterData FilterWidget::createFilterData() const
{
FilterData filterData;
filterData.fulltextStringMode = (StringFilterMode)ui.fulltextStringMode->currentIndex();
@ -186,20 +186,20 @@ FilterData FilterWidget2::createFilterData() const
return filterData;
}
void FilterWidget2::setFilterData(const FilterData &filterData)
void FilterWidget::setFilterData(const FilterData &filterData)
{
ui.fulltextStringMode->setCurrentIndex((int)filterData.fulltextStringMode);
ui.fullText->setText(filterData.fullText.originalQuery);
constraintModel.reload(filterData.constraints);
}
void FilterWidget2::filterChanged()
void FilterWidget::filterChanged()
{
presetModified = true;
updateFilter();
}
void FilterWidget2::updateFilter()
void FilterWidget::updateFilter()
{
if (ignoreSignal)
return;
@ -209,13 +209,13 @@ void FilterWidget2::updateFilter()
updatePresetLabel();
}
int FilterWidget2::selectedPreset() const
int FilterWidget::selectedPreset() const
{
QModelIndexList selection = ui.presetTable->selectionModel()->selectedRows();
return selection.size() >= 1 ? selection[0].row() : -1;
}
void FilterWidget2::updatePresetLabel()
void FilterWidget::updatePresetLabel()
{
int presetId = selectedPreset();
QString text;
@ -227,7 +227,7 @@ void FilterWidget2::updatePresetLabel()
ui.currentSet->setText(text);
}
void FilterWidget2::on_addSetButton_clicked()
void FilterWidget::on_addSetButton_clicked()
{
// If there is a selected item, suggest that to the user.
// Thus, if the user selects an item and modify the filter,
@ -248,19 +248,19 @@ void FilterWidget2::on_addSetButton_clicked()
updatePresetLabel();
}
void FilterWidget2::showEvent(QShowEvent *event)
void FilterWidget::showEvent(QShowEvent *event)
{
QWidget::showEvent(event);
ui.fullText->setFocus();
updateFilter();
}
void FilterWidget2::hideEvent(QHideEvent *event)
void FilterWidget::hideEvent(QHideEvent *event)
{
QWidget::hideEvent(event);
}
void FilterWidget2::addConstraint(filter_constraint_type type)
void FilterWidget::addConstraint(filter_constraint_type type)
{
constraintModel.addConstraint(type);
}

15
desktop-widgets/filterwidget2.h → desktop-widgets/filterwidget.h
View file

@ -1,11 +1,10 @@
#ifndef FILTERWIDGET_2_H
#define FILTERWIDGET_2_H
#ifndef FILTERWIDGET_H
#define FILTERWIDGET_H
#include <vector>
#include <memory>
#include "ui_filterwidget2.h"
#include "ui_filterwidget.h"
#include "core/divefilter.h"
#include "qt-models/filterconstraintmodel.h"
@ -14,12 +13,12 @@ class QMenu;
class QHideEvent;
class QShowEvent;
class FilterWidget2 : public QWidget {
class FilterWidget : public QWidget {
Q_OBJECT
public:
explicit FilterWidget2(QWidget *parent = 0);
~FilterWidget2();
explicit FilterWidget(QWidget *parent = 0);
~FilterWidget();
protected:
void hideEvent(QHideEvent *event) override;
@ -41,7 +40,7 @@ private slots:
private:
bool ignoreSignal;
bool presetModified;
Ui::FilterWidget2 ui;
Ui::FilterWidget ui;
FilterConstraintModel constraintModel;
void addConstraint(filter_constraint_type type);
std::vector<std::unique_ptr<FilterConstraintWidget>> constraintWidgets;

4
desktop-widgets/filterwidget2.ui → desktop-widgets/filterwidget.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FilterWidget2</class>
<widget class="QWidget" name="FilterWidget2">
<class>FilterWidget</class>
<widget class="QWidget" name="FilterWidget">
<property name="geometry">
<rect>
<x>0</x>

2
desktop-widgets/mainwindow.cpp
View file

@ -182,7 +182,7 @@ MainWindow::MainWindow() : QMainWindow(),
registerApplicationState(ApplicationState::EditDiveSite, { { diveSiteEdit, FLAG_NONE }, { profileContainer, FLAG_DISABLED },
{ diveList, FLAG_DISABLED }, { mapWidget, FLAG_NONE } });
registerApplicationState(ApplicationState::FilterDive, { { mainTab.get(), FLAG_NONE }, { profileContainer, FLAG_NONE },
{ diveList, FLAG_NONE }, { &filterWidget2, FLAG_NONE } });
{ diveList, FLAG_NONE }, { &filterWidget, FLAG_NONE } });
setApplicationState(ApplicationState::Default);
setWindowIcon(QIcon(":subsurface-icon"));

4
desktop-widgets/mainwindow.h
View file

@ -18,7 +18,7 @@
#include "ui_mainwindow.h"
#include "ui_plannerDetails.h"
#include "desktop-widgets/notificationwidget.h"
#include "desktop-widgets/filterwidget2.h"
#include "desktop-widgets/filterwidget.h"
#include "core/applicationstate.h"
#include "core/gpslocation.h"
#include "core/dive.h"
@ -174,7 +174,7 @@ slots:
private:
Ui::MainWindow ui;
FilterWidget2 filterWidget2;
FilterWidget filterWidget;
QAction *actionNextDive;
QAction *actionPreviousDive;
QAction *undoAction;