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

Added a 'MultiFilter' widget.

Browse source 
The multifilter widget is a container with all the filter
widgets inside of it. currently there's just one.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-10-31 15:22:21 -02:00 • committed by Dirk Hohndel
parent 063e6d9fbf
commit 19ac1dfa09
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/mainwindow.cpp
View file

@ -69,7 +69,7 @@ MainWindow::MainWindow() : QMainWindow(),
Q_ASSERT_X(m_Instance == NULL, "MainWindow", "MainWindow recreated!"); Q_ASSERT_X(m_Instance == NULL, "MainWindow", "MainWindow recreated!");
m_Instance = this; m_Instance = this;
ui.setupUi(this); ui.setupUi(this);
ui.tagFilter->hide(); ui.multiFilter->hide();
profileToolbarActions << ui.profCalcAllTissues << ui.profCalcCeiling << ui.profDcCeiling << ui.profEad << profileToolbarActions << ui.profCalcAllTissues << ui.profCalcCeiling << ui.profDcCeiling << ui.profEad <<
ui.profHR << ui.profIncrement3m << ui.profMod << ui.profNdl_tts << ui.profNdl_tts << ui.profHR << ui.profIncrement3m << ui.profMod << ui.profNdl_tts << ui.profNdl_tts <<
ui.profPhe << ui.profPn2 << ui.profPO2 << ui.profRuler << ui.profSAC << ui.profScaled << ui.profPhe << ui.profPn2 << ui.profPO2 << ui.profRuler << ui.profSAC << ui.profScaled <<
@ -1379,5 +1379,5 @@ void MainWindow::on_paste_triggered()
void MainWindow::on_actionFilterTags_triggered() void MainWindow::on_actionFilterTags_triggered()
{ {
ui.tagFilter->setVisible(!ui.tagFilter->isVisible()); ui.multiFilter->setVisible(!ui.multiFilter->isVisible());
} }

4
qt-ui/mainwindow.ui
View file

@ -126,7 +126,7 @@
<widget class="QWidget" name="page_3"> <widget class="QWidget" name="page_3">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="TagFilter" name="tagFilter" native="true"/> <widget class="MultiFilter" name="multiFilter" native="true"/>
</item> </item>
<item> <item>
<widget class="DiveListView" name="ListWidget"/> <widget class="DiveListView" name="ListWidget"/>
@ -897,7 +897,7 @@ p, li { white-space: pre-wrap; }
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>TagFilter</class> <class>MultiFilter</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>simplewidgets.h</header> <header>simplewidgets.h</header>
<container>1</container> <container>1</container>

12
qt-ui/simplewidgets.cpp
View file

@ -476,3 +476,15 @@ void TagFilter::hideEvent(QHideEvent *event)
TagFilterSortModel::instance()->removeFilterModel(TagFilterModel::instance()); TagFilterSortModel::instance()->removeFilterModel(TagFilterModel::instance());
QWidget::hideEvent(event); QWidget::hideEvent(event);
} }
MultiFilter::MultiFilter(QWidget *parent): QScrollArea(parent)
{
QWidget *w = new QWidget();
QHBoxLayout *l = new QHBoxLayout();
l->addWidget(new TagFilter());
w->setLayout(l);
w->setMinimumSize(l->count() * 150, 200);
setWidget(w);
}

6
qt-ui/simplewidgets.h
View file

@ -140,6 +140,12 @@ private:
Ui::TagFilter ui; Ui::TagFilter ui;
}; };
class MultiFilter : public QScrollArea {
Q_OBJECT
public:
MultiFilter(QWidget *parent);
};
bool isGnome3Session(); bool isGnome3Session();
QImage grayImage(const QImage &coloredImg); QImage grayImage(const QImage &coloredImg);