← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/interface/statusbar.cpp

  • Committer: Package Import Robot
  • Author(s): Adrien Cunin
  • Date: 2012-12-07 17:17:17 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11
Tags: 3.6.0.2-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu change:
   - Added debian/patches/11_use-decimal-si-by-default.patch in order to
     comply with UnitsPolicy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface/statusbar.cpp
41
41
 
42
42
        int oldCount = GetFieldsCount();
43
43
        int* oldWidths = m_columnWidths;
44
 
        
 
44
 
45
45
        m_columnWidths = new int[number];
46
46
        if (!widths)
47
47
        {
233
233
{
234
234
        wxRect rect;
235
235
        GetFieldRect(field, rect);
236
 
        
 
236
 
237
237
        int offset = 2;
238
238
 
239
239
        if (field + 1 == GetFieldsCount())
240
240
        {
241
 
                rect.SetWidth(m_columnWidths[field]);   
 
241
                rect.SetWidth(m_columnWidths[field]);
242
242
                offset += 5 + GetGripperWidth();
243
243
        }
244
244
 
245
 
        for (std::map<int, struct t_statbar_child>::iterator iter = m_children.begin(); iter != m_children.end(); iter++)
 
245
        for (std::map<int, struct t_statbar_child>::iterator iter = m_children.begin(); iter != m_children.end(); ++iter)
246
246
        {
247
247
                if (iter->second.field != field)
248
248
                        continue;
451
451
        dc.SetFont(GetFont());
452
452
 
453
453
        wxSize s = dc.GetTextExtent(_("Queue: empty"));
454
 
        
 
454
 
455
455
        wxString tmp = _T(">8888");
456
456
        if (m_sizeFormatDecimalPlaces)
457
457
        {
496
496
 
497
497
void CStatusBar::UpdateSizeFormat()
498
498
{
499
 
        // 0 equals bytes, however just use IEC binary prefixes instead, 
 
499
        // 0 equals bytes, however just use IEC binary prefixes instead,
500
500
        // exact byte counts for queue make no sense.
501
501
        m_sizeFormat = CSizeFormat::_format(COptions::Get()->GetOptionVal(OPTION_SIZE_FORMAT));
502
502
        if (!m_sizeFormat)
544
544
                wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_TRANSFER_TYPE_CONTEXT"));
545
545
                if (!pMenu)
546
546
                        return;
547
 
        
 
547
 
548
548
                const int type = COptions::Get()->GetOptionVal(OPTION_ASCIIBINARY);
549
549
                switch (type)
550
550
                {
610
610
                else
611
611
                        tooltip += _("Upload limit: none");
612
612
        }
613
 
        
 
613
 
614
614
        if (!m_pSpeedLimitsIndicator)
615
615
        {
616
616
                m_pSpeedLimitsIndicator = new CIndicator(this, bmp);