← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/interface/quickconnectbar.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/quickconnectbar.cpp
6
6
#include "Options.h"
7
7
#include "loginmanager.h"
8
8
#include "Mainfrm.h"
 
9
#include "asksavepassworddialog.h"
9
10
 
10
11
BEGIN_EVENT_TABLE(CQuickconnectBar, wxPanel)
11
12
EVT_BUTTON(XRCID("ID_QUICKCONNECT_OK"), CQuickconnectBar::OnQuickconnect)
31
32
bool CQuickconnectBar::Create(CMainFrame* pParent)
32
33
{
33
34
        m_pMainFrame = pParent;
34
 
    if (!wxXmlResource::Get()->LoadPanel(this, pParent, _T("ID_QUICKCONNECTBAR")))
 
35
        if (!wxXmlResource::Get()->LoadPanel(this, pParent, _T("ID_QUICKCONNECTBAR")))
35
36
        {
36
37
                wxLogError(_("Cannot load Quickconnect bar from resource file"));
37
38
                return false;
73
74
        wxString user = m_pUser->GetValue();
74
75
        wxString pass = m_pPass->GetValue();
75
76
        wxString port = m_pPort->GetValue();
76
 
        
 
77
 
77
78
        CServer server;
78
79
 
79
80
        wxString error;
106
107
                }
107
108
                break;
108
109
        }
109
 
        
 
110
 
110
111
        m_pHost->SetValue(host);
111
112
        if (server.GetPort() != server.GetDefaultPort(server.GetProtocol()))
112
113
                m_pPort->SetValue(wxString::Format(_T("%d"), server.GetPort()));
129
130
        if (event.GetId() == 1)
130
131
                server.SetBypassProxy(true);
131
132
 
 
133
        if (server.GetLogonType() != ANONYMOUS && !CAskSavePasswordDialog::Run(this))
 
134
                return;
 
135
 
132
136
        if (!m_pMainFrame->ConnectToServer(server, path))
133
137
                return;
134
138
 
153
157
                unsigned int i = 0;
154
158
                for (std::list<CServer>::const_iterator iter = m_recentServers.begin();
155
159
                        iter != m_recentServers.end();
156
 
                        iter++, i++)
 
160
                        ++iter, ++i)
157
161
                {
158
162
                        wxString name(iter->FormatServer());
159
163
                        name.Replace(_T("&"), _T("&&"));