Merge branch 'master' of ssh://gelforn.xestia.co.uk/scmrepos/xestiaab

[xestiaab/.git] / source / frmMain.cpp

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index b8a80cf..99784a6 100644 (file)
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -252,7 +252,7 @@ frmMainADT( parent )
     
 #elif defined(__WIN32__)
     
-       int stbBottomData [4] = { -1, 8, 8, 8 };
+       int stbBottomData [4] = { -1, 16, 16, 16 };
     
 #else
     
@@ -271,8 +271,10 @@ frmMainADT( parent )
        stbBottom->GetFieldRect(3, rectActivity);
     
        SSLToolTip = new wxToolTip(wxT(""));
-    
-       imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectOnline.GetX()),(rectOnline.GetY())), wxDefaultSize, 0 );
+
+#if defined(__WIN32__)
+
+       imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint(rectOnline.GetX(),rectOnline.GetY()), wxDefaultSize, 0 );
        imgConnStatus->SetBitmap(*imgOnline);
        imgConnStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ToggleConnectionStatus ), NULL, this );
     
@@ -285,6 +287,23 @@ frmMainADT( parent )
        imgActivityStatus->SetBitmap(*imgActIconSleep);
        imgActivityStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ShowActivityWindow ), NULL, this );
     
+#else
+
+       imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectOnline.GetX()), (rectOnline.GetY())), wxDefaultSize, 0);
+       imgConnStatus->SetBitmap(*imgOnline);
+       imgConnStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ToggleConnectionStatus), NULL, this);
+
+       imgSSLStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectSSL.GetX()), (rectSSL.GetY())), wxDefaultSize, 0);
+       imgSSLStatus->SetBitmap(*imgNoSSL);
+       imgSSLStatus->SetToolTip(SSLToolTip);
+       imgSSLStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ShowSSLCertificates), NULL, this);
+
+       imgActivityStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectActivity.GetX()), (rectActivity.GetY())), wxDefaultSize, 0);
+       imgActivityStatus->SetBitmap(*imgActIconSleep);
+       imgActivityStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ShowActivityWindow), NULL, this);
+
+#endif
+
        // Setup the window menu.
     
        // By default should be:
@@ -2623,7 +2642,7 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
 
                        // Setup and display the form.
 
-                       if (SSLCertificateIter->second->pCertInfo == NULL){
+                       if (SSLCertificateIter == AccountCertificateData.end() || SSLCertificateIter->second->pCertInfo == NULL){
 
                                wxMessageBox("No certificate information is available due to invalid connection details, connection being in progress or invalid certificate data received.");