aboutsummaryrefslogtreecommitdiffstats
path: root/qt-ui/downloadfromdivecomputer.ui
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-01-09 15:01:48 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-01-09 15:06:25 -0800
commit762f33bd13e91e2c187035a87eda0b4d6efd93c8 (patch)
tree9864e1fac5bdd4de64bd694ef1ba3ff161a51b10 /qt-ui/downloadfromdivecomputer.ui
parentf10b66237e10f77d026335e9d39ad8a99a8f01bf (diff)
downloadsubsurface-762f33bd13e91e2c187035a87eda0b4d6efd93c8.tar.gz
Dive d/l UI: redo the states, the flow, the buttons
This is bigger and more invasive then I wanted, but it's hard to break it down into smaller pieces. Here's what it does: The former "Download" button becomes the "Download", "Cancel download" and "Retry" button. So this button controls your interaction with the dive computer. The other two buttons are now purely "OK" and "Cancel" for the dialog. "Cancel" discards what happened (much easier now that we download into a different table), and "OK" adds the dives that were selected in our selection UI (by default all downloaded dives) to the real dive_table. And while redoing all this, I also redid some of the state machine underlying the dialog. The biggest change that the user will see is that partial downloads (after canceling or after an error) will still offer the dives that were completely downloaded up to that point in the selection menu. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/downloadfromdivecomputer.ui')
-rw-r--r--qt-ui/downloadfromdivecomputer.ui4
1 files changed, 2 insertions, 2 deletions
diff --git a/qt-ui/downloadfromdivecomputer.ui b/qt-ui/downloadfromdivecomputer.ui
index 66de6006d..004895038 100644
--- a/qt-ui/downloadfromdivecomputer.ui
+++ b/qt-ui/downloadfromdivecomputer.ui
@@ -135,7 +135,7 @@
</spacer>
</item>
<item>
- <layout class="QHBoxLayout" name="startDownloadLayout">
+ <layout class="QHBoxLayout" name="downloadCancelRetryLayout">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
@@ -150,7 +150,7 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="startDownload">
+ <widget class="QPushButton" name="downloadCancelRetryButton">
<property name="text">
<string>Download</string>
</property>