From 35a7e50bb2f5c3a85c7076ee89a54234579d1bad Mon Sep 17 00:00:00 2001 From: Moritz Haarmann Date: Mon, 28 Apr 2014 00:53:58 +0200 Subject: [PATCH] + Added Edit icons. --- Classes/BITImageAnnotationViewController.m | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Classes/BITImageAnnotationViewController.m b/Classes/BITImageAnnotationViewController.m index 596228032e..714080d2e9 100644 --- a/Classes/BITImageAnnotationViewController.m +++ b/Classes/BITImageAnnotationViewController.m @@ -85,16 +85,14 @@ self.pinchRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(pinched:)]; self.tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapped:)]; - [self.tapRecognizer requireGestureRecognizerToFail:self.panRecognizer]; - [self.imageView addGestureRecognizer:self.pinchRecognizer]; [self.imageView addGestureRecognizer:self.panRecognizer]; [self.view addGestureRecognizer:self.tapRecognizer]; self.imageView.userInteractionEnabled = YES; - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc ] initWithTitle:@"Discard" style:UIBarButtonItemStyleBordered target:self action:@selector(discard:)]; - self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc ] initWithTitle:@"Save" style:UIBarButtonItemStyleBordered target:self action:@selector(save:)]; + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc ] initWithImage:bit_imageNamed(@"Cancel.png", BITHOCKEYSDK_BUNDLE) landscapeImagePhone:bit_imageNamed(@"Cancel.png", BITHOCKEYSDK_BUNDLE) style:UIBarButtonItemStyleBordered target:self action:@selector(discard:)]; + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc ] initWithImage:bit_imageNamed(@"Ok.png", BITHOCKEYSDK_BUNDLE) landscapeImagePhone:bit_imageNamed(@"Ok.png", BITHOCKEYSDK_BUNDLE) style:UIBarButtonItemStyleBordered target:self action:@selector(save:)]; [self fitImageViewFrame]; } @@ -105,8 +103,6 @@ - (void)fitImageViewFrame { - - CGFloat heightScaleFactor = self.view.frame.size.height / self.image.size.height; CGFloat widthScaleFactor = self.view.frame.size.width / self.image.size.width; @@ -179,7 +175,7 @@ self.panStart = [gestureRecognizer locationInView:self.imageView]; - [self.editingControls setSelectedSegmentIndex:UISegmentedControlNoSegment]; + // [self.editingControls setSelectedSegmentIndex:UISegmentedControlNoSegment]; self.isDrawing = YES; } else if (gestureRecognizer.state == UIGestureRecognizerStateChanged){