mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Suits Widget created and working.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
b7da2a9c44
commit
dee20906e3
3 changed files with 38 additions and 0 deletions
|
@ -185,6 +185,7 @@ void MainWindow::recreateDiveList()
|
||||||
TagFilterModel::instance()->repopulate();
|
TagFilterModel::instance()->repopulate();
|
||||||
BuddyFilterModel::instance()->repopulate();
|
BuddyFilterModel::instance()->repopulate();
|
||||||
LocationFilterModel::instance()->repopulate();
|
LocationFilterModel::instance()->repopulate();
|
||||||
|
SuitsFilterModel::instance()->repopulate();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::current_dive_changed(int divenr)
|
void MainWindow::current_dive_changed(int divenr)
|
||||||
|
|
|
@ -535,6 +535,31 @@ void LocationFilter::hideEvent(QHideEvent *event)
|
||||||
QWidget::hideEvent(event);
|
QWidget::hideEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SuitFilter::SuitFilter(QWidget *parent) : QWidget(parent)
|
||||||
|
{
|
||||||
|
ui.setupUi(this);
|
||||||
|
ui.label->setText(tr("Suits: "));
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
ui.filterInternalList->setClearButtonEnabled(true);
|
||||||
|
#endif
|
||||||
|
QSortFilterProxyModel *filter = new QSortFilterProxyModel();
|
||||||
|
filter->setSourceModel(SuitsFilterModel::instance());
|
||||||
|
connect(ui.filterInternalList, SIGNAL(textChanged(QString)), filter, SLOT(setFilterFixedString(QString)));
|
||||||
|
ui.filterList->setModel(filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SuitFilter::showEvent(QShowEvent *event)
|
||||||
|
{
|
||||||
|
MultiFilterSortModel::instance()->addFilterModel(SuitsFilterModel::instance());
|
||||||
|
QWidget::showEvent(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SuitFilter::hideEvent(QHideEvent *event)
|
||||||
|
{
|
||||||
|
MultiFilterSortModel::instance()->removeFilterModel(SuitsFilterModel::instance());
|
||||||
|
QWidget::hideEvent(event);
|
||||||
|
}
|
||||||
|
|
||||||
MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
|
MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
|
||||||
{
|
{
|
||||||
QWidget *expandedWidget = new QWidget();
|
QWidget *expandedWidget = new QWidget();
|
||||||
|
@ -575,6 +600,7 @@ MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
|
||||||
l->addWidget(tagFilter);
|
l->addWidget(tagFilter);
|
||||||
l->addWidget(new BuddyFilter());
|
l->addWidget(new BuddyFilter());
|
||||||
l->addWidget(new LocationFilter());
|
l->addWidget(new LocationFilter());
|
||||||
|
l->addWidget(new SuitFilter());
|
||||||
l->setContentsMargins(0, 0, 0, 0);
|
l->setContentsMargins(0, 0, 0, 0);
|
||||||
l->setSpacing(0);
|
l->setSpacing(0);
|
||||||
|
|
||||||
|
|
|
@ -161,6 +161,17 @@ private:
|
||||||
Ui::FilterWidget ui;
|
Ui::FilterWidget ui;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class SuitFilter : public QWidget {
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
SuitFilter(QWidget *parent = 0);
|
||||||
|
virtual void showEvent(QShowEvent *);
|
||||||
|
virtual void hideEvent(QHideEvent *);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Ui::FilterWidget ui;
|
||||||
|
};
|
||||||
|
|
||||||
class LocationFilter : public QWidget {
|
class LocationFilter : public QWidget {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue