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

Fix position and size of the Filter

Browse source 
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-11-03 17:39:31 -02:00 • committed by Dirk Hohndel
parent 5fa2851bdf
commit c65583671b
4 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/listfilter.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>300</height> <height>166</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

6
qt-ui/mainwindow.ui
View file

@ -27,6 +27,9 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="MultiFilter" name="multiFilter" native="true"/>
</item>
<item> <item>
<widget class="QSplitter" name="mainSplitter"> <widget class="QSplitter" name="mainSplitter">
<property name="orientation"> <property name="orientation">
@ -125,9 +128,6 @@
</property> </property>
<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>
<widget class="MultiFilter" name="multiFilter" native="true"/>
</item>
<item> <item>
<widget class="DiveListView" name="ListWidget"> <widget class="DiveListView" name="ListWidget">
<property name="selectionMode"> <property name="selectionMode">

18
qt-ui/simplewidgets.cpp
View file

@ -536,13 +536,23 @@ MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
QWidget *w = new QWidget(); QWidget *w = new QWidget();
QHBoxLayout *l = new QHBoxLayout(); QHBoxLayout *l = new QHBoxLayout();
l->addWidget(new TagFilter()); TagFilter *tagFilter = new TagFilter();
int minimumHeight = tagFilter->ui.filterInternalList->height() +
tagFilter->ui.verticalLayout->spacing() * tagFilter->ui.verticalLayout->count();
QListView *dummyList = new QListView();
QStringListModel *dummy = new QStringListModel(QStringList() << "Dummy Text");
dummyList->setModel(dummy);
l->addWidget(tagFilter);
l->addWidget(new BuddyFilter()); l->addWidget(new BuddyFilter());
l->addWidget(new LocationFilter()); l->addWidget(new LocationFilter());
l->setContentsMargins(0, 0, 0, 0); l->setContentsMargins(0, 0, 0, 0);
l->setSpacing(1); l->setSpacing(0);
w->setLayout(l); w->setLayout(l);
w->setMinimumSize(l->count() * 150, 200);
setWidget(w); setWidget(w);
w->resize(w->width(), minimumHeight + dummyList->sizeHintForRow(0) * 5 );
setMinimumHeight(w->height());
} }

14
qt-ui/simplewidgets.h
View file

@ -130,6 +130,12 @@ private:
struct dive_components *what; struct dive_components *what;
}; };
class MultiFilter : public QScrollArea {
Q_OBJECT
public:
MultiFilter(QWidget *parent);
};
class TagFilter : public QWidget { class TagFilter : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
@ -139,6 +145,7 @@ public:
private: private:
Ui::FilterWidget ui; Ui::FilterWidget ui;
friend class MultiFilter;
}; };
class BuddyFilter : public QWidget { class BuddyFilter : public QWidget {
@ -163,13 +170,6 @@ private:
Ui::FilterWidget ui; Ui::FilterWidget 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);