1 | diff -u -r src/interface/context_control.cpp ../../filezilla-3.5.3/src/interface/context_control.cpp
|
---|
2 | --- src/interface/context_control.cpp 2012-08-30 12:21:26.199969719 +0530
|
---|
3 | +++ ../../filezilla-3.5.3/src/interface/context_control.cpp 2010-06-14 00:43:28.000000000 +0530
|
---|
4 | @@ -14,7 +14,6 @@
|
---|
5 | #include "splitter.h"
|
---|
6 | #include "view.h"
|
---|
7 | #include "viewheader.h"
|
---|
8 | -#include "quickconnectbar.h"
|
---|
9 |
|
---|
10 | DECLARE_EVENT_TYPE(fzEVT_TAB_CLOSING_DEFERRED, -1);
|
---|
11 | DEFINE_EVENT_TYPE(fzEVT_TAB_CLOSING_DEFERRED);
|
---|
12 | @@ -100,11 +99,7 @@
|
---|
13 |
|
---|
14 | if (m_tabs)
|
---|
15 | m_tabs->SetSelection(m_tabs->GetPageCount() - 1);
|
---|
16 | - if (m_pMainFrame -> GetQuickconnectBar())
|
---|
17 | - {
|
---|
18 | - m_pMainFrame -> GetQuickconnectBar() -> SetFields(CContextManager::Get()->GetCurrentContext());
|
---|
19 | - }
|
---|
20 | -
|
---|
21 | +
|
---|
22 | Thaw();
|
---|
23 | }
|
---|
24 |
|
---|
25 | @@ -499,10 +494,6 @@
|
---|
26 | continue;
|
---|
27 |
|
---|
28 | CContextManager::Get()->SetCurrentContext(m_context_controls[j].pState);
|
---|
29 | - if (m_pMainFrame -> GetQuickconnectBar())
|
---|
30 | - {
|
---|
31 | - m_pMainFrame -> GetQuickconnectBar() -> SetFields(CContextManager::Get()->GetCurrentContext());
|
---|
32 | - }
|
---|
33 | break;
|
---|
34 | }
|
---|
35 | }
|
---|
36 | Only in src/interface: context_control.cpp~
|
---|
37 | diff -u -r src/interface/Mainfrm.cpp ../../filezilla-3.5.3/src/interface/Mainfrm.cpp
|
---|
38 | --- src/interface/Mainfrm.cpp 2012-08-30 12:19:23.298548526 +0530
|
---|
39 | +++ ../../filezilla-3.5.3/src/interface/Mainfrm.cpp 2011-12-29 10:00:18.000000000 +0530
|
---|
40 | @@ -785,11 +785,8 @@
|
---|
41 | }
|
---|
42 | else if (event.GetId() == XRCID("ID_VIEW_QUICKCONNECT"))
|
---|
43 | {
|
---|
44 | - if (!m_pQuickconnectBar)
|
---|
45 | - {
|
---|
46 | + if (!m_pQuickconnectBar)
|
---|
47 | CreateQuickconnectBar();
|
---|
48 | - m_pQuickconnectBar->SetFields(CContextManager::Get()->GetCurrentContext());
|
---|
49 | - }
|
---|
50 | else
|
---|
51 | {
|
---|
52 | m_pQuickconnectBar->Destroy();
|
---|
53 | Only in src/interface: Mainfrm.cpp~
|
---|
54 | diff -u -r src/interface/quickconnectbar.cpp ../../filezilla-3.5.3/src/interface/quickconnectbar.cpp
|
---|
55 | --- src/interface/quickconnectbar.cpp 2012-08-30 11:25:55.783561750 +0530
|
---|
56 | +++ ../../filezilla-3.5.3/src/interface/quickconnectbar.cpp 2012-01-08 16:49:37.000000000 +0530
|
---|
57 | @@ -213,23 +213,6 @@
|
---|
58 | m_pPass->SetValue(_T(""));
|
---|
59 | }
|
---|
60 |
|
---|
61 | -void CQuickconnectBar::SetFields(CState* pState)
|
---|
62 | -{
|
---|
63 | - const CServer* pServer = pState->GetServer();
|
---|
64 | -
|
---|
65 | - if (pServer)
|
---|
66 | - {
|
---|
67 | - m_pHost->SetValue(pServer->GetHost());
|
---|
68 | - m_pPort->SetValue( wxString::Format(_T("%d"), pServer->GetPort()) );
|
---|
69 | - m_pUser->SetValue(pServer->GetUser());
|
---|
70 | - m_pPass->SetValue(pServer->GetPass());
|
---|
71 | - }
|
---|
72 | - else
|
---|
73 | - {
|
---|
74 | - ClearFields();
|
---|
75 | - }
|
---|
76 | -}
|
---|
77 | -
|
---|
78 | void CQuickconnectBar::OnKeyboardNavigation(wxNavigationKeyEvent& event)
|
---|
79 | {
|
---|
80 | if (event.GetDirection() && event.GetEventObject() == XRCCTRL(*this, "ID_QUICKCONNECT_DROPDOWN", wxButton))
|
---|
81 | diff -u -r src/interface/quickconnectbar.h ../../filezilla-3.5.3/src/interface/quickconnectbar.h
|
---|
82 | --- src/interface/quickconnectbar.h 2012-08-30 11:36:16.717879033 +0530
|
---|
83 | +++ ../../filezilla-3.5.3/src/interface/quickconnectbar.h 2010-01-02 20:12:28.000000000 +0530
|
---|
84 | @@ -2,7 +2,6 @@
|
---|
85 | #define __QUICKCONNECTBAR_H__
|
---|
86 |
|
---|
87 | class CMainFrame;
|
---|
88 | -class CState;
|
---|
89 | class CQuickconnectBar : public wxPanel
|
---|
90 | {
|
---|
91 | public:
|
---|
92 | @@ -12,7 +11,6 @@
|
---|
93 | bool Create(CMainFrame* pParent);
|
---|
94 |
|
---|
95 | void ClearFields();
|
---|
96 | - void SetFields(CState* pState);
|
---|
97 |
|
---|
98 | protected:
|
---|
99 | // Only valid while menu is being displayed
|
---|