Ticket #5067: filezilla.5067.patch

src/interface/Mainfrm.cpp

@@ -2753 +2753 @@
             else
                 XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->SetValue(true);
 
-            if (dlg.ShowModal() != wxID_OK)
+            int remembered = COptions::Get()->GetOptionVal(OPTION_ALREADYCONNECTED_REMEMBER);
+            wxCheckBox* remember = XRCCTRL(dlg, "ID_REMEMBERTAB", wxCheckBox);
+            remember->SetValue(remembered != 0);
+            if (remembered != 1 && dlg.ShowModal() != wxID_OK)
                 return false;
 
+            COptions::Get()->SetOption(OPTION_ALREADYCONNECTED_REMEMBER, remember->GetValue() ? 1 : 0);         
+            
             if (XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->GetValue())
             {
                 m_pContextControl->CreateTab();

src/interface/Options.cpp

@@ -172 +172 @@
     { "Enable invalid char filter", number, _T("1"), normal },
     { "Invalid char replace", string, _T("_"), normal },
     { "Already connected choice", number, _T("0"), normal },
+    { "Remember already connected", number, _T("1"), normal },
     { "Edit status dialog size", string, _T(""), normal },
     { "Display current speed", number, _T("0"), normal },
     { "Toolbar hidden", number, _T("0"), normal },

src/interface/Options.h

@@ -77 +77 @@
     OPTION_INVALID_CHAR_REPLACE_ENABLE,
     OPTION_INVALID_CHAR_REPLACE,
     OPTION_ALREADYCONNECTED_CHOICE,
+    OPTION_ALREADYCONNECTED_REMEMBER,
     OPTION_EDITSTATUSDIALOG_SIZE,
     OPTION_SPEED_DISPLAY,
     OPTION_TOOLBAR_HIDDEN,

src/interface/resources/dialogs.xrc

@@ -4802 +4802 @@
                   <label>Abort previous connection and connect in current tab</label>
                 </object>
               </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="ID_REMEMBERTAB">
+                  <label>Remember my choice next time</label>
+                </object>
+              </object>
               <cols>1</cols>
               <vgap>5</vgap>
             </object>

src/interface/resources/settings.xrc

@@ -182 +182 @@
             <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="ID_REMEMBERRECONNECTTAB_SETTING">
+                  <label>Remember current already connected action</label>
+                </object>
+              </object>
+              <cols>1</cols>
+              <vgap>5</vgap>
+            </object>
+            <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
+            <border>4</border>
+          </object>
           <label>Reconnection settings</label>
           <orient>wxVERTICAL</orient>
         </object>

src/interface/settings/optionspage_connection.cpp

@@ -15 +15 @@
     SetTextFromOption(XRCID("ID_RETRIES"), OPTION_RECONNECTCOUNT, failure);
     SetTextFromOption(XRCID("ID_RETRYDELAY"), OPTION_RECONNECTDELAY, failure);
     SetTextFromOption(XRCID("ID_TIMEOUT"), OPTION_TIMEOUT, failure);
+    SetCheckFromOption(XRCID("ID_REMEMBERRECONNECTTAB_SETTING"), OPTION_ALREADYCONNECTED_REMEMBER, failure);
     return !failure;
 }
 
@@ -23 +24 @@
     SetIntOptionFromText(XRCID("ID_RETRIES"), OPTION_RECONNECTCOUNT);
     SetIntOptionFromText(XRCID("ID_RETRYDELAY"), OPTION_RECONNECTDELAY);
     SetOptionFromText(XRCID("ID_TIMEOUT"), OPTION_TIMEOUT);
+    SetOptionFromCheck(XRCID("ID_REMEMBERRECONNECTTAB_SETTING"), OPTION_ALREADYCONNECTED_REMEMBER);
     return true;
 }
 

src/interface/settings/optionspage_transfer.cpp

@@ -58 +58 @@
     pTextCtrl->SetMaxLength(1);
     pTextCtrl->ChangeValue(m_pOptions->GetOption(OPTION_INVALID_CHAR_REPLACE));
 
-    SetCheckFromOption(XRCID("ID_ENABLE_REPLACE"), OPTION_INVALID_CHAR_REPLACE_ENABLE, failure);
+    SetCheckFromOption(XRCID("ID_ENABLE_REPLACE"), OPTION_INVALID_CHAR_REPLACE_ENABLE, failure);    
 
 #ifdef __WXMSW__
     wxString invalid = _T("\\ / : * ? \" < > |");
@@ -82 +82 @@
     SetOptionFromText(XRCID("ID_UPLOADLIMIT"), OPTION_SPEEDLIMIT_OUTBOUND);
     m_pOptions->SetOption(OPTION_SPEEDLIMIT_BURSTTOLERANCE, GetChoice(XRCID("ID_BURSTTOLERANCE")));
     SetOptionFromText(XRCID("ID_REPLACE"), OPTION_INVALID_CHAR_REPLACE);
-    SetOptionFromCheck(XRCID("ID_ENABLE_REPLACE"), OPTION_INVALID_CHAR_REPLACE_ENABLE);
+    SetOptionFromCheck(XRCID("ID_ENABLE_REPLACE"), OPTION_INVALID_CHAR_REPLACE_ENABLE); 
 
     return true;
 }