diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-10-31 15:40:57 -0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-10-31 13:52:52 -0700 |
| commit | c47972a18912ae306b072b7d6348d99c1b8a6637 (patch) | |
| tree | 062cea39990af98334a25d943608e87a36f85768 | |
| parent | c68a94da6ade76a6ffe46c959c5b67446131aa72 (diff) | |
| download | subsurface-c47972a18912ae306b072b7d6348d99c1b8a6637.tar.gz | |
tagfilter.ui -> filterwidget.ui
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/listfilter.ui (renamed from qt-ui/tagfilter.ui) | 7 | ||||
| -rw-r--r-- | qt-ui/simplewidgets.cpp | 5 | ||||
| -rw-r--r-- | qt-ui/simplewidgets.h | 2 | ||||
| -rw-r--r-- | subsurface.pro | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/qt-ui/tagfilter.ui b/qt-ui/listfilter.ui index 91078ed82..41a8dfa94 100644 --- a/qt-ui/tagfilter.ui +++ b/qt-ui/listfilter.ui @@ -15,6 +15,13 @@ </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item> <widget class="QLineEdit" name="filterTag"/> </item> <item> diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp index d00fab81e..a5ad49923 100644 --- a/qt-ui/simplewidgets.cpp +++ b/qt-ui/simplewidgets.cpp @@ -459,10 +459,11 @@ void DiveComponentSelection::buttonClicked(QAbstractButton *button) TagFilter::TagFilter(QWidget *parent) : QWidget(parent) { ui.setupUi(this); + ui.label->setText(tr("Tags: ")); QSortFilterProxyModel *filter = new QSortFilterProxyModel(); filter->setSourceModel(TagFilterModel::instance()); - connect(ui.filterTag, SIGNAL(textChanged(QString)), filter, SLOT(setFilterFixedString(QString))); - ui.tagView->setModel(filter); + connect(ui.filterInternalList, SIGNAL(textChanged(QString)), filter, SLOT(setFilterFixedString(QString))); + ui.filterList->setModel(filter); } void TagFilter::showEvent(QShowEvent *event) diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h index 48a57493b..d4eece859 100644 --- a/qt-ui/simplewidgets.h +++ b/qt-ui/simplewidgets.h @@ -137,7 +137,7 @@ public: virtual void showEvent(QShowEvent *); virtual void hideEvent(QHideEvent *); private: - Ui::TagFilter ui; + Ui::FilterWidget ui; }; class MultiFilter : public QScrollArea { diff --git a/subsurface.pro b/subsurface.pro index b7e5ec934..7b38fd6f1 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -228,7 +228,7 @@ FORMS = \ qt-ui/usersurvey.ui \ qt-ui/divecomponentselection.ui \ qt-ui/configuredivecomputerdialog.ui \ - qt-ui/tagfilter.ui \ + qt-ui/listfilter.ui \ qt-ui/diveshareexportdialog.ui # Nether usermanual or printing is supported on android right now |