From 762f33bd13e91e2c187035a87eda0b4d6efd93c8 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 9 Jan 2015 15:01:48 -0800 Subject: 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 --- qt-ui/downloadfromdivecomputer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qt-ui/downloadfromdivecomputer.h') diff --git a/qt-ui/downloadfromdivecomputer.h b/qt-ui/downloadfromdivecomputer.h index 70b3c8e62..c92190b78 100644 --- a/qt-ui/downloadfromdivecomputer.h +++ b/qt-ui/downloadfromdivecomputer.h @@ -60,14 +60,13 @@ public: INITIAL, DOWNLOADING, CANCELLING, - CANCELLED, ERROR, DONE, }; public slots: - void on_startDownload_clicked(); + void on_downloadCancelRetryButton_clicked(); void on_ok_clicked(); void on_cancel_clicked(); void on_search_clicked(); -- cgit v1.2.3-70-g09d2