From b98157a51932c1bf584eb5ac830c5e3b681c654c Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 12 Nov 2013 17:57:33 -0200 Subject: Partially revert d72c69db7a49f and fix its errors In the offending commit a QWidget was changed to QTableView, but only in the header - and thus making avaliable all method calls, but the initialization of the widgets was still a QWidget, and nothing of QTableView was used besides an incorrect call to setColumnHidden. This commit fixes that by using the view() method provided by the TableView implementation which returns the true QTableView that should be used for specific nitpicking, like hidding columns. :) Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.cpp | 11 +++++------ qt-ui/maintab.cpp | 1 - qt-ui/tableview.cpp | 2 +- qt-ui/tableview.h | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 76ea82e75..bdecf24ad 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -908,12 +908,11 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::GAS, new AirTypesDelegate(this)); ui.cylinderTableWidget->setTitle(tr("Available Gases")); ui.cylinderTableWidget->setModel(CylindersModel::instance()); - // the setColumnHidden calls don't seem to work???? - ui.cylinderTableWidget->setColumnHidden(CylindersModel::START, true); - ui.cylinderTableWidget->setColumnHidden(CylindersModel::END, true); - ui.cylinderTableWidget->setColumnHidden(CylindersModel::DEPTH, false); - - ui.cylinderTableWidget->view()->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate()); + QTableView *view = ui.cylinderTableWidget->view(); + view->setColumnHidden(CylindersModel::START, true); + view->setColumnHidden(CylindersModel::END, true); + view->setColumnHidden(CylindersModel::DEPTH, false); + view->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate()); connect(ui.cylinderTableWidget, SIGNAL(addButtonClicked()), DivePlannerPointsModel::instance(), SLOT(addCylinder_clicked())); connect(ui.tableWidget, SIGNAL(addButtonClicked()), DivePlannerPointsModel::instance(), SLOT(addStop())); ui.tableWidget->setBtnToolTip(tr("add dive data point")); diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 30659c5c5..3dcb24df0 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -83,7 +83,6 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), ui.cylinders->view()->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate()); ui.weights->view()->setItemDelegateForColumn(WeightModel::TYPE, new WSInfoDelegate()); - // this does not appear to work??? ui.cylinders->view()->setColumnHidden(CylindersModel::DEPTH, true); completers.buddy = new QCompleter(BuddyCompletionModel::instance(), ui.buddy); completers.divemaster = new QCompleter(DiveMasterCompletionModel::instance(), ui.divemaster); diff --git a/qt-ui/tableview.cpp b/qt-ui/tableview.cpp index c3aed1f18..d9731b477 100644 --- a/qt-ui/tableview.cpp +++ b/qt-ui/tableview.cpp @@ -7,7 +7,7 @@ #include #include -TableView::TableView(QWidget *parent) : QTableView(parent) +TableView::TableView(QWidget *parent) : QWidget(parent) { ui.setupUi(this); QFile cssFile(":table-css"); diff --git a/qt-ui/tableview.h b/qt-ui/tableview.h index af410c6e0..fc22425d3 100644 --- a/qt-ui/tableview.h +++ b/qt-ui/tableview.h @@ -14,7 +14,7 @@ class QAbstractItemModel; class QModelIndex; class QTableView; -class TableView : public QTableView { +class TableView : public QWidget { Q_OBJECT public: TableView(QWidget *parent = 0); -- cgit v1.2.3-70-g09d2