← Back to branch summary

~ubuntu-branches/debian/sid/filezilla/sid

« back to all changes in this revision

Viewing changes to src/interface/fileexistsdlg.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Adrien Cunin
  • Date: 2010-04-20 09:25:39 UTC
  • mfrom: (1.3.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20100420092539-10d1003e0nm4zfyp
Tags: 3.3.2.1-1
* New upstream release
   - Really fixes previously mentioned bugs (the patches for them were not
     included in upstream 3.3.1)
* Added libgtk2.0-dev to build-deps
* Added libtinyxml-dev to build-deps, so that the system libtinyxml is used
* Added debian/README.source saying that dpatch is used
* Updated Standards-Version, no change needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface/fileexistsdlg.cpp
1
 
#include "FileZilla.h"
 
1
#include <filezilla.h>
2
2
#include "fileexistsdlg.h"
3
3
#include "Options.h"
 
4
#include "sizeformatting.h"
4
5
 
5
6
#include <wx/display.h>
6
7
 
31
32
        return true;
32
33
}
33
34
 
34
 
// Defined in LocalListView.cpp
35
 
wxString FormatSize(const wxLongLong& size, bool add_bytes_suffix, int format, bool thousands_separator, int num_decimal_places);
36
 
 
37
35
void CFileExistsDlg::CreateControls()
38
36
{
39
37
        wxXmlResource::Get()->LoadDialog(this, GetParent(), _T("ID_FILEEXISTSDLG"));
58
56
 
59
57
        wxString localSize;
60
58
        if (m_pNotification->localSize != -1)
61
 
                localSize = FormatSize(m_pNotification->localSize, false, 0, thousands_separator, 0) + _T(" ") + _("bytes");
 
59
                localSize = CSizeFormat::Format(m_pNotification->localSize, true, CSizeFormat::bytes, thousands_separator, 0);
62
60
        else
63
61
                localSize = _("Size unknown");
64
62
 
65
63
        wxString remoteSize;
66
64
        if (m_pNotification->remoteSize != -1)
67
 
                remoteSize = FormatSize(m_pNotification->remoteSize, false, 0, thousands_separator, 0) + _T(" ") + _("bytes");
 
65
                remoteSize = CSizeFormat::Format(m_pNotification->remoteSize, true, CSizeFormat::bytes, thousands_separator, 0);
68
66
        else
69
67
                remoteSize = _("Size unknown");
70
68