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 buttons to control the multi filter

Browse source 
Buttons to close, minimize and clear were added. We need better icons.

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-11 17:06:28 -02:00 • committed by Dirk Hohndel
parent aa44b67d6b
commit d277d4d88e
3 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
qt-ui/simplewidgets.cpp
View file

@ -8,6 +8,8 @@
#include <QShortcut> #include <QShortcut>
#include <QCalendarWidget> #include <QCalendarWidget>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QToolButton>
#include <QToolBar>
#include "exif.h" #include "exif.h"
#include "dive.h" #include "dive.h"
#include "file.h" #include "file.h"
@ -534,9 +536,8 @@ void LocationFilter::hideEvent(QHideEvent *event)
MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent) MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
{ {
QWidget *w = new QWidget(); QWidget *expandedWidget = new QWidget();
QHBoxLayout *l = new QHBoxLayout(); QHBoxLayout *l = new QHBoxLayout();
QVBoxLayout *v = new QVBoxLayout();
TagFilter *tagFilter = new TagFilter(); TagFilter *tagFilter = new TagFilter();
@ -547,15 +548,36 @@ MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
QStringListModel *dummy = new QStringListModel(QStringList() << "Dummy Text"); QStringListModel *dummy = new QStringListModel(QStringList() << "Dummy Text");
dummyList->setModel(dummy); dummyList->setModel(dummy);
// Buttons to Clear/Minimize/Close
QToolBar *tb = new QToolBar();
QToolButton *clearBtn = new QToolButton();
clearBtn->setToolTip(tr("Clear the filters"));
clearBtn->setIcon(QIcon(":/trash"));
clearBtn->setAutoRaise(true);
QToolButton *closeBtn = new QToolButton();
closeBtn->setToolTip(tr("Close this window and reset the filters"));
closeBtn->setIcon(QIcon(":/close"));
closeBtn->setAutoRaise(true);
QToolButton *minimize = new QToolButton();
minimize->setToolTip(tr("Minimize this window"));
minimize->setIcon(QIcon(":/arrow_up"));
minimize->setAutoRaise(true);
tb->setOrientation(Qt::Vertical);
tb->addWidget(clearBtn);
tb->addWidget(minimize);
tb->addWidget(closeBtn);
l->addWidget(tb);
l->addWidget(tagFilter); 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(0); l->setSpacing(0);
w->setLayout(l); expandedWidget->setLayout(l);
setWidget(w); setWidget(expandedWidget);
w->resize(w->width(), minimumHeight + dummyList->sizeHintForRow(0) * 5 ); expandedWidget->resize(expandedWidget->width(), minimumHeight + dummyList->sizeHintForRow(0) * 5 );
setMinimumHeight(w->height() + 5); setMinimumHeight(expandedWidget->height() + 5);
} }

2
qt-ui/simplewidgets.h
View file

@ -134,6 +134,8 @@ class MultiFilter : public QScrollArea {
Q_OBJECT Q_OBJECT
public: public:
MultiFilter(QWidget *parent); MultiFilter(QWidget *parent);
QWidget *expandedWidget;
QWidget *minimizedWidget;
}; };
class TagFilter : public QWidget { class TagFilter : public QWidget {

2
subsurface.qrc
View file

@ -64,7 +64,7 @@
<file>icons/subsurface/index.theme</file> <file>icons/subsurface/index.theme</file>
<file>icons/subsurface/32x32/actions/go-down.png</file> <file>icons/subsurface/32x32/actions/go-down.png</file>
<file>icons/subsurface/32x32/actions/go-up.png</file> <file>icons/subsurface/32x32/actions/go-up.png</file>
<file>icons/subsurface/32x32/actions/window-close.png</file> <file alias="close">icons/subsurface/32x32/actions/window-close.png</file>
<file>icons/ostc2n.png</file> <file>icons/ostc2n.png</file>
<file>icons/ostc3.png</file> <file>icons/ostc3.png</file>
<file>icons/suunto_vyper.png</file> <file>icons/suunto_vyper.png</file>