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

Partially revert d72c69db7a and fix its errors

Browse source 
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 <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2013-11-12 17:57:33 -02:00 • committed by Dirk Hohndel
parent c58dc29542
commit b98157a519
4 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
qt-ui/diveplanner.cpp
View file

@ -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"));

1
qt-ui/maintab.cpp
View file

@ -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);

2
qt-ui/tableview.cpp
View file

@ -7,7 +7,7 @@
#include <QTextStream>
#include <QSettings>
TableView::TableView(QWidget *parent) : QTableView(parent)
TableView::TableView(QWidget *parent) : QWidget(parent)
{
ui.setupUi(this);
QFile cssFile(":table-css");

2
qt-ui/tableview.h
View file

@ -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);