Skip to content

Commit 45d57fb

Browse files
JamirasJamiras
authored
add Seconds as Minutes to leaderboard format list (#1079)
1 parent 659c8a3 commit 45d57fb

3 files changed

Lines changed: 43 additions & 40 deletions

File tree

‎src/ui/viewmodels/AssetEditorViewModel.cpp‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,20 @@ AssetEditorViewModel::AssetEditorViewModel() noexcept
6060
m_vAchievementTypes.Add(ra::etoi(ra::data::models::AchievementType::Progression), L"Progression");
6161
m_vAchievementTypes.Add(ra::etoi(ra::data::models::AchievementType::Win), L"Win");
6262

63-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Value), L"Value");
6463
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Score), L"Score");
65-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Frames), L"Frames");
66-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Centiseconds), L"Centiseconds");
67-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Seconds), L"Seconds");
68-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Minutes), L"Minutes");
69-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Fixed1), L"Fixed1");
70-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Fixed2), L"Fixed2");
71-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Fixed3), L"Fixed3");
72-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Tens), L"Tens");
73-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Hundreds), L"Hundreds");
74-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Thousands), L"Thousands");
75-
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::UnsignedValue), L"Unsigned Value");
64+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Frames), L"Time (Frames)");
65+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Centiseconds), L"Time (Centiseconds)");
66+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Seconds), L"Time (Seconds)");
67+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Minutes), L"Time (Minutes)");
68+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::SecondsAsMinutes), L"Time (Seconds as Minutes)");
69+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Value), L"Value");
70+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::UnsignedValue), L"Value (Unsigned)");
71+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Tens), L"Value (Tens)");
72+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Hundreds), L"Value (Hundreds)");
73+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Thousands), L"Value (Thousands)");
74+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Fixed1), L"Value (Fixed1)");
75+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Fixed2), L"Value (Fixed2)");
76+
m_vFormats.Add(ra::etoi(ra::data::ValueFormat::Fixed3), L"Value (Fixed3)");
7677

7778
m_vLeaderboardParts.Add(ra::etoi(LeaderboardPart::Start), L"Start");
7879
m_vLeaderboardParts.Add(ra::etoi(LeaderboardPart::Cancel), L"Cancel");

‎src/ui/win32/AssetEditorDialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ BOOL AssetEditorDialog::OnInitDialog()
986986
}
987987

988988
SendMessage(::GetDlgItem(GetHWND(), IDC_RA_TYPE), CB_SETDROPPEDWIDTH, 70, 0);
989-
SendMessage(::GetDlgItem(GetHWND(), IDC_RA_FORMAT), CB_SETDROPPEDWIDTH, 80, 0);
989+
SendMessage(::GetDlgItem(GetHWND(), IDC_RA_FORMAT), CB_SETDROPPEDWIDTH, 136, 0);
990990

991991
return DialogBase::OnInitDialog();
992992
}

‎tests/ui/viewmodels/AssetEditorViewModel_Tests.cpp‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -144,33 +144,35 @@ TEST_CLASS(AssetEditorViewModel_Tests)
144144
Assert::AreEqual((int)ra::data::models::AchievementType::Win, editor.AchievementTypes().GetItemAt(3)->GetId());
145145
Assert::AreEqual(std::wstring(L"Win"), editor.AchievementTypes().GetItemAt(3)->GetLabel());
146146

147-
Assert::AreEqual({ 13U }, editor.Formats().Count());
148-
Assert::AreEqual((int)ra::data::ValueFormat::Value, editor.Formats().GetItemAt(0)->GetId());
149-
Assert::AreEqual(std::wstring(L"Value"), editor.Formats().GetItemAt(0)->GetLabel());
150-
Assert::AreEqual((int)ra::data::ValueFormat::Score, editor.Formats().GetItemAt(1)->GetId());
151-
Assert::AreEqual(std::wstring(L"Score"), editor.Formats().GetItemAt(1)->GetLabel());
152-
Assert::AreEqual((int)ra::data::ValueFormat::Frames, editor.Formats().GetItemAt(2)->GetId());
153-
Assert::AreEqual(std::wstring(L"Frames"), editor.Formats().GetItemAt(2)->GetLabel());
154-
Assert::AreEqual((int)ra::data::ValueFormat::Centiseconds, editor.Formats().GetItemAt(3)->GetId());
155-
Assert::AreEqual(std::wstring(L"Centiseconds"), editor.Formats().GetItemAt(3)->GetLabel());
156-
Assert::AreEqual((int)ra::data::ValueFormat::Seconds, editor.Formats().GetItemAt(4)->GetId());
157-
Assert::AreEqual(std::wstring(L"Seconds"), editor.Formats().GetItemAt(4)->GetLabel());
158-
Assert::AreEqual((int)ra::data::ValueFormat::Minutes, editor.Formats().GetItemAt(5)->GetId());
159-
Assert::AreEqual(std::wstring(L"Minutes"), editor.Formats().GetItemAt(5)->GetLabel());
160-
Assert::AreEqual((int)ra::data::ValueFormat::Fixed1, editor.Formats().GetItemAt(6)->GetId());
161-
Assert::AreEqual(std::wstring(L"Fixed1"), editor.Formats().GetItemAt(6)->GetLabel());
162-
Assert::AreEqual((int)ra::data::ValueFormat::Fixed2, editor.Formats().GetItemAt(7)->GetId());
163-
Assert::AreEqual(std::wstring(L"Fixed2"), editor.Formats().GetItemAt(7)->GetLabel());
164-
Assert::AreEqual((int)ra::data::ValueFormat::Fixed3, editor.Formats().GetItemAt(8)->GetId());
165-
Assert::AreEqual(std::wstring(L"Fixed3"), editor.Formats().GetItemAt(8)->GetLabel());
166-
Assert::AreEqual((int)ra::data::ValueFormat::Tens, editor.Formats().GetItemAt(9)->GetId());
167-
Assert::AreEqual(std::wstring(L"Tens"), editor.Formats().GetItemAt(9)->GetLabel());
168-
Assert::AreEqual((int)ra::data::ValueFormat::Hundreds, editor.Formats().GetItemAt(10)->GetId());
169-
Assert::AreEqual(std::wstring(L"Hundreds"), editor.Formats().GetItemAt(10)->GetLabel());
170-
Assert::AreEqual((int)ra::data::ValueFormat::Thousands, editor.Formats().GetItemAt(11)->GetId());
171-
Assert::AreEqual(std::wstring(L"Thousands"), editor.Formats().GetItemAt(11)->GetLabel());
172-
Assert::AreEqual((int)ra::data::ValueFormat::UnsignedValue, editor.Formats().GetItemAt(12)->GetId());
173-
Assert::AreEqual(std::wstring(L"Unsigned Value"), editor.Formats().GetItemAt(12)->GetLabel());
147+
Assert::AreEqual({ 14U }, editor.Formats().Count());
148+
Assert::AreEqual((int)ra::data::ValueFormat::Score, editor.Formats().GetItemAt(0)->GetId());
149+
Assert::AreEqual(std::wstring(L"Score"), editor.Formats().GetItemAt(0)->GetLabel());
150+
Assert::AreEqual((int)ra::data::ValueFormat::Frames, editor.Formats().GetItemAt(1)->GetId());
151+
Assert::AreEqual(std::wstring(L"Time (Frames)"), editor.Formats().GetItemAt(1)->GetLabel());
152+
Assert::AreEqual((int)ra::data::ValueFormat::Centiseconds, editor.Formats().GetItemAt(2)->GetId());
153+
Assert::AreEqual(std::wstring(L"Time (Centiseconds)"), editor.Formats().GetItemAt(2)->GetLabel());
154+
Assert::AreEqual((int)ra::data::ValueFormat::Seconds, editor.Formats().GetItemAt(3)->GetId());
155+
Assert::AreEqual(std::wstring(L"Time (Seconds)"), editor.Formats().GetItemAt(3)->GetLabel());
156+
Assert::AreEqual((int)ra::data::ValueFormat::Minutes, editor.Formats().GetItemAt(4)->GetId());
157+
Assert::AreEqual(std::wstring(L"Time (Minutes)"), editor.Formats().GetItemAt(4)->GetLabel());
158+
Assert::AreEqual((int)ra::data::ValueFormat::SecondsAsMinutes, editor.Formats().GetItemAt(5)->GetId());
159+
Assert::AreEqual(std::wstring(L"Time (Seconds as Minutes)"), editor.Formats().GetItemAt(5)->GetLabel());
160+
Assert::AreEqual((int)ra::data::ValueFormat::Value, editor.Formats().GetItemAt(6)->GetId());
161+
Assert::AreEqual(std::wstring(L"Value"), editor.Formats().GetItemAt(6)->GetLabel());
162+
Assert::AreEqual((int)ra::data::ValueFormat::UnsignedValue, editor.Formats().GetItemAt(7)->GetId());
163+
Assert::AreEqual(std::wstring(L"Value (Unsigned)"), editor.Formats().GetItemAt(7)->GetLabel());
164+
Assert::AreEqual((int)ra::data::ValueFormat::Tens, editor.Formats().GetItemAt(8)->GetId());
165+
Assert::AreEqual(std::wstring(L"Value (Tens)"), editor.Formats().GetItemAt(8)->GetLabel());
166+
Assert::AreEqual((int)ra::data::ValueFormat::Hundreds, editor.Formats().GetItemAt(9)->GetId());
167+
Assert::AreEqual(std::wstring(L"Value (Hundreds)"), editor.Formats().GetItemAt(9)->GetLabel());
168+
Assert::AreEqual((int)ra::data::ValueFormat::Thousands, editor.Formats().GetItemAt(10)->GetId());
169+
Assert::AreEqual(std::wstring(L"Value (Thousands)"), editor.Formats().GetItemAt(10)->GetLabel());
170+
Assert::AreEqual((int)ra::data::ValueFormat::Fixed1, editor.Formats().GetItemAt(11)->GetId());
171+
Assert::AreEqual(std::wstring(L"Value (Fixed1)"), editor.Formats().GetItemAt(11)->GetLabel());
172+
Assert::AreEqual((int)ra::data::ValueFormat::Fixed2, editor.Formats().GetItemAt(12)->GetId());
173+
Assert::AreEqual(std::wstring(L"Value (Fixed2)"), editor.Formats().GetItemAt(12)->GetLabel());
174+
Assert::AreEqual((int)ra::data::ValueFormat::Fixed3, editor.Formats().GetItemAt(13)->GetId());
175+
Assert::AreEqual(std::wstring(L"Value (Fixed3)"), editor.Formats().GetItemAt(13)->GetLabel());
174176

175177
Assert::AreEqual({ 4U }, editor.LeaderboardParts().Count());
176178
Assert::AreEqual((int)AssetEditorViewModel::LeaderboardPart::Start, editor.LeaderboardParts().GetItemAt(0)->GetId());

0 commit comments

Comments
 (0)