diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-04-25 20:49:03 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-04-25 20:49:03 -0700 |
| commit | 106659774ae83b7442f6cc749273248e07ff6c80 (patch) | |
| tree | fecdfd3362abac4065e3e10b70520cfa131640e5 | |
| parent | 8da7a6985b057c5abfbd5ad1dbc7bdbfdcdfa0fb (diff) | |
| parent | b20b57b29fe2efcbafb064670a8ca53b0022eca0 (diff) | |
| download | subsurface-106659774ae83b7442f6cc749273248e07ff6c80.tar.gz | |
Merge branch 'QtStuff' of git://github.com/tcanabrava/subsurface into Qt
| -rw-r--r-- | qt-ui/mainwindow.cpp | 14 | ||||
| -rw-r--r-- | qt-ui/mainwindow.h | 2 | ||||
| -rw-r--r-- | qt-ui/mainwindow.ui | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index b0b56a4e7..8cdc60193 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -11,6 +11,7 @@ #include <QMessageBox> #include <QtDebug> #include <QDateTime> +#include <QSortFilterProxyModel> #include "divelistview.h" #include "starwidget.h" @@ -22,13 +23,14 @@ MainWindow::MainWindow() : ui(new Ui::MainWindow()), - model(new DiveTripModel(this)) + model(new DiveTripModel(this)), + sortModel(new QSortFilterProxyModel()) { ui->setupUi(this); - ui->ListWidget->setModel(model); - setWindowIcon(QIcon(":subsurface-icon")); - // Just to test the star widgets, can be safely removed. + sortModel->setSourceModel(model); + ui->ListWidget->setModel(sortModel); + setWindowIcon(QIcon(":subsurface-icon")); } void MainWindow::on_actionNew_triggered() @@ -63,6 +65,10 @@ void MainWindow::on_actionOpen_triggered() report_dives(FALSE, FALSE); ui->InfoWidget->reload(); + + model->deleteLater(); + model = new DiveTripModel(this); + sortModel->setSourceModel(model); } void MainWindow::on_actionSave_triggered() diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index 43ebde7f5..fdb100c7a 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -9,6 +9,7 @@ #include <QMainWindow> +class QSortFilterProxyModel; class DiveTripModel; namespace Ui @@ -68,6 +69,7 @@ private Q_SLOTS: private: Ui::MainWindow *ui; DiveTripModel *model; + QSortFilterProxyModel *sortModel; QString filter(); bool askSaveChanges(); diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index 6ece13f57..3d3f0ec35 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -27,7 +27,11 @@ <widget class="MainTab" name="InfoWidget" native="true"/> <widget class="QGraphicsView" name="ProfileWidget"/> </widget> - <widget class="DiveListView" name="ListWidget"/> + <widget class="DiveListView" name="ListWidget"> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + </widget> </widget> </item> <item> @@ -45,7 +49,7 @@ <x>0</x> <y>0</y> <width>763</width> - <height>20</height> + <height>25</height> </rect> </property> <widget class="QMenu" name="menuFile"> |