Merge branch 'subway'

1 files changed, 69 insertions, 13 deletions

@@ -1,6 +1,8 @@
 #include "tracker_frame.h"
 
+#include <wx/aboutdlg.h>
 #include <wx/choicebk.h>
+#include <wx/notebook.h>
 #include <wx/webrequest.h>
 
 #include <nlohmann/json.hpp>
@@ -10,6 +12,7 @@
 #include "ap_state.h"
 #include "connection_dialog.h"
 #include "settings_dialog.h"
+#include "subway_map.h"
 #include "tracker_config.h"
 #include "tracker_panel.h"
 #include "version.h"
@@ -17,9 +20,12 @@
 enum TrackerFrameIds {
   ID_CONNECT = 1,
   ID_CHECK_FOR_UPDATES = 2,
-  ID_SETTINGS = 3
+  ID_SETTINGS = 3,
+  ID_ZOOM_IN = 4,
+  ID_ZOOM_OUT = 5,
 };
 
+wxDEFINE_EVENT(STATE_RESET, wxCommandEvent);
 wxDEFINE_EVENT(STATE_CHANGED, wxCommandEvent);
 wxDEFINE_EVENT(STATUS_CHANGED, wxCommandEvent);
 
@@ -35,12 +41,20 @@ TrackerFrame::TrackerFrame()
   menuFile->Append(ID_SETTINGS, "&Settings");
   menuFile->Append(wxID_EXIT);
 
+  wxMenu *menuView = new wxMenu();
+  zoom_in_menu_item_ = menuView->Append(ID_ZOOM_IN, "Zoom In\tCtrl-+");
+  zoom_out_menu_item_ = menuView->Append(ID_ZOOM_OUT, "Zoom Out\tCtrl--");
+
+  zoom_in_menu_item_->Enable(false);
+  zoom_out_menu_item_->Enable(false);
+
   wxMenu *menuHelp = new wxMenu();
   menuHelp->Append(wxID_ABOUT);
   menuHelp->Append(ID_CHECK_FOR_UPDATES, "Check for Updates");
 
   wxMenuBar *menuBar = new wxMenuBar();
   menuBar->Append(menuFile, "&File");
+  menuBar->Append(menuView, "&View");
   menuBar->Append(menuHelp, "&Help");
 
   SetMenuBar(menuBar);
@@ -54,18 +68,26 @@ TrackerFrame::TrackerFrame()
   Bind(wxEVT_MENU, &TrackerFrame::OnSettings, this, ID_SETTINGS);
   Bind(wxEVT_MENU, &TrackerFrame::OnCheckForUpdates, this,
        ID_CHECK_FOR_UPDATES);
+  Bind(wxEVT_MENU, &TrackerFrame::OnZoomIn, this, ID_ZOOM_IN);
+  Bind(wxEVT_MENU, &TrackerFrame::OnZoomOut, this, ID_ZOOM_OUT);
+  Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, &TrackerFrame::OnChangePage, this);
+  Bind(STATE_RESET, &TrackerFrame::OnStateReset, this);
   Bind(STATE_CHANGED, &TrackerFrame::OnStateChanged, this);
   Bind(STATUS_CHANGED, &TrackerFrame::OnStatusChanged, this);
 
   wxChoicebook *choicebook = new wxChoicebook(this, wxID_ANY);
-  achievements_pane_ = new AchievementsPane(this);
+  achievements_pane_ = new AchievementsPane(choicebook);
   choicebook->AddPage(achievements_pane_, "Achievements");
 
-  tracker_panel_ = new TrackerPanel(this);
+  notebook_ = new wxNotebook(this, wxID_ANY);
+  tracker_panel_ = new TrackerPanel(notebook_);
+  subway_map_ = new SubwayMap(notebook_);
+  notebook_->AddPage(tracker_panel_, "Map");
+  notebook_->AddPage(subway_map_, "Subway");
 
   wxBoxSizer *top_sizer = new wxBoxSizer(wxHORIZONTAL);
   top_sizer->Add(choicebook, wxSizerFlags().Expand().Proportion(1));
-  top_sizer->Add(tracker_panel_, wxSizerFlags().Expand().Proportion(3));
+  top_sizer->Add(notebook_, wxSizerFlags().Expand().Proportion(3));
 
   SetSizerAndFit(top_sizer);
   SetSize(1280, 728);
@@ -96,17 +118,23 @@ void TrackerFrame::SetStatusMessage(std::string message) {
   QueueEvent(event);
 }
 
+void TrackerFrame::ResetIndicators() {
+  QueueEvent(new wxCommandEvent(STATE_RESET));
+}
+
 void TrackerFrame::UpdateIndicators() {
   QueueEvent(new wxCommandEvent(STATE_CHANGED));
 }
 
 void TrackerFrame::OnAbout(wxCommandEvent &event) {
-  std::ostringstream message_text;
-  message_text << "Lingo Archipelago Tracker " << kTrackerVersion
-               << " by hatkirby";
-
-  wxMessageBox(message_text.str(), "About lingo-ap-tracker",
-               wxOK | wxICON_INFORMATION);
+  wxAboutDialogInfo about_info;
+  about_info.SetName("Lingo Archipelago Tracker");
+  about_info.SetVersion(kTrackerVersion.ToString());
+  about_info.AddDeveloper("hatkirby");
+  about_info.AddArtist("Brenton Wildes");
+  about_info.AddArtist("kinrah");
+
+  wxAboutBox(about_info);
 }
 
 void TrackerFrame::OnExit(wxCommandEvent &event) { Close(true); }
@@ -122,7 +150,8 @@ void TrackerFrame::OnConnect(wxCommandEvent &event) {
     std::deque<ConnectionDetails> new_history;
     new_history.push_back(GetTrackerConfig().connection_details);
 
-    for (const ConnectionDetails& details : GetTrackerConfig().connection_history) {
+    for (const ConnectionDetails &details :
+         GetTrackerConfig().connection_history) {
       if (details != GetTrackerConfig().connection_details) {
         new_history.push_back(details);
       }
@@ -158,9 +187,34 @@ void TrackerFrame::OnCheckForUpdates(wxCommandEvent &event) {
   CheckForUpdates(/*manual=*/true);
 }
 
+void TrackerFrame::OnZoomIn(wxCommandEvent &event) {
+  if (notebook_->GetSelection() == 1) {
+    subway_map_->Zoom(true);
+  }
+}
+
+void TrackerFrame::OnZoomOut(wxCommandEvent& event) {
+  if (notebook_->GetSelection() == 1) {
+    subway_map_->Zoom(false);
+  }
+}
+
+void TrackerFrame::OnChangePage(wxBookCtrlEvent &event) {
+  zoom_in_menu_item_->Enable(event.GetSelection() == 1);
+  zoom_out_menu_item_->Enable(event.GetSelection() == 1);
+}
+
+void TrackerFrame::OnStateReset(wxCommandEvent& event) {
+  tracker_panel_->UpdateIndicators();
+  achievements_pane_->UpdateIndicators();
+  subway_map_->OnConnect();
+  Refresh();
+}
+
 void TrackerFrame::OnStateChanged(wxCommandEvent &event) {
   tracker_panel_->UpdateIndicators();
   achievements_pane_->UpdateIndicators();
+  subway_map_->UpdateIndicators();
   Refresh();
 }
 
@@ -192,8 +246,10 @@ void TrackerFrame::CheckForUpdates(bool manual) {
         std::ostringstream message_text;
         message_text << "There is a newer version of Lingo AP Tracker "
                         "available. You have "
-                     << kTrackerVersion << ", and the latest version is "
-                     << latest_version << ". Would you like to update?";
+                     << kTrackerVersion.ToString()
+                     << ", and the latest version is "
+                     << latest_version.ToString()
+                     << ". Would you like to update?";
 
         if (wxMessageBox(message_text.str(), "Update available", wxYES_NO) ==
             wxYES) {