← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/interface/bookmarks_dialog.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/bookmarks_dialog.cpp
38
38
        XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl)->ChangeValue(local_path);
39
39
        if (!remote_path.IsEmpty())
40
40
                XRCCTRL(*this, "ID_REMOTEPATH", wxTextCtrl)->ChangeValue(remote_path.GetPath());
41
 
        
 
41
 
42
42
        if (!m_server)
43
43
                XRCCTRL(*this, "ID_TYPE_SITE", wxRadioButton)->Enable(false);
44
44
 
101
101
                                return;
102
102
                        }
103
103
                }
104
 
                for (std::list<wxString>::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); iter++)
 
104
                for (std::list<wxString>::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); ++iter)
105
105
                {
106
106
                        if (*iter == name)
107
107
                        {
218
218
        if (!CSiteManager::GetBookmarks(m_site_path, bookmarks))
219
219
                return;
220
220
 
221
 
        for (std::list<wxString>::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); iter++)
 
221
        for (std::list<wxString>::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); ++iter)
222
222
        {
223
223
                wxString path = *iter;
224
224
                path.Replace(_T("\\"), _T("\\\\"));
368
368
        wxTreeItemId item = m_pTree->GetSelection();
369
369
        if (!item)
370
370
                return;
371
 
        
 
371
 
372
372
        CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item);
373
373
        if (!data)
374
374
                return;
403
403
        wxTreeItemId item = m_pTree->GetSelection();
404
404
        if (!item)
405
405
                return true;
406
 
        
 
406
 
407
407
        CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item);
408
408
        if (!data)
409
409
                return true;
462
462
        wxTreeItemId item = m_pTree->GetSelection();
463
463
        if (!item)
464
464
                return;
465
 
        
 
465
 
466
466
        CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item);
467
467
        if (!data)
468
468
                return;
499
499
                XRCCTRL(*this, "ID_NOTEBOOK", wxNotebook)->Enable(false);
500
500
                return;
501
501
        }
502
 
        
 
502
 
503
503
        CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item);
504
504
        if (!data)
505
505
        {
556
556
 
557
557
        wxString newName = _("New bookmark");
558
558
        int index = 2;
559
 
        while (true)
 
559
        for (;;)
560
560
        {
561
561
                wxTreeItemId child;
562
562
                wxTreeItemIdValue cookie;
627
627
        const wxString name = m_pTree->GetItemText(item);
628
628
        wxString newName = wxString::Format(_("Copy of %s"), name.c_str());
629
629
        int index = 2;
630
 
        while (true)
 
630
        for (;;)
631
631
        {
632
632
                wxTreeItemId child;
633
633
                wxTreeItemIdValue cookie;
777
777
        for (TiXmlElement *pBookmark = pDocument->FirstChildElement("Bookmark"); pBookmark; pBookmark = pBookmark->NextSiblingElement("Bookmark"))
778
778
        {
779
779
                wxString remote_dir_raw;
780
 
        
 
780
 
781
781
                if (name != GetTextElement(pBookmark, "Name"))
782
782
                        continue;
783
783
 
830
830
                wxString remote_dir_raw;
831
831
 
832
832
                wxString old_name = GetTextElement(pBookmark, "Name");
833
 
        
 
833
 
834
834
                if (!name.CmpNoCase(old_name))
835
835
                {
836
836
                        wxMessageBox(_("Name of bookmark already exists."), _("New bookmark"), wxICON_EXCLAMATION);