mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

DC download: show info messages on Mac

Browse source 
For some reason the progress bar on macOS doesn't show the
progress text. This creates a label below the progress bar
and shows the text there instead.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-09-17 15:04:14 -07:00
parent d03fabd373
commit 49fe120d95
2 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -112,11 +112,24 @@ void DownloadFromDCWidget::updateProgressBar()
} }
if (!same_string(progress_bar_text , "")) { if (!same_string(progress_bar_text , "")) {
ui.progressBar->setFormat(progress_bar_text); ui.progressBar->setFormat(progress_bar_text);
#if defined(Q_OS_MAC)
// on mac the progress bar doesn't show its text
ui.progressText->setText(progress_bar_text);
#endif
} else { } else {
if (IS_FP_SAME(progress_bar_fraction, 0.0)) if (IS_FP_SAME(progress_bar_fraction, 0.0)) {
ui.progressBar->setFormat(tr("Connecting to dive computer")); ui.progressBar->setFormat(tr("Connecting to dive computer"));
else #if defined(Q_OS_MAC)
// on mac the progress bar doesn't show its text
ui.progressText->setText(tr("Connecting to dive computer"));
#endif
} else {
ui.progressBar->setFormat("%p%"); ui.progressBar->setFormat("%p%");
#if defined(Q_OS_MAC)
// on mac the progress bar doesn't show its text
ui.progressText->setText(QString("%1%").arg(lrint(progress_bar_fraction * 100)));
#endif
}
} }
ui.progressBar->setValue(lrint(progress_bar_fraction * 100)); ui.progressBar->setValue(lrint(progress_bar_fraction * 100));
free(last_text); free(last_text);
@ -134,6 +147,10 @@ void DownloadFromDCWidget::updateState(states state)
markChildrenAsEnabled(); markChildrenAsEnabled();
timer->stop(); timer->stop();
progress_bar_text = ""; progress_bar_text = "";
#if defined(Q_OS_MAC)
// on mac we show the text in a label
ui.progressText->setText(progress_bar_text);
#endif
} }
// tries to cancel an on going download // tries to cancel an on going download
@ -156,6 +173,10 @@ void DownloadFromDCWidget::updateState(states state)
ui.progressBar->hide(); ui.progressBar->hide();
markChildrenAsEnabled(); markChildrenAsEnabled();
progress_bar_text = ""; progress_bar_text = "";
#if defined(Q_OS_MAC)
// on mac we show the text in a label
ui.progressText->setText(progress_bar_text);
#endif
} }
// DOWNLOAD is finally done, but we don't know if there was an error as libdivecomputer doesn't pass // DOWNLOAD is finally done, but we don't know if there was an error as libdivecomputer doesn't pass
@ -173,6 +194,10 @@ void DownloadFromDCWidget::updateState(states state)
ui.progressBar->setValue(100); ui.progressBar->setValue(100);
markChildrenAsEnabled(); markChildrenAsEnabled();
} }
#if defined(Q_OS_MAC)
// on mac we show the text in a label
ui.progressText->setText(progress_bar_text);
#endif
} }
// DOWNLOAD is started. // DOWNLOAD is started.
@ -192,6 +217,10 @@ void DownloadFromDCWidget::updateState(states state)
markChildrenAsEnabled(); markChildrenAsEnabled();
progress_bar_text = ""; progress_bar_text = "";
ui.progressBar->hide(); ui.progressBar->hide();
#if defined(Q_OS_MAC)
// on mac we show the text in a label
ui.progressText->setText(progress_bar_text);
#endif
} }
// properly updating the widget state // properly updating the widget state

7
desktop-widgets/downloadfromdivecomputer.ui
View file

@ -189,6 +189,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="progressText">
<property name="text">
<string/>
</property>
</widget>
</item>
<item> <item>
<spacer name="aboveOKCancelSpacer"> <spacer name="aboveOKCancelSpacer">
<property name="orientation"> <property name="orientation">