iOS Sample App menu implementation

http://codereview.appspot.com/4798055/


git-svn-id: http://skia.googlecode.com/svn/trunk@2022 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 7 insertions, 8 deletions

diff --git a/experimental/iOSSampleApp/Shared/SkUIDetailViewController.h b/experimental/iOSSampleApp/Shared/SkUIDetailViewController.h
index 05d1f37e8c..7435a9dc69 100644
--- a/experimental/iOSSampleApp/Shared/SkUIDetailViewController.h
+++ b/experimental/iOSSampleApp/Shared/SkUIDetailViewController.h
@@ -6,35 +6,34 @@
  * found in the LICENSE file.
  */
 #import <UIKit/UIKit.h>
+#import "SkOptionsTableViewController.h"
 #import "SkUIRootViewController.h"
 #import "SkUIView.h"
 
 class SampleWindow;
 class SkData;
 @interface SkUIDetailViewController : UIViewController {
-    UINavigationBar* fNavigationBar;
     UIPopoverController* fPopOverController;
+    SkOptionsTableViewController* fOptionsController;
     UIBarButtonItem* fPrintButton;
-    UIBarButtonItem* fCycleButton;
+    UIBarButtonItem* fOptionsButton;
     SkData* fData;
     SkUIView* fSkUIView;
     SampleWindow* fWind;
 }
-@property (nonatomic, retain) IBOutlet UINavigationBar *fNavigationBar;
+
 @property (nonatomic, retain) UIBarButtonItem* fPrintButton;
-@property (nonatomic, retain) UIBarButtonItem* fCycleButton;
+@property (nonatomic, retain) UIBarButtonItem* fOptionsButton;
+@property (nonatomic, retain) SkOptionsTableViewController* fOptionsController;
 @property (nonatomic, assign) UIPopoverController* fPopOverController;
 
 //Instance methods
-- (void)redraw;
 - (void)populateRoot:(SkUIRootViewController*)root;
 - (void)goToItem:(NSUInteger)index;
 - (void)createButtons;
 //UI actions
-- (IBAction)usePipe:(id)sender;
-- (IBAction)enterServerIP:(id)sender;
 - (void)printContent;
-- (void)cycleDeviceType;
+- (void)presentOptions;
 
 //SplitView popover management
 - (void)showRootPopoverButtonItem:(UIBarButtonItem *)barButtonItem;