Merge remote-tracking branch 'origin/master'

derekzhang79 · Jul 14, 2012 · 814010a · 814010a
2 parents d6fc877 + 4ed976d
commit 814010a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 45 deletions.
diff --git a/...eproj/project.xcworkspace/xcuserdata/TomCallon.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/TomCallon.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MBook/AppDelegate.m b/MBook/AppDelegate.m
@@ -42,13 +42,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     //书城
     BookStroeViewController *bStroreVC = [[[BookStroeViewController alloc]initWithNibName:@"BookStroeViewController" bundle:nil]autorelease];
     //设置
-    SettingViewController *settingVC = [[[SettingViewController alloc]initWithNibName:@"SettingViewController" bundle:nil] autorelease];
+//    SettingViewController *settingVC = [[[SettingViewController alloc]initWithNibName:@"SettingViewController" bundle:nil] autorelease];
 
 
     self.navigationController = [[[UINavigationController alloc]initWithRootViewController:bShelfVC] autorelease];
 
     self.tabBarController = [[UITabBarController alloc]init];
-    self.tabBarController.viewControllers = [NSArray arrayWithObjects:self.navigationController,bStroreVC,settingVC,nil];
+    self.tabBarController.viewControllers = [NSArray arrayWithObjects:self.navigationController,bStroreVC,nil];
     self.window.rootViewController = self.tabBarController;
     [self.window makeKeyAndVisible];
     return YES;

diff --git a/MBook/Controller/BookShelf/BookShelfViewController.m b/MBook/Controller/BookShelf/BookShelfViewController.m
@@ -34,6 +34,8 @@
 */
 
 #import "BookShelfViewController.h"
+#import "BookStroeViewController.h"
+#import "SettingViewController.h"
 
 #import "MyCellView.h"
 #import "MyBookView.h"
@@ -307,7 +309,7 @@ - (UIView *)headerViewOfBookShelfView:(GSBookShelfView *)bookShelfView {
         [_setttingButton setTitle:@"设置" forState:UIControlStateNormal];
         [_setttingButton setBackgroundImage:[UIImage imageNamed:@"Settings.png"] forState:UIControlStateNormal];
         [_setttingButton setBackgroundImage:[UIImage imageNamed:@"SettingsPressed.png"] forState:UIControlStateSelected];
-
+        [_setttingButton addTarget:self action:@selector(clickSettingButton:) forControlEvents:UIControlEventTouchUpInside ];
 
         [view addSubview:_setttingButton];
         [view addSubview:_searchBar];
@@ -318,6 +320,19 @@ - (UIView *)headerViewOfBookShelfView:(GSBookShelfView *)bookShelfView {
     return view;
 }
 
+-(void)clickSettingButton:(id)sender {
+
+    SettingViewController *svc = [[SettingViewController alloc]initWithNibName:@"SettingViewController" bundle:nil];
+    [self.navigationController pushViewController:svc animated:YES];
+
+    NSLog(@"self click the SettingButton");
+
+}
+
+
+
+
+
 - (CGFloat)cellHeightOfBookShelfView:(GSBookShelfView *)bookShelfView {
     return 125.0f;
 }

diff --git a/MBook/Controller/BookShelf/en.lproj/BookShelfViewController.xib b/MBook/Controller/BookShelf/en.lproj/BookShelfViewController.xib
@@ -98,7 +98,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">17</int>
+			<int key="maxID">18</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>

diff --git a/MBook/Controller/SettingViewController.xib b/MBook/Controller/SettingViewController.xib
@@ -11,11 +11,9 @@
 			<string key="NS.object.0">1181</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBUINavigationItem</string>
-			<string>IBUIImageView</string>
-			<string>IBUIView</string>
-			<string>IBUINavigationBar</string>
 			<string>IBProxyObject</string>
+			<string>IBUIView</string>
+			<string>IBUIImageView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -40,37 +38,18 @@
 					<object class="IBUIImageView" id="713909861">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
+						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
-					<object class="IBUINavigationBar" id="635352267">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrameSize">{320, 44}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="713909861"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIBarStyle">1</int>
-						<array key="IBUIItems">
-							<object class="IBUINavigationItem" id="628022169">
-								<reference key="IBUINavigationBar" ref="635352267"/>
-								<string key="IBUITitle">系统设置</string>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
-						</array>
-					</object>
 				</array>
 				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="635352267"/>
+				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -106,7 +85,6 @@
 						<reference key="object" ref="191373211"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="713909861"/>
-							<reference ref="635352267"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -126,19 +104,6 @@
 						<reference key="object" ref="713909861"/>
 						<reference key="parent" ref="191373211"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="635352267"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="628022169"/>
-						</array>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="628022169"/>
-						<reference key="parent" ref="635352267"/>
-					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -147,8 +112,6 @@
 				<string key="-2.CustomClassName">UIResponder</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>