← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/interface/settings/optionspage_connection_active.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/settings/optionspage_connection_active.cpp
17
17
        SetCheckFromOption(XRCID("ID_LIMITPORTS"), OPTION_LIMITPORTS, failure);
18
18
        SetTextFromOption(XRCID("ID_LOWESTPORT"), OPTION_LIMITPORTS_LOW, failure);
19
19
        SetTextFromOption(XRCID("ID_HIGHESTPORT"), OPTION_LIMITPORTS_HIGH, failure);
20
 
        
 
20
 
21
21
        SetRCheck(XRCID("ID_ACTIVEMODE1"), m_pOptions->GetOptionVal(OPTION_EXTERNALIPMODE) == 0, failure);
22
22
        SetRCheck(XRCID("ID_ACTIVEMODE2"), m_pOptions->GetOptionVal(OPTION_EXTERNALIPMODE) == 1, failure);
23
23
        SetRCheck(XRCID("ID_ACTIVEMODE3"), m_pOptions->GetOptionVal(OPTION_EXTERNALIPMODE) == 2, failure);
35
35
bool COptionsPageConnectionActive::SavePage()
36
36
{
37
37
        SetOptionFromCheck(XRCID("ID_LIMITPORTS"), OPTION_LIMITPORTS);
38
 
        
 
38
 
39
39
        SetIntOptionFromText(XRCID("ID_LOWESTPORT"), OPTION_LIMITPORTS_LOW);
40
40
        SetIntOptionFromText(XRCID("ID_HIGHESTPORT"), OPTION_LIMITPORTS_HIGH);
41
 
        
 
41
 
42
42
        int mode;
43
43
        if (GetRCheck(XRCID("ID_ACTIVEMODE1")))
44
44
                mode = 0;
88
88
                if (!IsIpAddress(pActiveIP->GetValue()))
89
89
                        return DisplayError(pActiveIP, _("You have to enter a valid IP address."));
90
90
        }
91
 
        
 
91
 
92
92
        return true;
93
93
}
94
94
 
105
105
        FindWindow(XRCID("ID_ACTIVEIP"))->Enable(mode == 1);
106
106
        FindWindow(XRCID("ID_ACTIVERESOLVER"))->Enable(mode == 2);
107
107
 
108
 
        FindWindow(XRCID("ID_NOEXTERNALONLOCAL"))->Enable(mode != 0);   
 
108
        FindWindow(XRCID("ID_NOEXTERNALONLOCAL"))->Enable(mode != 0);
109
109
}
110
110
 
111
111
void COptionsPageConnectionActive::OnRadioOrCheckEvent(wxCommandEvent& event)