From 7329a40e73cc5816d7a758282dff8a8eb3af748e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Thu, 9 Jun 2016 13:31:32 -0700 Subject: [PATCH] Tile count, tile size columns in osxapp (#5301) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [osx] Added tile count, tile size columns Added tile count and tile size columns to osxapp’s Offline Packs window. Also expanded the byte count formatters to include the raw byte count for debugging purposes. * [osx] Corrected resource count formatters Use grouping separators consistently. --- platform/osx/app/AppDelegate.m | 16 ++++++ platform/osx/app/Base.lproj/MainMenu.xib | 64 ++++++++++++++++++++---- 2 files changed, 70 insertions(+), 10 deletions(-) diff --git a/platform/osx/app/AppDelegate.m b/platform/osx/app/AppDelegate.m index b7860cf13..ce5abcae2 100644 --- a/platform/osx/app/AppDelegate.m +++ b/platform/osx/app/AppDelegate.m @@ -53,6 +53,22 @@ NSString * const MGLLastMapDebugMaskDefaultsKey = @"MGLLastMapDebugMask"; return self.progress.countOfBytesCompleted; } ++ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingCountOfTilesCompleted { + return [NSSet setWithObjects:@"progress", nil]; +} + +- (uint64_t)countOfTilesCompleted { + return self.progress.countOfTilesCompleted; +} + ++ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingCountOfTileBytesCompleted { + return [NSSet setWithObjects:@"progress", nil]; +} + +- (uint64_t)countOfTileBytesCompleted { + return self.progress.countOfTileBytesCompleted; +} + @end @interface AppDelegate () diff --git a/platform/osx/app/Base.lproj/MainMenu.xib b/platform/osx/app/Base.lproj/MainMenu.xib index c80428ff0..72a97aa8c 100644 --- a/platform/osx/app/Base.lproj/MainMenu.xib +++ b/platform/osx/app/Base.lproj/MainMenu.xib @@ -672,7 +672,7 @@ - + @@ -711,13 +711,13 @@ - + - + @@ -728,13 +728,13 @@ - + - + @@ -744,14 +744,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -769,8 +811,8 @@ -