projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made AddonDialog output some prettier text, installation of Addons now seem to work
[supertux.git]
/
src
/
supertux
/
menu
/
addon_dialog.cpp
diff --git
a/src/supertux/menu/addon_dialog.cpp
b/src/supertux/menu/addon_dialog.cpp
index
92bb812
..
d4f47ec
100644
(file)
--- a/
src/supertux/menu/addon_dialog.cpp
+++ b/
src/supertux/menu/addon_dialog.cpp
@@
-22,7
+22,8
@@
#include "util/gettext.hpp"
AddonDialog::AddonDialog(AddonManager::InstallStatusPtr status) :
#include "util/gettext.hpp"
AddonDialog::AddonDialog(AddonManager::InstallStatusPtr status) :
- m_status(status)
+ m_status(status),
+ m_title()
{
add_button(_("Abort Download"), [this]{
on_abort();
{
add_button(_("Abort Download"), [this]{
on_abort();
@@
-35,21
+36,31
@@
void
AddonDialog::update()
{
AddonManager::current()->update();
AddonDialog::update()
{
AddonManager::current()->update();
-
update_text();
update_text();
+}
- if (m_status->done)
- {
- MenuManager::instance().set_dialog({});
- }
+void
+AddonDialog::set_title(const std::string& title)
+{
+ m_title = title;
}
void
AddonDialog::update_text()
{
std::ostringstream out;
}
void
AddonDialog::update_text()
{
std::ostringstream out;
- out << "Downloading in Progress:\n"
- << m_status->now << "/" << m_status->total;
+ out << m_title << "\n";
+
+ if (m_status->total == 0)
+ {
+ out << "---\n---";
+ }
+ else
+ {
+ int percent = 100 * m_status->now / m_status->total;
+ out << m_status->now/1000 << "/" << m_status->total/1000 << " kB\n" << percent << "%";
+ }
+
set_text(out.str());
}
set_text(out.str());
}