desura
/
Desurium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #695 from lodle/bugfix688 

Fixed issue where progress doesnt get set to 100% on completion of mcf upload #688
master
Mark Chandler 2013-10-29 16:22:56 -07:00
parent 99e3ddc733 648de766b9
commit 2a5b48d368
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/uicore/code/UploadForm.cpp
View File

@ -159,7 +159,7 @@ void UploadMCFForm::showProg(uint32 hash, uint32 start)
cleanUpPages();
UploadProgPage *pPage = new UploadProgPage( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
UploadProgPage *pPage = new UploadProgPage(this);
pPage->setInfo(m_uiInternId, hash, start);
m_pPage = pPage;

13
src/shared/uicore/code/UploadProgPage.cpp
View File

@ -34,8 +34,9 @@ BEGIN_EVENT_TABLE( UploadProgPage, BasePage )
EVT_CHECKBOX( wxID_ANY, UploadProgPage::onChecked )
END_EVENT_TABLE()
UploadProgPage::UploadProgPage( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : BasePage( parent, id, pos, size, style )
UploadProgPage::UploadProgPage(wxWindow* parent)
: BasePage(parent, wxID_ANY, wxDefaultPosition, wxSize( 400,100 ), wxTAB_TRAVERSAL)
, m_llTotalUpload(0)
{
wxFlexGridSizer* fgSizer1;
fgSizer1 = new wxFlexGridSizer( 5, 1, 0, 0 );
@ -225,6 +226,12 @@ void UploadProgPage::onComplete(uint32& status)
if (temp)
temp->setTrueClose();
std::string done = UTIL::MISC::niceSizeStr(m_llTotalUpload, true);
std::string total = UTIL::MISC::niceSizeStr(m_llTotalUpload);
m_pbProgress->setCaption(gcString("{0} of {1}", done, total));
m_pbProgress->setProgress(100);
m_pbProgress->setMileStone();
m_staticText3->SetLabel(Managers::GetString(L"#UDF_COMPLETE"));
m_labTimeLeft->SetLabel(wxT(""));
@ -269,6 +276,8 @@ void UploadProgPage::onProgress(UserCore::Misc::UploadInfo& info)
return;
}
m_llTotalUpload = info.totalAmmount;
std::string done = UTIL::MISC::niceSizeStr(info.doneAmmount, true);
std::string total = UTIL::MISC::niceSizeStr(info.totalAmmount);
m_pbProgress->setCaption(gcString("{0} of {1}", done, total));

4
src/shared/uicore/code/UploadProgPage.h
View File

@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
class UploadProgPage : public BasePage
{
public:
UploadProgPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,100 ), long style = wxTAB_TRAVERSAL );
UploadProgPage(wxWindow* parent);
~UploadProgPage();
void dispose();
@ -73,6 +73,8 @@ private:
bool m_bDone;
uint64 m_llTotalUpload;
DECLARE_EVENT_TABLE();
};