*** empty log message ***

svn path=/trunk/boinc/; revision=11746

checkin_notes

@@ -13872,3 +13872,13 @@ David   29 Dec 2006
 
     db/
         db_base.h
+
+Rom    29 Dec 2006
+    - MGR: Make the simple preferences and messages dialogs have their
+        own help handler, apparently when the event bubbles up to the
+        frame the control ID's were being remapped to the frame window
+        ID.
+        
+    clientgui/
+        sg_DlgMessages.cpp, .h
+        sg_DlgPreferences.cpp, .h

clientgui/sg_DlgMessages.cpp

@@ -33,6 +33,7 @@
 #include "BOINCGUIApp.h"
 #include "SkinManager.h"
 #include "MainDocument.h"
+#include "hyperlink.h"
 #include "sg_DlgMessages.h"
 #include "sg_SGUIListControl.h"
 
@@ -631,6 +632,7 @@ IMPLEMENT_DYNAMIC_CLASS( CDlgMessages, wxDialog )
 
 BEGIN_EVENT_TABLE( CDlgMessages, wxDialog )
 ////@begin CDlgMessages event table entries
+    EVT_HELP(wxID_ANY, CDlgMessages::OnHelp)
     EVT_SHOW( CDlgMessages::OnShow )
     EVT_BUTTON( wxID_OK, CDlgMessages::OnOK )
 ////@end CDlgMessages event table entries
@@ -743,6 +745,27 @@ void CDlgMessages::OnShow(wxShowEvent& event) {
 }
 
 
+/*!
+ * wxEVT_HELP event handler for ID_DLGMESSAGES
+ */
+
+void CDlgMessages::OnHelp(wxHelpEvent& event) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CDlgMessages::OnHelp - Function Begin"));
+
+    if (IsShown()) {
+		std::string url;
+		url = wxGetApp().GetSkinManager()->GetAdvanced()->GetCompanyWebsite().mb_str();
+		canonicalize_master_url(url);
+
+		wxString wxurl;
+		wxurl.Printf(wxT("%smanager_links.php?target=simple_messages&controlid=%d"), url.c_str(), event.GetId());
+        wxHyperLink::ExecuteLink(wxurl);
+    }
+
+    wxLogTrace(wxT("Function Start/End"), wxT("CDlgMessages::OnHelp - Function End"));
+}
+
+
 /*!
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
  */

clientgui/sg_DlgMessages.h

@@ -166,6 +166,9 @@ public:
     /// Creates the controls and sizers
     void CreateControls();
 
+    /// wxEVT_HELP event handler for ID_DLGMESSAGES
+    void OnHelp( wxHelpEvent& event );
+
     /// wxEVT_SHOW event handler for ID_DLGMESSAGES
     void OnShow( wxShowEvent& event );
 

clientgui/sg_DlgPreferences.cpp

@@ -32,6 +32,7 @@
 #include "BOINCGUIApp.h"
 #include "SkinManager.h"
 #include "MainDocument.h"
+#include "hyperlink.h"
 #include "sg_CustomControls.h"
 #include "sg_DlgPreferences.h"
 
@@ -921,6 +922,7 @@ IMPLEMENT_DYNAMIC_CLASS( CDlgPreferences, wxDialog )
 
 BEGIN_EVENT_TABLE( CDlgPreferences, wxDialog )
 ////@begin CDlgPreferences event table entries
+    EVT_HELP(wxID_ANY, CDlgPreferences::OnHelp)
     EVT_BUTTON( wxID_OK, CDlgPreferences::OnOK )
 ////@end CDlgPreferences event table entries
 END_EVENT_TABLE()
@@ -978,6 +980,27 @@ bool CDlgPreferences::Create( wxWindow* parent, wxWindowID id, const wxString& c
 }
 
 
+/*!
+ * wxEVT_HELP event handler for ID_DLGPREFERENCES
+ */
+
+void CDlgPreferences::OnHelp(wxHelpEvent& event) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CDlgPreferences::OnHelp - Function Begin"));
+
+    if (IsShown()) {
+		std::string url;
+		url = wxGetApp().GetSkinManager()->GetAdvanced()->GetCompanyWebsite().mb_str();
+		canonicalize_master_url(url);
+
+		wxString wxurl;
+		wxurl.Printf(wxT("%smanager_links.php?target=simple_preferences&controlid=%d"), url.c_str(), event.GetId());
+        wxHyperLink::ExecuteLink(wxurl);
+    }
+
+    wxLogTrace(wxT("Function Start/End"), wxT("CDlgPreferences::OnHelp - Function End"));
+}
+
+
 /*!
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
  */

clientgui/sg_DlgPreferences.h

@@ -198,6 +198,9 @@ public:
     /// Creation
     bool Create( wxWindow* parent, wxWindowID id = SYMBOL_CDLGPREFERENCES_IDNAME, const wxString& caption = SYMBOL_CDLGPREFERENCES_TITLE, const wxPoint& pos = SYMBOL_CDLGPREFERENCES_POSITION, const wxSize& size = SYMBOL_CDLGPREFERENCES_SIZE, long style = SYMBOL_CDLGPREFERENCES_STYLE );
 
+    /// wxEVT_HELP event handler for ID_DLGPREFERENCES
+    void OnHelp( wxHelpEvent& event );
+
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
     void OnOK( wxCommandEvent& event );
 

win_build/boincmgr_curl_2003.vcproj

@@ -1211,6 +1211,12 @@
 				<File
 					RelativePath="..\clientgui\ViewTransfers.h">
 				</File>
+				<File
+					RelativePath="..\clientgui\ViewTransfersGrid.cpp">
+				</File>
+				<File
+					RelativePath="..\clientgui\ViewTransfersGrid.h">
+				</File>
 				<File
 					RelativePath="..\clientgui\ViewWork.cpp">
 				</File>