From b69cb982408a496df8793e7345f51c047ec87eb0 Mon Sep 17 00:00:00 2001 From: Dzmitry Neviadomski Date: Sun, 9 May 2021 01:13:49 +0300 Subject: [PATCH] Revert display regressions. 1. Revert "Merge pull request #148 from JanX2/two-gigaseconds-mini" This reverts commit 7365174b11f02f9081dc2bda3e7756cbb6b1f7a9, reversing changes made to c5ac86725db2296eefc52268d7617393a70abd5b. 2. Revert "Two gigaseconds (#147)" This reverts commit c5ac86725db2296eefc52268d7617393a70abd5b. --- Base.lproj/MainMenu.xib | 332 +++++++++--------- Cog.xcodeproj/project.pbxproj | 298 +--------------- .../xcshareddata/xcschemes/Cog.xcscheme | 10 - .../xcschemes/SecondsFormatterTests.xcscheme | 52 --- CogTests/CogTests.m | 36 -- CogTests/Info.plist | 22 -- Formatters/SecondsFormatter.h | 2 - Formatters/SecondsFormatter.m | 208 +++-------- Playlist/PlaylistView.m | 20 +- SecondsFormatterTests/Info.plist | 22 -- SecondsFormatterTests/SecondsFormatterTests.m | 131 ------- Utils/MonospacedDigitTextFieldCell.h | 18 - Utils/MonospacedDigitTextFieldCell.m | 23 -- Window/PositionSlider.m | 6 +- Window/TimeField.h | 4 +- Window/TimeField.m | 51 +-- 16 files changed, 238 insertions(+), 997 deletions(-) delete mode 100644 Cog.xcodeproj/xcshareddata/xcschemes/SecondsFormatterTests.xcscheme delete mode 100644 CogTests/CogTests.m delete mode 100644 CogTests/Info.plist delete mode 100644 SecondsFormatterTests/Info.plist delete mode 100644 SecondsFormatterTests/SecondsFormatterTests.m delete mode 100644 Utils/MonospacedDigitTextFieldCell.h delete mode 100644 Utils/MonospacedDigitTextFieldCell.m diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib index 6d15673c0..854465c55 100644 --- a/Base.lproj/MainMenu.xib +++ b/Base.lproj/MainMenu.xib @@ -1,8 +1,8 @@ - + - + @@ -18,7 +18,7 @@ - + @@ -46,8 +46,7 @@ - - + @@ -148,18 +147,16 @@ - - + - + - - 0 + @@ -170,8 +167,7 @@ - - + @@ -204,8 +200,7 @@ - - + @@ -296,7 +291,7 @@ - + @@ -417,10 +412,10 @@ - + - - + + @@ -572,7 +567,7 @@ - +