From 646c6ba58b28cc2a2dec8e0a2187158623416b6e Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sun, 29 Dec 2013 18:11:19 +0200 Subject: Merging Import dialog This patch merges import dialog with CSV import dialog. The aim is to have only one import menu entry for log files. This menu entry pops up an import dialog that has tabs for different types of imports (supported dive logs and CSV configuration currently). Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- qt-ui/csvimportdialog.ui | 509 +++++++++++++++++++++++++++-------------------- 1 file changed, 298 insertions(+), 211 deletions(-) (limited to 'qt-ui/csvimportdialog.ui') diff --git a/qt-ui/csvimportdialog.ui b/qt-ui/csvimportdialog.ui index 9c89704f3..68e95d0a0 100644 --- a/qt-ui/csvimportdialog.ui +++ b/qt-ui/csvimportdialog.ui @@ -6,8 +6,8 @@ 0 0 - 432 - 330 + 515 + 440 @@ -20,28 +20,293 @@ - - - - 0 - 0 - + + + + Droid Sans [unknown] + 14 + 75 + true + - - Import File (CSV) + + QFrame::NoFrame + + + Import Dive Log File + + + Qt::AlignCenter - - - - - - - - ... - - - - + + + + + + 0 + + + + DiveLog + + + + + 10 + 10 + 441 + 65 + + + + + 0 + 0 + + + + Import File + + + + + + + + + ... + + + + + + + + + CSV + + + + + 10 + 10 + 441 + 65 + + + + + 0 + 0 + + + + Import File + + + + + + + + + ... + + + + + + + + + 210 + 88 + 281 + 65 + + + + Field Separator + + + + + + + + + + + 210 + 159 + 281 + 65 + + + + + 0 + 0 + + + + Pre-configured imports + + + + + + -1 + + + + + + + + + 16 + 88 + 185 + 246 + + + + + 0 + 0 + + + + Field Configuration + + + + + + 1 + + + false + + + 0 + + + + + + + 1 + + + 2 + + + + + + + 1 + + + false + + + + + + + Depth + + + + + + + 1 + + + false + + + 0 + + + + + + + Stopdepth + + + + + + + PO2 + + + + + + + Time + + + + + + + Temp + + + + + + + 1 + + + 1 + + + + + + + 1 + + + false + + + 0 + + + + + + + Cns + + + + + label + label_2 + CSVTime + CSVDepth + temperatureCheckBox + CSVTemperature + po2CheckBox + CSVpo2 + cnsCheckBox + CSVcns + stopdepthCheckBox + CSVstopdepth + + @@ -50,147 +315,18 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 - - - - - 0 - 0 - - - - Field Configuration - - - - - - 1 - - - 1 - - - - - - - Time - - - - - - - 1 - - - 2 - - - - - - - Depth - - - - - - - 1 - - - false - - - - - - - Temp - - - - - - - 1 - - - false - - - 0 - - - - - - - PO2 - - - - - - - 1 - - - false - - - 0 - - - - - - - Cns - - - - - - - 1 - - - false - - - 0 - - - - - - - Stopdepth - - - - - label - label_2 - CSVTime - CSVDepth - temperatureCheckBox - CSVTemperature - po2CheckBox - CSVpo2 - cnsCheckBox - CSVcns - stopdepthCheckBox - CSVstopdepth - - @@ -203,53 +339,6 @@ 0 - - - - Field Separator - - - - - - - - - - - - - 0 - 0 - - - - Pre-configured imports - - - - - - -1 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -268,9 +357,7 @@ - - - + buttonBox -- cgit v1.2.3-70-g09d2