diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-04-20 12:36:22 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-04-20 12:36:22 -0400 |
commit | 5f7069d480022b115bee585724d41ff827f80f2f (patch) | |
tree | c4765205eccf73b4e7a1487fdec295968d98c276 | |
parent | dc56f752bb33b4e779c5507dea03a6764d08fd0a (diff) | |
download | lingo-ap-tracker-5f7069d480022b115bee585724d41ff827f80f2f.tar.gz lingo-ap-tracker-5f7069d480022b115bee585724d41ff827f80f2f.tar.bz2 lingo-ap-tracker-5f7069d480022b115bee585724d41ff827f80f2f.zip |
Replaced about box
-rw-r--r-- | src/tracker_frame.cpp | 24 | ||||
-rw-r--r-- | src/version.h | 12 |
2 files changed, 22 insertions, 14 deletions
diff --git a/src/tracker_frame.cpp b/src/tracker_frame.cpp index d64e0d3..8a0c764 100644 --- a/src/tracker_frame.cpp +++ b/src/tracker_frame.cpp | |||
@@ -1,5 +1,6 @@ | |||
1 | #include "tracker_frame.h" | 1 | #include "tracker_frame.h" |
2 | 2 | ||
3 | #include <wx/aboutdlg.h> | ||
3 | #include <wx/choicebk.h> | 4 | #include <wx/choicebk.h> |
4 | #include <wx/webrequest.h> | 5 | #include <wx/webrequest.h> |
5 | 6 | ||
@@ -101,12 +102,14 @@ void TrackerFrame::UpdateIndicators() { | |||
101 | } | 102 | } |
102 | 103 | ||
103 | void TrackerFrame::OnAbout(wxCommandEvent &event) { | 104 | void TrackerFrame::OnAbout(wxCommandEvent &event) { |
104 | std::ostringstream message_text; | 105 | wxAboutDialogInfo about_info; |
105 | message_text << "Lingo Archipelago Tracker " << kTrackerVersion | 106 | about_info.SetName("Lingo Archipelago Tracker"); |
106 | << " by hatkirby"; | 107 | about_info.SetVersion(kTrackerVersion.ToString()); |
107 | 108 | about_info.AddDeveloper("hatkirby"); | |
108 | wxMessageBox(message_text.str(), "About lingo-ap-tracker", | 109 | about_info.AddArtist("Brenton Wildes"); |
109 | wxOK | wxICON_INFORMATION); | 110 | about_info.AddArtist("kinrah"); |
111 | |||
112 | wxAboutBox(about_info); | ||
110 | } | 113 | } |
111 | 114 | ||
112 | void TrackerFrame::OnExit(wxCommandEvent &event) { Close(true); } | 115 | void TrackerFrame::OnExit(wxCommandEvent &event) { Close(true); } |
@@ -122,7 +125,8 @@ void TrackerFrame::OnConnect(wxCommandEvent &event) { | |||
122 | std::deque<ConnectionDetails> new_history; | 125 | std::deque<ConnectionDetails> new_history; |
123 | new_history.push_back(GetTrackerConfig().connection_details); | 126 | new_history.push_back(GetTrackerConfig().connection_details); |
124 | 127 | ||
125 | for (const ConnectionDetails& details : GetTrackerConfig().connection_history) { | 128 | for (const ConnectionDetails &details : |
129 | GetTrackerConfig().connection_history) { | ||
126 | if (details != GetTrackerConfig().connection_details) { | 130 | if (details != GetTrackerConfig().connection_details) { |
127 | new_history.push_back(details); | 131 | new_history.push_back(details); |
128 | } | 132 | } |
@@ -192,8 +196,10 @@ void TrackerFrame::CheckForUpdates(bool manual) { | |||
192 | std::ostringstream message_text; | 196 | std::ostringstream message_text; |
193 | message_text << "There is a newer version of Lingo AP Tracker " | 197 | message_text << "There is a newer version of Lingo AP Tracker " |
194 | "available. You have " | 198 | "available. You have " |
195 | << kTrackerVersion << ", and the latest version is " | 199 | << kTrackerVersion.ToString() |
196 | << latest_version << ". Would you like to update?"; | 200 | << ", and the latest version is " |
201 | << latest_version.ToString() | ||
202 | << ". Would you like to update?"; | ||
197 | 203 | ||
198 | if (wxMessageBox(message_text.str(), "Update available", wxYES_NO) == | 204 | if (wxMessageBox(message_text.str(), "Update available", wxYES_NO) == |
199 | wxYES) { | 205 | wxYES) { |
diff --git a/src/version.h b/src/version.h index 8c567e9..7b9aebc 100644 --- a/src/version.h +++ b/src/version.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef VERSION_H_C757E53C | 1 | #ifndef VERSION_H_C757E53C |
2 | #define VERSION_H_C757E53C | 2 | #define VERSION_H_C757E53C |
3 | 3 | ||
4 | #include <iostream> | 4 | #include <sstream> |
5 | #include <regex> | 5 | #include <regex> |
6 | 6 | ||
7 | struct Version { | 7 | struct Version { |
@@ -23,6 +23,12 @@ struct Version { | |||
23 | } | 23 | } |
24 | } | 24 | } |
25 | 25 | ||
26 | std::string ToString() const { | ||
27 | std::ostringstream output; | ||
28 | output << "v" << major << "." << minor << "." << revision; | ||
29 | return output.str(); | ||
30 | } | ||
31 | |||
26 | bool operator<(const Version& rhs) const { | 32 | bool operator<(const Version& rhs) const { |
27 | return (major < rhs.major) || | 33 | return (major < rhs.major) || |
28 | (major == rhs.major && | 34 | (major == rhs.major && |
@@ -31,10 +37,6 @@ struct Version { | |||
31 | } | 37 | } |
32 | }; | 38 | }; |
33 | 39 | ||
34 | std::ostream& operator<<(std::ostream& out, const Version& ver) { | ||
35 | return out << "v" << ver.major << "." << ver.minor << "." << ver.revision; | ||
36 | } | ||
37 | |||
38 | constexpr const Version kTrackerVersion = Version(0, 8, 0); | 40 | constexpr const Version kTrackerVersion = Version(0, 8, 0); |
39 | 41 | ||
40 | #endif /* end of include guard: VERSION_H_C757E53C */ \ No newline at end of file | 42 | #endif /* end of include guard: VERSION_H_C757E53C */ \ No newline at end of file |