mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow left-aligned and right-aligned messages in Launcher

Browse Source
This commit is contained in:
Alexander Bock
2015-06-22 15:39:37 +02:00
parent 2afd193a95
commit 89923f0650
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/Launcher/infowidget.cpp
View File

@@ -35,7 +35,8 @@ InfoWidget::InfoWidget(QString name, int totalBytes)
, _name(nullptr)
, _bytes(nullptr)
, _progress(nullptr)
, _messages(nullptr)
, _messagesLeft(nullptr)
, _messagesRight(nullptr)
, _totalBytes(totalBytes)
{
setFixedHeight(100);
@@ -54,8 +55,11 @@ InfoWidget::InfoWidget(QString name, int totalBytes)
_progress = new QProgressBar;
layout->addWidget(_progress, 1, 1);
_messages = new QLabel("");
layout->addWidget(_messages, 2, 0, 1, 2);
_messagesLeft = new QLabel("");
_messagesRight = new QLabel("");
layout->addWidget(_messagesLeft, 2, 0, 1, 2);
layout->addWidget(_messagesRight, 2, 0, 1, 2, Qt::AlignRight);
setLayout(layout);
}
@@ -70,10 +74,10 @@ void InfoWidget::update(openspace::DownloadManager::FileFuture* f) {
if (f->errorMessage.empty()) {
QString t = "Time remaining %1 s";
_messages->setText(t.arg(static_cast<int>(f->secondsRemaining)));
_messagesLeft->setText(t.arg(static_cast<int>(f->secondsRemaining)));
}
else {
_messages->setText(QString::fromStdString(f->errorMessage));
_messagesLeft->setText(QString::fromStdString(f->errorMessage));
}
}
@@ -92,22 +96,21 @@ void InfoWidget::update(libtorrent::torrent_status s) {
if (bytesPerSecond > 0 && remainingBytes > 0) {
float seconds = static_cast<float>(remainingBytes) / bytesPerSecond;
//auto now = time(NULL);
//auto transferTime = now - s.added_time;
//auto estimatedTime = transferTime / progress;
//auto timeRemaining = estimatedTime - transferTime;
QString t = "Time remaining %1 s";
_messages->setText(t.arg(static_cast<int>(seconds)));
QString left = "Time remaining %1 s";
_messagesLeft->setText(left.arg(static_cast<int>(seconds)));
QString right = "Download Rate: %1 KiB/s";
_messagesRight->setText(right.arg(bytesPerSecond / 1024));
}
else
_messages->setText("");
_messagesLeft->setText("");
}
else {
_messages->setText(QString::fromStdString(s.error));
_messagesLeft->setText(QString::fromStdString(s.error));
}
}
void InfoWidget::error(QString message) {
_messages->setText(message);
_messagesLeft->setText(message);
}

3
apps/Launcher/infowidget.h
View File

@@ -51,7 +51,8 @@ private:
QLabel* _name;
QLabel* _bytes;
QProgressBar* _progress;
QLabel* _messages;
QLabel* _messagesLeft;
QLabel* _messagesRight;
int _totalBytes;
};