← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/interface/Options.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/Options.cpp
171
171
        { "Filteredit window size", string, _T(""), normal },
172
172
        { "Enable invalid char filter", number, _T("1"), normal },
173
173
        { "Invalid char replace", string, _T("_"), normal },
174
 
        { "Already connected choice", number, _T("0"), normal },        
 
174
        { "Already connected choice", number, _T("0"), normal },
175
175
        { "Edit status dialog size", string, _T(""), normal },
176
176
        { "Display current speed", number, _T("0"), normal },
177
177
        { "Toolbar hidden", number, _T("0"), normal },
178
178
        { "Strip VMS revisions", number, _T("0"), normal },
179
179
        { "Show Site Manager on startup", number, _T("0"), normal },
 
180
        { "Prompt password change", number, _T("0"), normal },
180
181
 
181
182
        // Default/internal options
182
183
        { "Config Location", string, _T(""), default_only },
357
358
                        wxString s(wxString::Format(_T("%d"), m_optionsCache[i].numValue));
358
359
                        SetXmlValue(i, s);
359
360
                }
360
 
                
 
361
 
361
362
        }
362
363
 
363
364
        m_pXmlFile->Save();
556
557
 
557
558
        if (GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2)
558
559
                return;
559
 
        
 
560
 
560
561
        CInterProcessMutex mutex(MUTEX_OPTIONS);
561
562
        m_pXmlFile->Save();
562
563
}
736
737
        const wxString& defaultsDir = wxGetApp().GetDefaultsDir();
737
738
        if (defaultsDir == _T(""))
738
739
                return;
739
 
        
 
740
 
740
741
        wxFileName name(defaultsDir, _T("fzdefaults.xml"));
741
742
        CXmlFile file(name);
742
743
        if (!file.Load())