summaryrefslogtreecommitdiff
path: root/src/gui/updatewindow.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-09-27 14:54:09 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-09-27 14:54:09 +0000
commit285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4 (patch)
tree0a4e4169ffada0fbdc25fd91822a8c0fe678571c /src/gui/updatewindow.cpp
parentc24856707233ceb3995e43f8f7da63e65999df1e (diff)
downloadmana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.gz
mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.bz2
mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.xz
mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.zip
Merged another bunch of changes from trunk to 0.0 to reduce the difference.
Diffstat (limited to 'src/gui/updatewindow.cpp')
-rw-r--r--src/gui/updatewindow.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 183adc93..73dbd604 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -211,12 +211,6 @@ void UpdaterWindow::loadNews()
mScrollArea->setVerticalScrollAmount(0);
}
-void UpdaterWindow::addRow(const std::string &row)
-{
- mBrowserBox->addRow(row);
- mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
-}
-
int UpdaterWindow::updateProgress(void *ptr,
double dt, double dn, double ut, double un)
{
@@ -418,11 +412,12 @@ void UpdaterWindow::logic()
}
mThread = NULL;
}
- addRow("");
- addRow("##1 The update process is incomplete.");
- addRow("##1 It is strongly recommended that");
- addRow("##1 you try again later");
- addRow(mCurlError);
+ mBrowserBox->addRow("");
+ mBrowserBox->addRow("##1 The update process is incomplete.");
+ mBrowserBox->addRow("##1 It is strongly recommended that");
+ mBrowserBox->addRow("##1 you try again later");
+ mBrowserBox->addRow(mCurlError);
+ mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
mDownloadStatus = UPDATE_COMPLETE;
break;
case UPDATE_NEWS: