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

Switch to having ui as member in MultiFilter

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-12-18 08:47:52 +01:00 • committed by Dirk Hohndel
parent 8571268d21
commit 4599172a19
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qt-ui/simplewidgets.cpp
View file

@ -606,8 +606,7 @@ void SuitFilter::hideEvent(QHideEvent *event)
MultiFilter::MultiFilter(QWidget *parent) : QWidget(parent)
{
ui = new Ui::FilterWidget2();
ui->setupUi(this);
ui.setupUi(this);
QWidget *expandedWidget = new QWidget();
QHBoxLayout *l = new QHBoxLayout();
@ -620,9 +619,9 @@ MultiFilter::MultiFilter(QWidget *parent) : QWidget(parent)
QStringListModel *dummy = new QStringListModel(QStringList() << "Dummy Text");
dummyList->setModel(dummy);
connect(ui->close, SIGNAL(clicked(bool)), this, SLOT(closeFilter()));
connect(ui->clear, SIGNAL(clicked(bool)), MultiFilterSortModel::instance(), SLOT(clearFilter()));
connect(ui->maximize, SIGNAL(clicked(bool)), this, SLOT(adjustHeight()));
connect(ui.close, SIGNAL(clicked(bool)), this, SLOT(closeFilter()));
connect(ui.clear, SIGNAL(clicked(bool)), MultiFilterSortModel::instance(), SLOT(clearFilter()));
connect(ui.maximize, SIGNAL(clicked(bool)), this, SLOT(adjustHeight()));
l->addWidget(tagFilter);
l->addWidget(new BuddyFilter());
@ -632,21 +631,21 @@ MultiFilter::MultiFilter(QWidget *parent) : QWidget(parent)
l->setSpacing(0);
expandedWidget->setLayout(l);
ui->scrollArea->setWidget(expandedWidget);
ui.scrollArea->setWidget(expandedWidget);
expandedWidget->resize(expandedWidget->width(), minimumHeight + dummyList->sizeHintForRow(0) * 5 );
ui->scrollArea->setMinimumHeight(expandedWidget->height() + 5);
ui.scrollArea->setMinimumHeight(expandedWidget->height() + 5);
connect(MultiFilterSortModel::instance(), SIGNAL(filterFinished()), this, SLOT(filterFinished()));
}
void MultiFilter::filterFinished()
{
ui->filterText->setText(tr("Filter shows %1 (of %2) dives").arg(MultiFilterSortModel::instance()->divesDisplayed).arg(dive_table.nr));
ui.filterText->setText(tr("Filter shows %1 (of %2) dives").arg(MultiFilterSortModel::instance()->divesDisplayed).arg(dive_table.nr));
}
void MultiFilter::adjustHeight()
{
ui->scrollArea->setVisible(!ui->scrollArea->isVisible());
ui.scrollArea->setVisible(!ui.scrollArea->isVisible());
}
void MultiFilter::closeFilter()

3
qt-ui/simplewidgets.h
View file

@ -14,6 +14,7 @@ class QAbstractButton;
#include "ui_shiftimagetimes.h"
#include "ui_divecomponentselection.h"
#include "ui_listfilter.h"
#include "ui_filterwidget.h"
#include "exif.h"
#include <dive.h>
@ -163,7 +164,7 @@ slots:
public:
MultiFilter(QWidget *parent);
Ui::FilterWidget2 *ui;
Ui::FilterWidget2 ui;
};
class TagFilter : public QWidget {