From 7298b3caac98118d1e0aca70597a9f354b0e9e41 Mon Sep 17 00:00:00 2001 From: Yury Melnichek Date: Fri, 1 Apr 2011 19:40:35 +0200 Subject: [PATCH] [iPhone] Delete back and forward buttons in Sloynik and TravelGuide. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 8 -------- iphone/Sloynik/Images/back.png | Bin 2970 -> 0 bytes iphone/Sloynik/Images/forw.png | Bin 2976 -> 0 bytes iphone/Sloynik/Shared/ArticleVC.h | 2 -- iphone/Sloynik/Shared/ArticleVC.mm | 16 ---------------- .../Sloynik/Sloynik.xcodeproj/project.pbxproj | 8 -------- 6 files changed, 34 deletions(-) delete mode 100644 iphone/Sloynik/Images/back.png delete mode 100644 iphone/Sloynik/Images/forw.png diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 0b16dff49e..d5c8d3070c 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -21,8 +21,6 @@ 4938BB3C1343716500E0815A /* PerfCount.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4938BB381343716500E0815A /* PerfCount.mm */; }; 4938BB3D1343716500E0815A /* SearchVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4938BB3A1343716500E0815A /* SearchVC.mm */; }; 4938BB401343717A00E0815A /* global.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4938BB3F1343717A00E0815A /* global.mm */; }; - 4938BB5B1343745400E0815A /* back.png in Resources */ = {isa = PBXBuildFile; fileRef = 4938BB591343745400E0815A /* back.png */; }; - 4938BB5C1343745400E0815A /* forw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4938BB5A1343745400E0815A /* forw.png */; }; 4945D21C1334187D0082387C /* settings.png in Resources */ = {isa = PBXBuildFile; fileRef = 4945D21A1334187D0082387C /* settings.png */; }; 4945D21D1334187D0082387C /* settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4945D21B1334187D0082387C /* settings@2x.png */; }; 4983AE11134631F600C82DB7 /* GuideView-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4983AE10134631F600C82DB7 /* GuideView-iPad.xib */; }; @@ -127,8 +125,6 @@ 4938BB3A1343716500E0815A /* SearchVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SearchVC.mm; path = ../Sloynik/Shared/SearchVC.mm; sourceTree = ""; }; 4938BB3E1343717A00E0815A /* global.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = global.hpp; path = ../Sloynik/Shared/global.hpp; sourceTree = ""; }; 4938BB3F1343717A00E0815A /* global.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = global.mm; path = ../Sloynik/Shared/global.mm; sourceTree = ""; }; - 4938BB591343745400E0815A /* back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = back.png; path = ../Sloynik/Images/back.png; sourceTree = ""; }; - 4938BB5A1343745400E0815A /* forw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = forw.png; path = ../Sloynik/Images/forw.png; sourceTree = ""; }; 4945D21A1334187D0082387C /* settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = settings.png; sourceTree = ""; }; 4945D21B1334187D0082387C /* settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings@2x.png"; sourceTree = ""; }; 4983AE10134631F600C82DB7 /* GuideView-iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "GuideView-iPad.xib"; sourceTree = ""; }; @@ -377,8 +373,6 @@ 4938BB581343731D00E0815A /* Resources */ = { isa = PBXGroup; children = ( - 4938BB591343745400E0815A /* back.png */, - 4938BB5A1343745400E0815A /* forw.png */, ); name = Resources; sourceTree = ""; @@ -591,8 +585,6 @@ 4945D21D1334187D0082387C /* settings@2x.png in Resources */, FAFCB63813367AD1001A5C59 /* about-travelguide-iphone.html in Resources */, 4938BB1D1343652600E0815A /* dictionary.slf in Resources */, - 4938BB5B1343745400E0815A /* back.png in Resources */, - 4938BB5C1343745400E0815A /* forw.png in Resources */, 4983AE11134631F600C82DB7 /* GuideView-iPad.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/iphone/Sloynik/Images/back.png b/iphone/Sloynik/Images/back.png deleted file mode 100644 index f53207acde633188bfb7568d18be2530a485660f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2970 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 Q!~g&Q07*qoM6N<$g1xPwf&c&j diff --git a/iphone/Sloynik/Images/forw.png b/iphone/Sloynik/Images/forw.png deleted file mode 100644 index 4d76f5a6eadbd93254d640f11eca13a9958d01b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2976 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 diff --git a/iphone/Sloynik/Shared/ArticleVC.h b/iphone/Sloynik/Shared/ArticleVC.h index 19ab551a6a..22286933de 100644 --- a/iphone/Sloynik/Shared/ArticleVC.h +++ b/iphone/Sloynik/Shared/ArticleVC.h @@ -11,7 +11,6 @@ UISwipeGestureRecognizer * swipeLeftGestureRecognizer; UISwipeGestureRecognizer * swipeRightGestureRecognizer; UIPinchGestureRecognizer * pinchGestureRecognizer; - UISegmentedControl * backForwardButtons; CGRect m_webViewFrame; unsigned int m_articleId; double m_fontScale; @@ -26,7 +25,6 @@ @property (nonatomic, retain) UISwipeGestureRecognizer * swipeLeftGestureRecognizer; @property (nonatomic, retain) UISwipeGestureRecognizer * swipeRightGestureRecognizer; @property (nonatomic, retain) UIPinchGestureRecognizer * pinchGestureRecognizer; -@property (nonatomic, retain) UISegmentedControl * backForwardButtons; - (void)setArticleById:(unsigned int)articleId; diff --git a/iphone/Sloynik/Shared/ArticleVC.mm b/iphone/Sloynik/Shared/ArticleVC.mm index 5e51fdca50..e6ebbc297f 100644 --- a/iphone/Sloynik/Shared/ArticleVC.mm +++ b/iphone/Sloynik/Shared/ArticleVC.mm @@ -16,7 +16,6 @@ @synthesize swipeLeftGestureRecognizer; @synthesize swipeRightGestureRecognizer; @synthesize pinchGestureRecognizer; -@synthesize backForwardButtons; - (void)dealloc { @@ -120,21 +119,6 @@ [self.navBar pushNavigationItem:navSearch animated:NO]; [self.navBar pushNavigationItem:navArticle animated:NO]; - self.backForwardButtons = [[UISegmentedControl alloc] initWithItems: - [NSArray arrayWithObjects: - [UIImage imageNamed:@"back.png"], - [UIImage imageNamed:@"forw.png"], - nil]]; - self.backForwardButtons.segmentedControlStyle = UISegmentedControlStyleBar; - self.backForwardButtons.momentary = YES; - [self.backForwardButtons setEnabled:NO forSegmentAtIndex:0]; - [self.backForwardButtons setEnabled:NO forSegmentAtIndex:1]; - - UIBarButtonItem * segmentBarItem = [[UIBarButtonItem alloc] - initWithCustomView:self.backForwardButtons]; - self.navArticle.rightBarButtonItem = segmentBarItem; - [segmentBarItem release]; - if ([NSClassFromString(@"UISwipeGestureRecognizer") instancesRespondToSelector:@selector(setDirection:)]) { diff --git a/iphone/Sloynik/Sloynik.xcodeproj/project.pbxproj b/iphone/Sloynik/Sloynik.xcodeproj/project.pbxproj index 7480f86ffb..e5a7130266 100755 --- a/iphone/Sloynik/Sloynik.xcodeproj/project.pbxproj +++ b/iphone/Sloynik/Sloynik.xcodeproj/project.pbxproj @@ -12,8 +12,6 @@ 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 4910D0E9123AD32200628676 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4910D0E8123AD32200628676 /* QuartzCore.framework */; }; - 4916E8141310685A00EC6069 /* back.png in Resources */ = {isa = PBXBuildFile; fileRef = 4916E8121310685A00EC6069 /* back.png */; }; - 4916E8151310685A00EC6069 /* forw.png in Resources */ = {isa = PBXBuildFile; fileRef = 4916E8131310685A00EC6069 /* forw.png */; }; 491EC27D120CD33600A376CC /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 491EC27C120CD33600A376CC /* Icon.png */; }; 491EC285120CD4C700A376CC /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 491EC284120CD4C700A376CC /* Icon-72.png */; }; 491F5E5712E8F4AB0072775A /* global.mm in Sources */ = {isa = PBXBuildFile; fileRef = 491F5E5612E8F4AB0072775A /* global.mm */; }; @@ -50,8 +48,6 @@ 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Shared/main.m; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* sloynik_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sloynik_Prefix.pch; sourceTree = ""; }; 4910D0E8123AD32200628676 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 4916E8121310685A00EC6069 /* back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = back.png; path = Images/back.png; sourceTree = ""; }; - 4916E8131310685A00EC6069 /* forw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = forw.png; path = Images/forw.png; sourceTree = ""; }; 491EC27C120CD33600A376CC /* Icon.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = Icon.png; path = Images/Icon.png; sourceTree = ""; }; 491EC284120CD4C700A376CC /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "Images/Icon-72.png"; sourceTree = ""; }; 491F5E5512E8F4650072775A /* global.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = global.hpp; path = Shared/global.hpp; sourceTree = ""; }; @@ -172,8 +168,6 @@ 491EC2A5120CD7EC00A376CC /* Images */ = { isa = PBXGroup; children = ( - 4916E8121310685A00EC6069 /* back.png */, - 4916E8131310685A00EC6069 /* forw.png */, 491EC27C120CD33600A376CC /* Icon.png */, 4972C89A120CB8D5001F025D /* menu-20.png */, 491EC284120CD4C700A376CC /* Icon-72.png */, @@ -310,8 +304,6 @@ 491EC27D120CD33600A376CC /* Icon.png in Resources */, 491EC285120CD4C700A376CC /* Icon-72.png in Resources */, 496982CE121DE31000048CF1 /* dictionary.slf in Resources */, - 4916E8141310685A00EC6069 /* back.png in Resources */, - 4916E8151310685A00EC6069 /* forw.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };