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 f53207acde..0000000000 Binary files a/iphone/Sloynik/Images/back.png and /dev/null differ diff --git a/iphone/Sloynik/Images/forw.png b/iphone/Sloynik/Images/forw.png deleted file mode 100644 index 4d76f5a6ea..0000000000 Binary files a/iphone/Sloynik/Images/forw.png and /dev/null differ 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; };