Ticket #155: 0001-Made-the-connect-dialog-aware-of-branches.patch

src/connectwindow.cpp

@@ -30 +30 @@
   EVT_BUTTON ( wxID_OK,     ConnectWindow::OnOk )
   EVT_BUTTON ( wxID_CANCEL, ConnectWindow::OnCancel )
   EVT_COMBOBOX ( CON_SERV_SEL , ConnectWindow::OnServerChange )
-
+#ifndef NO_CURL_LADDER    
+  EVT_CHECKBOX ( CON_SERV_LADDER_CHECK , ConnectWindow::OnLadderCheck )
+#endif
 END_EVENT_TABLE()
 
 //! @brief Constructor
@@ -43 +45 @@
   wxString server;
   wxString username;
   wxString password;
+#ifndef NO_CURL_LADDER  
+  wxString ladder_password;
+#endif
   bool savepass;
   bool autoconnect;
 
@@ -51 +56 @@
   server = sett().GetDefaultServer();
   username = sett().GetServerAccountNick( sett().GetDefaultServer() );
   password = sett().GetServerAccountPass( sett().GetDefaultServer() );
+#ifndef NO_CURL_LADDER  
+  ladder_password = sett().GetServerAccountLadderPass( sett().GetDefaultServer() );
+#endif
   savepass = sett().GetServerAccountSavePass( sett().GetDefaultServer() );
   autoconnect = sett().GetAutoConnect();
   // Create all UI elements.
@@ -62 +70 @@
   m_server_combo = new wxComboBox  ( m_login_tab, CON_SERV_SEL, server );
   m_server_combo->SetToolTip( _("Server to connect to. You can connect to any server you like by typing in hostaddress:port format.") );
 
+#ifndef NO_CURL_LADDER
+  m_ladder_lbl =   new wxStaticText( m_login_tab, -1, _("Ladder server") );
+  m_ladder_combo = new wxComboBox  ( m_login_tab, CON_SERV_SEL, server );
+  m_ladder_combo->SetToolTip( _("Ladder server to connect to. You can connect to any server.") );
+#endif
+
   m_ser_acc_line = new wxStaticLine( m_login_tab );
 
   m_nick_lbl =    new wxStaticText( m_login_tab, -1, _("Nickname") );
   m_nick_text =   new wxTextCtrl  ( m_login_tab, -1, username );
   m_pass_lbl =    new wxStaticText( m_login_tab, -1, _("Password") );
   m_pass_text =   new wxTextCtrl  ( m_login_tab, -1, password, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+  
+#ifndef NO_CURL_LADDER
+  m_ladder_pass_lbl =    new wxStaticText( m_login_tab, -1, _("Ladder Password") );
+  m_ladder_pass_text =   new wxTextCtrl  ( m_login_tab, -1, ladder_password, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+#endif
+
   m_rpass_check = new wxCheckBox  ( m_login_tab, -1, _("Remember password") );
   m_autoconnect_check = new wxCheckBox  ( m_login_tab, -1, _("Autoconnect next time") );
   m_autoconnect_check->SetToolTip( _("remember connection details and automatically connect to server on next lobby startup") );
+  
+#ifndef NO_CURL_LADDER  
+  m_ladder_check = new wxCheckBox  ( m_login_tab, CON_SERV_LADDER_CHECK , _("Connect to ladder") );
+  m_ladder_check->SetToolTip( _("connect to a ladder") );
+#endif
 
   m_rpass_check->SetValue( savepass );
   m_autoconnect_check->SetValue( autoconnect );
 
+#ifndef NO_CURL_LADDER  
+  m_ladder_check->SetValue( sett().GetServerLadderConnect( sett().GetDefaultServer() ) );
+#endif
+
+
   m_acc_note_line = new wxStaticLine( m_login_tab );
 
   m_note_lbl = new wxStaticText( m_login_tab, -1, _("Note: If you do not have an account, you\n can register one for free under the\n\"Register\" tab.") );
@@ -90 +120 @@
   m_main_sizer = new wxBoxSizer( wxVERTICAL );
   m_login_main_sizer = new wxBoxSizer( wxVERTICAL );
   m_server_sizer = new wxBoxSizer( wxHORIZONTAL );
+#ifndef NO_CURL_LADDER  
+  m_ladder_sizer = new wxBoxSizer( wxHORIZONTAL );
+#endif  
   m_nick_sizer = new wxBoxSizer( wxHORIZONTAL );
   m_pass_sizer = new wxBoxSizer( wxHORIZONTAL );
+#ifndef NO_CURL_LADDER  
+  m_ladder_pass_sizer = new wxBoxSizer( wxHORIZONTAL );
+#endif  
   m_rpass_sizer = new wxBoxSizer( wxVERTICAL );
   wxBoxSizer* m_check_sizer = new wxBoxSizer( wxHORIZONTAL );
   m_buttons_sizer = new wxBoxSizer( wxHORIZONTAL );
@@ -103 +139 @@
 
   m_rpass_sizer->Add( m_rpass_check, 2, wxEXPAND | wxALL | wxALIGN_RIGHT, 4 );
   m_rpass_sizer->Add( m_autoconnect_check, 2, wxEXPAND | wxALL | wxALIGN_RIGHT, 4 );
+#ifndef NO_CURL_LADDER  
+  m_rpass_sizer->Add( m_ladder_check, 2, wxEXPAND | wxALL | wxALIGN_RIGHT, 4 );
+#endif
 
   m_pass_sizer->Add( m_pass_lbl, 1, wxEXPAND | wxALL, 4 );
   m_pass_sizer->Add( m_pass_text, 2, wxEXPAND | wxALL, 4 );
+  
+#ifndef NO_CURL_LADDER  
+  m_ladder_pass_sizer->Add( m_ladder_pass_lbl, 1, wxEXPAND | wxALL, 4 );
+  m_ladder_pass_sizer->Add( m_ladder_pass_text, 2, wxEXPAND | wxALL, 4 );
+#endif
 
   //FIXME was lazy, absoulte positioning isn't that nice
   int pos1 = (m_pass_lbl->GetSize()).GetWidth() + 40;
@@ -118 +162 @@
   m_server_sizer->Add( m_server_lbl, 1, wxEXPAND | wxALL, 4 );
   m_server_sizer->Add( m_server_combo, 2, wxEXPAND | wxALL, 4 );
 
+#ifndef NO_CURL_LADDER  
+  m_ladder_sizer->Add( m_ladder_lbl, 1, wxEXPAND | wxALL, 4 );
+  m_ladder_sizer->Add( m_ladder_combo, 2, wxEXPAND | wxALL, 4 );
+#endif
+
   m_login_main_sizer->Add( m_server_sizer, 0, wxEXPAND );
+#ifndef NO_CURL_LADDER  
+  m_login_main_sizer->Add( m_ladder_sizer, 0, wxEXPAND );
+#endif
   m_login_main_sizer->Add( m_ser_acc_line, 0, wxEXPAND | wxALL, 4 );
   m_login_main_sizer->Add( m_nick_sizer, 0, wxEXPAND );
   m_login_main_sizer->Add( m_pass_sizer, 0, wxEXPAND  );
+#ifndef NO_CURL_LADDER  
+  m_login_main_sizer->Add( m_ladder_pass_sizer, 0, wxEXPAND );
+#endif
   m_login_main_sizer->Add( m_check_sizer, 0, wxEXPAND );
   m_login_main_sizer->Add( m_acc_note_line, 0, wxEXPAND | wxALL, 4 );
   m_login_main_sizer->Add( m_note_lbl, 0, wxEXPAND | wxALL, 4 );
@@ -192 +247 @@
 #endif
 
   ReloadServerList();
+  
+#ifndef NO_CURL_LADDER  
+  // Depending on the value of ladder check we want to have disabled/enabled the ladder fields
+  wxCommandEvent temp = wxCommandEvent();
+  OnLadderCheck( temp );
+#endif
 }
 
 
@@ -209 +270 @@
     m_server_combo->AppendString( sett().GetServerName( i ) );
   }
   m_server_combo->SetValue( sett().GetDefaultServer() );
+  
+#ifndef NO_CURL_LADDER  
+  m_ladder_combo->Clear();
+  for ( int i = 0; i < sett().GetNumLadderServers(); i++ ) {
+    m_ladder_combo->AppendString( sett().GetLadderServerName( i ) );
+  }
+  m_ladder_combo->SetValue( sett().GetDefaultLadderServer() );
+#endif  
 }
 
 void ConnectWindow::OnServerChange( wxCommandEvent& event )
@@ -219 +288 @@
   if ( sett().GetServerAccountSavePass( HostAddress ) ) m_pass_text->SetValue( sett().GetServerAccountPass( HostAddress ) );
 }
 
+#ifndef NO_CURL_LADDER  
+void ConnectWindow::OnLadderCheck( wxCommandEvent& event )
+{ 
+    if ( m_ladder_check->GetValue() == true ) 
+    {
+      m_ladder_combo->Enable( true );
+      m_ladder_pass_text->SetValue( sett().GetServerAccountLadderPass( sett().GetDefaultServer() ) );
+      m_ladder_pass_text->Enable( true );
+    } 
+    else 
+    {
+      m_ladder_combo->Enable( false );
+      // We do this so that it can be seen easy it is disabled
+      m_ladder_pass_text->SetValue( _T("something") );
+      m_ladder_pass_text->Enable( false );
+    }
+}
+#endif
 
 void ConnectWindow::OnOk(wxCommandEvent& event)
 {
@@ -267 +354 @@
     if ( m_autoconnect_check->IsChecked() )
         sett().SetServerAccountSavePass( HostAddress, true );
 
+#ifndef NO_CURL_LADDER          
+    sett().SetServerLadderConnect( HostAddress, m_ladder_check->GetValue() );
+    if ( m_ladder_check->GetValue() == true ) 
+    {
+        sett().AddLadderServer ( m_ladder_combo->GetValue() );
+        sett().SetServerAccountLadderPass ( HostAddress, m_ladder_pass_text->GetValue() );
+                
+        // TODO: check if the pass is correct and if not offer to register to ladder
+    }
+#endif
+
     sett().SaveSettings();
     ReloadServerList();
 

src/connectwindow.h

@@ -26 +26 @@
     void ReloadServerList();
 
     void OnServerChange( wxCommandEvent& event );
+    
+#ifndef NO_CURL_LADDER  
+    void OnLadderCheck( wxCommandEvent& event );
+#endif
 
     void OnOk(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
@@ -40 +44 @@
     wxStaticText* m_server_lbl;     //!< Label saying "Server"
     wxComboBox*   m_server_combo;   //!< Combobox where user can select server
 
+#ifndef NO_CURL_LADDER  
+    wxStaticText* m_ladder_lbl;     //!< Label saying "Ladder Server"
+    wxComboBox*   m_ladder_combo;   //!< Combobox where user can select ladder server
+#endif 
+
     wxStaticLine* m_ser_acc_line;   //!< Line that separates the server setting and the acount settings
 
     wxStaticText* m_nick_lbl;       //!< Label saying "Nickname"
     wxTextCtrl*   m_nick_text;      //!< Textbox where user can input nickname
     wxStaticText* m_pass_lbl;       //!< Label saying "Password"
     wxTextCtrl*   m_pass_text;      //!< Textbox where user can input password
+#ifndef NO_CURL_LADDER  
+    wxStaticText* m_ladder_pass_lbl;      //!< Label saying "Ladder password"
+    wxTextCtrl*   m_ladder_pass_text;     //!< Textbox where user can input password for ladder
+#endif    
     wxCheckBox*   m_rpass_check;    //!< Checkbox where user can chose if he wants his password to be saved.
     wxCheckBox*   m_autoconnect_check;    //!< Checkbox where user can chose if he wants to autoconnect.
+#ifndef NO_CURL_LADDER  
+    wxCheckBox*   m_ladder_check;    //!< Checkbox where user can chose if he wants to connect to a ladder.
+#endif    
 
     wxStaticLine* m_acc_note_line;  //!< Line that separates the account settings from the note
 
@@ -59 +75 @@
     wxBoxSizer* m_main_sizer;       //!< The main sizer connecting it all together
     wxBoxSizer* m_login_main_sizer; //!< Login tab main sizer
     wxBoxSizer* m_server_sizer;     //!< Sizer connecting server label and combo
+#ifndef NO_CURL_LADDER  
+    wxBoxSizer* m_ladder_sizer;     //!< Sizer connecting server label and combo
+#endif
     wxBoxSizer* m_nick_sizer;       //!< Sizer connecting nick label and input
     wxBoxSizer* m_pass_sizer;       //!< Sizer connecting password label and input
+#ifndef NO_CURL_LADDER  
+    wxBoxSizer* m_ladder_pass_sizer; //!< Sizer connecting ladder password label and input
+#endif
     wxBoxSizer* m_rpass_sizer;      //!< Sizer spacing the remember password setting
     wxBoxSizer* m_buttons_sizer;    //!< Sizer connecting the ok and cancel buttons
 
@@ -80 +102 @@
 
 enum
 {
-  CON_SERV_SEL = wxID_HIGHEST
+  CON_SERV_SEL = wxID_HIGHEST,
+  CON_SERV_LADDER_CHECK
 };
 
 

src/settings.cpp

@@ -344 +344 @@
     return m_config->Read( wxString::Format( _T("/Servers/Server%d"), index ), _T("") );
 }
 
+#ifndef NO_CURL_LADDER  
+
+//! @brief Get the name/alias of the default ladder server.
+//!
+//! @note Normally this will be the ladder server selected for the current server. But when first selecting a server and activating the ladder  it will be a server that is set as the default.
+wxString Settings::GetDefaultLadderServer()
+{
+    wxString serv = WX_STRINGC(DEFSETT_DEFAULT_LADDER_SERVER);
+    return m_config->Read( _T("/LadderServers/Default"), serv );
+}
+
+
+//! @brief Set the name/alias of the default ladder server.
+//!
+//! @param ladder_server_name the server name/alias
+//! @see GetDefaultLadderServer()
+void   Settings::SetDefaultLadderServer( const wxString& ladder_server_name )
+{
+    m_config->Write( _T("/LadderServers/Default"),  ladder_server_name );
+}
+
+int Settings::GetNumLadderServers()
+{
+    return m_config->Read( _T("/LadderServers/Count"), (long)0 );
+}
+
+void Settings::SetNumLadderServers( int num )
+{
+    m_config->Write( _T("/LadderServers/Count"), num );
+}
+
+//! @brief Get name/alias of a ladder server.
+//!
+//! @param index the server index
+wxString Settings::GetLadderServerName( int index )
+{
+    return m_config->Read( wxString::Format( _T("/LadderServers/Server%d"), index ), _T("") );
+}
+
+void Settings::AddLadderServer( const wxString& ladder_server_name )
+{
+    int index = GetLadderServerIndex( ladder_server_name );
+    if ( index != -1 ) return;
+
+    index = GetNumLadderServers();
+    SetNumLadderServers( index + 1 );
+
+    m_config->Write( _T("/LadderServers/Server")+ wxString::Format( _T("%d"), index ), ladder_server_name );
+}
+
+int Settings::GetLadderServerIndex( const wxString& ladder_server_name )
+{
+    int num = GetNumLadderServers();
+    for ( int i= 0; i < num; i++ )
+    {
+        if ( GetLadderServerName( i ) == ladder_server_name ) return i;
+    }
+    return -1;
+}
+
+#endif
 
 //! @brief Get nickname of the default account for a server.
 //!
@@ -384 +445 @@
     m_config->Write( _T("/Server/")+ server_name +_T("/pass"), value );
 }
 
+#ifndef NO_CURL_LADDER  
+//! @brief Get password for the ladder for the server.
+//!
+//! @param server_name the server name/alias
+wxString Settings::GetServerAccountLadderPass( const wxString& server_name )
+{
+    return m_config->Read( _T("/Server/")+ server_name +_T("/LadderPass"), _T("") );
+}
+
+
+//! @brief Set password for ladder for the server.
+//!
+//! @param server_name the server name/alias
+//! @param value the vaule to be set
+void   Settings::SetServerAccountLadderPass( const wxString& server_name, const wxString& value )
+{
+    m_config->Write( _T("/Server/")+ server_name +_T("/LadderPass"), value );
+}
+
+wxString Settings::GetServerLadder( const wxString& server_name )
+{
+    return m_config->Read( _T("/Server/")+ server_name +_T("/Ladder"), _T("") );
+}
+
+void Settings::SetServerLadder( const wxString& server_name, const wxString& value )
+{
+    m_config->Write( _T("/Server/")+ server_name +_T("/Ladder"), value );
+}
+
+bool Settings::GetServerLadderConnect( const wxString& server_name )
+{
+    return m_config->Read( _T("/Server/")+ server_name +_T("/LadderConnect"), 0l );
+}
+
+void Settings::SetServerLadderConnect( const wxString& server_name, bool do_autoconnect )
+{
+    m_config->Write( _T("/Server/")+ server_name +_T("/LadderConnect"),  do_autoconnect );
+}
+
+#endif
 
 //! @brief Get if the password should be saved for a default server account.
 //!

src/settings.h

@@ -8 +8 @@
 
 #define DEFSETT_DEFAULT_SERVER "TAS Server"
 #define DEFSETT_DEFAULT_SERVER_HOST "taspringmaster.clan-sy.com"
+#define DEFSETT_DEFAULT_LADDER_SERVER "http://springladder.no-ip.org/ladder"
 #define DEFSETT_DEFAULT_SERVER_PORT 8200
 #define DEFSETT_SAVE_PASSWORD false
 #define DEFSETT_MW_WIDTH 880
@@ -184 +185 @@
 
     wxString GetServerName( int index );
     /**@}*/
+    
+#ifndef NO_CURL_LADDER  
+    /* ================================================================ */
+    /** @name Ladder Servers
+     * @{
+     */
+
+    wxString GetDefaultLadderServer();
+    void SetDefaultLadderServer( const wxString& ladder_server_name );
+    
+    int GetNumLadderServers();
+    void SetNumLadderServers( int num );
+
+    wxString GetLadderServerName( int index );
+    
+    void AddLadderServer( const wxString& server_name );
+
+    int GetLadderServerIndex( const wxString& server_name );
+    
+    /**@}*/
+#endif
 
     /* ================================================================ */
     /** @name Accounts
@@ -195 +217 @@
     wxString GetServerAccountPass( const wxString& server_name );
     void   SetServerAccountPass( const wxString& server_name, const wxString& value );
 
+#ifndef NO_CURL_LADDER  
+    wxString GetServerAccountLadderPass( const wxString& server_name );
+    void   SetServerAccountLadderPass( const wxString& server_name, const wxString& value );
+
+    wxString GetServerLadder( const wxString& server_name);
+    void SetServerLadder( const wxString& server_name, const wxString& value );
+    
+    bool GetServerLadderConnect( const wxString& server_name);
+    void SetServerLadderConnect( const wxString& server_name, bool do_autoconnect );
+#endif
+
     bool   GetServerAccountSavePass( const wxString& server_name );
     void   SetServerAccountSavePass( const wxString& server_name, const bool value );
     /**@}*/