aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt-ui/divelogimportdialog.cpp25
-rw-r--r--qt-ui/divelogimportdialog.h14
-rw-r--r--qt-ui/divelogimportdialog.ui7
3 files changed, 44 insertions, 2 deletions
diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index 8788db6c3..338fb1efa 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -96,7 +96,6 @@ void ColumnNameView::mousePressEvent(QMouseEvent *press)
void ColumnNameView::dragLeaveEvent(QDragLeaveEvent *leave)
{
-
}
void ColumnNameView::dragEnterEvent(QDragEnterEvent *event)
@@ -118,6 +117,30 @@ void ColumnNameView::dropEvent(QDropEvent *event)
}
}
+ColumnDropCSVView::ColumnDropCSVView(QWidget *parent)
+{
+
+}
+
+void ColumnDropCSVView::dragLeaveEvent(QDragLeaveEvent *leave)
+{
+
+}
+
+void ColumnDropCSVView::dragEnterEvent(QDragEnterEvent *event)
+{
+
+}
+
+void ColumnDropCSVView::dragMoveEvent(QDragMoveEvent *event)
+{
+
+}
+
+void ColumnDropCSVView::dropEvent(QDropEvent *event)
+{
+
+}
DiveLogImportDialog::DiveLogImportDialog(QStringList *fn, QWidget *parent) : QDialog(parent),
selector(true),
diff --git a/qt-ui/divelogimportdialog.h b/qt-ui/divelogimportdialog.h
index efb7f296a..ed781a580 100644
--- a/qt-ui/divelogimportdialog.h
+++ b/qt-ui/divelogimportdialog.h
@@ -5,6 +5,7 @@
#include <QAbstractListModel>
#include <QListView>
#include <QDragLeaveEvent>
+#include <QTableView>
#include "../dive.h"
#include "../divelist.h"
@@ -40,6 +41,19 @@ private:
int currentDraggedIndex;
};
+class ColumnDropCSVView : public QTableView {
+ Q_OBJECT
+public:
+ ColumnDropCSVView(QWidget *parent);
+protected:
+ void dragLeaveEvent(QDragLeaveEvent *leave);
+ void dragEnterEvent(QDragEnterEvent *event);
+ void dragMoveEvent(QDragMoveEvent *event);
+ void dropEvent(QDropEvent *event);
+private:
+ QStringList columns;
+};
+
class DiveLogImportDialog : public QDialog {
Q_OBJECT
diff --git a/qt-ui/divelogimportdialog.ui b/qt-ui/divelogimportdialog.ui
index 8cbf9bc0e..881c3276b 100644
--- a/qt-ui/divelogimportdialog.ui
+++ b/qt-ui/divelogimportdialog.ui
@@ -118,7 +118,7 @@
</widget>
</item>
<item>
- <widget class="QTableView" name="tableView"/>
+ <widget class="ColumnDropCSVView" name="tableView"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
@@ -144,6 +144,11 @@
<extends>QListView</extends>
<header>divelogimportdialog.h</header>
</customwidget>
+ <customwidget>
+ <class>ColumnDropCSVView</class>
+ <extends>QTableView</extends>
+ <header>divelogimportdialog.h</header>
+ </customwidget>
</customwidgets>
<tabstops>
<tabstop>buttonBox</tabstop>