← 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_edit.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_edit.cpp
49
49
 
50
50
        if (GetRCheck(XRCID("ID_DEFAULT_CUSTOM")))
51
51
                pOptions->SetOption(OPTION_EDIT_DEFAULTEDITOR, _T("2") + GetText(XRCID("ID_EDITOR")));
52
 
        else 
 
52
        else
53
53
                pOptions->SetOption(OPTION_EDIT_DEFAULTEDITOR, GetRCheck(XRCID("ID_DEFAULT_TEXT")) ? _T("1") : _T("0"));
54
54
 
55
55
        if (GetRCheck(XRCID("ID_USEDEFAULT")))
58
58
                pOptions->SetOption(OPTION_EDIT_ALWAYSDEFAULT, 0);
59
59
 
60
60
        SetOptionFromCheck(XRCID("ID_EDIT_TRACK_LOCAL"), OPTION_EDIT_TRACK_LOCAL);
61
 
                
 
61
 
62
62
        return true;
63
63
}
64
64
 
120
120
 
121
121
bool COptionsPageEdit::Validate()
122
122
{
123
 
        bool failure = false;
124
 
 
125
123
        const bool custom = GetRCheck(XRCID("ID_DEFAULT_CUSTOM"));
126
124
        wxString editor;
127
125
        if (custom)
128
126
        {
 
127
                bool failure = false;
 
128
 
129
129
                editor = GetText(XRCID("ID_EDITOR"));
130
130
                editor.Trim(true);
131
131
                editor.Trim(false);