diff options
| -rw-r--r-- | qt-ui/divelogimportdialog.cpp | 7 | ||||
| -rw-r--r-- | qt-ui/divelogimportdialog.ui | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index d8b1b6e8c..a869a7298 100644 --- a/qt-ui/divelogimportdialog.cpp +++ b/qt-ui/divelogimportdialog.cpp @@ -204,7 +204,6 @@ ColumnNameResult::ColumnNameResult(QObject *parent) : QAbstractTableModel(parent } void ColumnNameResult::swapValues(int firstIndex, int secondIndex) { - qDebug() << firstIndex << secondIndex; QString one = columnNames[firstIndex]; QString two = columnNames[secondIndex]; setData(index(0, firstIndex), QVariant(two), Qt::EditRole); @@ -304,11 +303,8 @@ void ColumnDropCSVView::mousePressEvent(QMouseEvent *press) QObject *target = drag->target(); if (target->objectName() == "qt_scrollarea_viewport") target = target->parent(); - - - if (target != drag->source()) { + if (target != drag->source()) model()->setData(atClick, QString()); - } } } @@ -335,7 +331,6 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList fn, QWidget *parent) : QDia ui->avaliableColumns->setItemDelegate(new TagDragDelegate(ui->avaliableColumns)); resultModel = new ColumnNameResult(this); ui->tableView->setModel(resultModel); - loadFileContents(); /* manually import CSV file */ diff --git a/qt-ui/divelogimportdialog.ui b/qt-ui/divelogimportdialog.ui index 89f96934f..7aace4847 100644 --- a/qt-ui/divelogimportdialog.ui +++ b/qt-ui/divelogimportdialog.ui @@ -125,6 +125,18 @@ <height>200</height> </size> </property> + <attribute name="horizontalHeaderVisible"> + <bool>false</bool> + </attribute> + <attribute name="horizontalHeaderHighlightSections"> + <bool>false</bool> + </attribute> + <attribute name="verticalHeaderVisible"> + <bool>false</bool> + </attribute> + <attribute name="verticalHeaderHighlightSections"> + <bool>false</bool> + </attribute> </widget> </item> <item> |