Merge pull request #28 from nikodemak/master

help menu rework
AllegianceZone · Nov 3, 2017 · 736a9e1 · 736a9e1
2 parents 785f18c + 2b06e0a
commit 736a9e1
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 6 deletions.
diff --git a/src/effect/help.cpp b/src/effect/help.cpp
@@ -1,5 +1,4 @@
 #include "pch.h"
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // Help
@@ -60,6 +59,8 @@ class HelpPaneImpl :
     TRef<INameSpace> m_pns;
     TRef<ButtonPane> m_pbuttonBack;
     TRef<ButtonPane> m_pbuttonClose;
+	TRef<ButtonPane> m_pbuttonDiscord;
+	TRef<ButtonPane> m_pbuttonWiki;
     TRef<PagePane>   m_ppageMain;
     TRef<PagePane>   m_ppageSecondary;
     TRef<NavPane>    m_pnavPane;
@@ -106,8 +107,12 @@ class HelpPaneImpl :
 		// mdvalley: OnButtonBack now pointered and with class named.
 		AddEventTarget(&HelpPaneImpl::OnButtonBack, m_pbuttonBack->GetEventSource());
 
-        CastTo(m_pbuttonClose, m_pns->FindMember("closeButton"));
 
+        CastTo(m_pbuttonClose, m_pns->FindMember("closeButton"));
+		CastTo(m_pbuttonDiscord, m_pns->FindMember("DiscordButton"));
+		AddEventTarget(&HelpPaneImpl::OnButtonDiscord, m_pbuttonDiscord->GetEventSource());
+		CastTo(m_pbuttonWiki, m_pns->FindMember("WikiButton"));
+		AddEventTarget(&HelpPaneImpl::OnButtonWiki, m_pbuttonWiki->GetEventSource());
         //
         // Default attributes
         //
@@ -194,7 +199,10 @@ class HelpPaneImpl :
     // Implementation methods
     //
     //////////////////////////////////////////////////////////////////////////////
-
+	void ShowWebPage(const char* szURL)
+	{
+		ShellExecute(NULL, NULL, szURL, NULL, NULL, SW_SHOWNORMAL);
+	}
     void DoSetTopic()
     {
         const ZString& str = m_listHistory.GetFront();
@@ -211,7 +219,6 @@ class HelpPaneImpl :
     // Events
     //
     //////////////////////////////////////////////////////////////////////////////
-
     bool OnButtonBack()
     {
         if (m_listHistory.GetCount() > 1) {
@@ -229,6 +236,20 @@ class HelpPaneImpl :
         }
         return true;
     }
+	bool OnButtonDiscord() 
+	{
+
+		ShowWebPage("https://discord.gg/WcEJ9VH");
+		int Getwindow();
+		return true;
+	}
+	bool OnButtonWiki()
+	{
+
+		ShowWebPage("http://www.freeallegiance.org/FAW/index.php/Quick_Crash_Course");
+		int Getwindow();
+		return true;
+	}
 
     bool OnSecondaryTopic(const ZString& str)
     {

diff --git a/src/effect/mmlpopup.cpp b/src/effect/mmlpopup.cpp
@@ -20,6 +20,8 @@ class MMLPopup :
     TRef<Pane>       m_ppane;
     TRef<INameSpace> m_pns;
     TRef<ButtonPane> m_pbuttonClose;
+	TRef<ButtonPane> m_pbuttonDiscord;
+	TRef<ButtonPane> m_pbuttonWiki;
     TRef<PagePane>   m_ppageMain;
     TRef<ScrollPane> m_pscrollMain;
 
@@ -50,7 +52,10 @@ class MMLPopup :
         CastTo(m_pbuttonClose, m_pns->FindMember("closeButton"));
 		// mdvalley: OnButtonClose now needs to be pointer and with class spelled out in 2005.
 		AddEventTarget(&MMLPopup::OnButtonClose, m_pbuttonClose->GetEventSource());
-
+		CastTo(m_pbuttonDiscord, m_pns->FindMember("DiscordButton"));
+		AddEventTarget(&MMLPopup::OnButtonDiscord, m_pbuttonDiscord->GetEventSource());
+		CastTo(m_pbuttonWiki, m_pns->FindMember("WikiButton"));
+		AddEventTarget(&MMLPopup::OnButtonWiki, m_pbuttonWiki->GetEventSource());
         //
         // Default attributes
         //
@@ -108,12 +113,29 @@ class MMLPopup :
     // Events
     //
     //////////////////////////////////////////////////////////////////////////////
-
+	void ShowWebPage(const char* szURL)
+	{
+		ShellExecute(NULL, NULL, szURL, NULL, NULL, SW_SHOWNORMAL);
+	}
     bool OnButtonClose()
     {
         Close();
         return true;
     }
+	bool OnButtonDiscord()
+	{
+
+		ShowWebPage("https://discord.gg/WcEJ9VH");
+		int GetWindow();
+		return true;
+	}
+	bool OnButtonWiki()
+	{
+
+		ShowWebPage("http://www.freeallegiance.org/FAW/index.php/Quick_Crash_Course");
+		int GetWindow();
+		return true;
+	}
 
     void Close()
     {