Cleanup. Prepare for Search tab development. t20
authorStefane Fermigier <sfermigier@nuxeo.com>
Mon, 08 Mar 2010 17:10:43 +0100
brancht20
changeset 3563745f2fc58a
parent 34 9fc9da03a379
child 36 c162e52d9e5b
Cleanup. Prepare for Search tab development.
Classes/FolderView.xib
Classes/FolderViewController.h
Classes/FolderViewController.m
Classes/SearchViewController.m
Classes/SettingsViewController.h
iNuxeo.xcodeproj/project.pbxproj
     1.1 --- a/Classes/FolderView.xib
     1.2 +++ b/Classes/FolderView.xib
     1.3 @@ -66,6 +66,10 @@
     1.4  				<float key="IBUISectionHeaderHeight">27</float>
     1.5  				<float key="IBUISectionFooterHeight">27</float>
     1.6  			</object>
     1.7 +			<object class="IBUIBarButtonItem" id="291600978">
     1.8 +				<int key="IBUIStyle">1</int>
     1.9 +				<int key="IBUISystemItemIdentifier">9</int>
    1.10 +			</object>
    1.11  		</object>
    1.12  		<object class="IBObjectContainer" key="IBDocument.Objects">
    1.13  			<object class="NSMutableArray" key="connectionRecords">
    1.14 @@ -102,6 +106,14 @@
    1.15  					</object>
    1.16  					<int key="connectionID">13</int>
    1.17  				</object>
    1.18 +				<object class="IBConnectionRecord">
    1.19 +					<object class="IBCocoaTouchOutletConnection" key="connection">
    1.20 +						<string key="label">infoButton</string>
    1.21 +						<reference key="source" ref="372490531"/>
    1.22 +						<reference key="destination" ref="291600978"/>
    1.23 +					</object>
    1.24 +					<int key="connectionID">16</int>
    1.25 +				</object>
    1.26  			</object>
    1.27  			<object class="IBMutableOrderedSet" key="objectRecords">
    1.28  				<object class="NSArray" key="orderedObjects">
    1.29 @@ -133,6 +145,12 @@
    1.30  						<reference key="object" ref="556243163"/>
    1.31  						<reference key="parent" ref="0"/>
    1.32  					</object>
    1.33 +					<object class="IBObjectRecord">
    1.34 +						<int key="objectID">15</int>
    1.35 +						<reference key="object" ref="291600978"/>
    1.36 +						<reference key="parent" ref="0"/>
    1.37 +						<string key="objectName">Info button</string>
    1.38 +					</object>
    1.39  				</object>
    1.40  			</object>
    1.41  			<object class="NSMutableDictionary" key="flattenedProperties">
    1.42 @@ -142,6 +160,7 @@
    1.43  					<string>-1.CustomClassName</string>
    1.44  					<string>-2.CustomClassName</string>
    1.45  					<string>14.IBPluginDependency</string>
    1.46 +					<string>15.IBPluginDependency</string>
    1.47  					<string>9.IBEditorWindowLastContentRect</string>
    1.48  					<string>9.IBPluginDependency</string>
    1.49  				</object>
    1.50 @@ -150,6 +169,7 @@
    1.51  					<string>FolderViewController</string>
    1.52  					<string>UIResponder</string>
    1.53  					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
    1.54 +					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
    1.55  					<string>{{236, 337}, {320, 480}}</string>
    1.56  					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
    1.57  				</object>
    1.58 @@ -170,7 +190,7 @@
    1.59  				</object>
    1.60  			</object>
    1.61  			<nil key="sourceID"/>
    1.62 -			<int key="maxID">14</int>
    1.63 +			<int key="maxID">16</int>
    1.64  		</object>
    1.65  		<object class="IBClassDescriber" key="IBDocument.Classes">
    1.66  			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
    1.67 @@ -178,6 +198,10 @@
    1.68  				<object class="IBPartialClassDescription">
    1.69  					<string key="className">FolderViewController</string>
    1.70  					<string key="superclassName">UITableViewController</string>
    1.71 +					<object class="NSMutableDictionary" key="outlets">
    1.72 +						<string key="NS.key.0">infoButton</string>
    1.73 +						<string key="NS.object.0">UIBarButtonItem</string>
    1.74 +					</object>
    1.75  					<object class="IBClassDescriptionSource" key="sourceIdentifier">
    1.76  						<string key="majorKey">IBProjectSource</string>
    1.77  						<string key="minorKey">Classes/FolderViewController.h</string>
    1.78 @@ -304,6 +328,22 @@
    1.79  					</object>
    1.80  				</object>
    1.81  				<object class="IBPartialClassDescription">
    1.82 +					<string key="className">UIBarButtonItem</string>
    1.83 +					<string key="superclassName">UIBarItem</string>
    1.84 +					<object class="IBClassDescriptionSource" key="sourceIdentifier">
    1.85 +						<string key="majorKey">IBFrameworkSource</string>
    1.86 +						<string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
    1.87 +					</object>
    1.88 +				</object>
    1.89 +				<object class="IBPartialClassDescription">
    1.90 +					<string key="className">UIBarItem</string>
    1.91 +					<string key="superclassName">NSObject</string>
    1.92 +					<object class="IBClassDescriptionSource" key="sourceIdentifier">
    1.93 +						<string key="majorKey">IBFrameworkSource</string>
    1.94 +						<string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
    1.95 +					</object>
    1.96 +				</object>
    1.97 +				<object class="IBPartialClassDescription">
    1.98  					<string key="className">UIProgressView</string>
    1.99  					<string key="superclassName">UIView</string>
   1.100  					<object class="IBClassDescriptionSource" key="sourceIdentifier">
   1.101 @@ -404,7 +444,7 @@
   1.102  			<integer value="3000" key="NS.object.0"/>
   1.103  		</object>
   1.104  		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
   1.105 -		<string key="IBDocument.LastKnownRelativeProjectPath">iNuxeo.xcodeproj</string>
   1.106 +		<string key="IBDocument.LastKnownRelativeProjectPath">../iNuxeo.xcodeproj</string>
   1.107  		<int key="IBDocument.defaultPropertyAccessControl">3</int>
   1.108  		<string key="IBCocoaTouchPluginVersion">3.1</string>
   1.109  	</data>
     2.1 --- a/Classes/FolderViewController.h
     2.2 +++ b/Classes/FolderViewController.h
     2.3 @@ -12,9 +12,12 @@
     2.4  @interface FolderViewController : UITableViewController {
     2.5      NXFolder *folder;
     2.6      NSURL *url;
     2.7 +    
     2.8 +    IBOutlet UIBarButtonItem* infoButton;
     2.9  }
    2.10  
    2.11  @property (nonatomic, retain) NXFolder *folder;
    2.12  @property (nonatomic, retain) NSURL *url;
    2.13  
    2.14 +
    2.15  @end
     3.1 --- a/Classes/FolderViewController.m
     3.2 +++ b/Classes/FolderViewController.m
     3.3 @@ -15,14 +15,10 @@
     3.4  
     3.5  @synthesize folder, url;
     3.6  
     3.7 -- (void)dealloc {
     3.8 -    [folder release];
     3.9 -    [url release];
    3.10 -    [super dealloc];
    3.11 -}
    3.12 -
    3.13  - (void)viewDidLoad {
    3.14      [super viewDidLoad];
    3.15 +    
    3.16 +    self.navigationItem.rightBarButtonItem = infoButton;
    3.17  
    3.18      CmisClient *client = [CmisClient sharedClient];
    3.19      if (self.url == nil) {
    3.20 @@ -31,6 +27,12 @@
    3.21      self.folder = [client getFolderInfoAt:self.url];
    3.22  }
    3.23  
    3.24 +- (void)dealloc {
    3.25 +    [folder release];
    3.26 +    [url release];
    3.27 +    [super dealloc];
    3.28 +}
    3.29 +
    3.30  - (void)didReceiveMemoryWarning {
    3.31      [super didReceiveMemoryWarning];
    3.32  }
     4.1 --- a/Classes/SearchViewController.m
     4.2 +++ b/Classes/SearchViewController.m
     4.3 @@ -8,33 +8,14 @@
     4.4  
     4.5  #import "SearchViewController.h"
     4.6  
     4.7 +#define SEARCH_TPL "<?xml version='1.0' ?><query xmlns='http://docs.oasis-open.org/ns/cmis/core/200908/'>\
     4.8 +    <statement><![CDATA[SELECT * FROM cmis:folder WHERE contains(%s)]]></statement></query>"
     4.9  
    4.10  @implementation SearchViewController
    4.11  
    4.12 -/*
    4.13 - // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
    4.14 -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
    4.15 -    if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
    4.16 -        // Custom initialization
    4.17 -    }
    4.18 -    return self;
    4.19 -}
    4.20 -*/
    4.21 -
    4.22 -/*
    4.23 -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
    4.24  - (void)viewDidLoad {
    4.25      [super viewDidLoad];
    4.26  }
    4.27 -*/
    4.28 -
    4.29 -/*
    4.30 -// Override to allow orientations other than the default portrait orientation.
    4.31 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
    4.32 -    // Return YES for supported orientations
    4.33 -    return (interfaceOrientation == UIInterfaceOrientationPortrait);
    4.34 -}
    4.35 -*/
    4.36  
    4.37  - (void)didReceiveMemoryWarning {
    4.38  	// Releases the view if it doesn't have a superview.
     5.1 --- a/Classes/SettingsViewController.h
     5.2 +++ b/Classes/SettingsViewController.h
     5.3 @@ -33,5 +33,4 @@
     5.4  - (IBAction)cancel;
     5.5  - (IBAction)save;
     5.6  
     5.7 -
     5.8  @end
     6.1 --- a/iNuxeo.xcodeproj/project.pbxproj
     6.2 +++ b/iNuxeo.xcodeproj/project.pbxproj
     6.3 @@ -186,7 +186,7 @@
     6.4  /* End PBXFrameworksBuildPhase section */
     6.5  
     6.6  /* Begin PBXGroup section */
     6.7 -		080E96DDFE201D6D7F000001 /* Controllers */ = {
     6.8 +		080E96DDFE201D6D7F000001 /* UI */ = {
     6.9  			isa = PBXGroup;
    6.10  			children = (
    6.11  				781530CB113FFB7F0021E3DA /* DocView.xib */,
    6.12 @@ -202,7 +202,7 @@
    6.13  				78152FB1113ECD2B0021E3DA /* SettingsViewController.h */,
    6.14  				78152FB2113ECD2B0021E3DA /* SettingsViewController.m */,
    6.15  			);
    6.16 -			name = Controllers;
    6.17 +			name = UI;
    6.18  			path = Classes;
    6.19  			sourceTree = "<group>";
    6.20  		};
    6.21 @@ -289,8 +289,8 @@
    6.22  			isa = PBXGroup;
    6.23  			children = (
    6.24  				781530B6113FF9CC0021E3DA /* Application */,
    6.25 -				080E96DDFE201D6D7F000001 /* Controllers */,
    6.26 -				78DEF9BA10CE957400081887 /* Models */,
    6.27 +				080E96DDFE201D6D7F000001 /* UI */,
    6.28 +				78DEF9BA10CE957400081887 /* Model */,
    6.29  			);
    6.30  			name = Classes;
    6.31  			sourceTree = "<group>";
    6.32 @@ -342,7 +342,7 @@
    6.33  			name = KissXML;
    6.34  			sourceTree = "<group>";
    6.35  		};
    6.36 -		78DEF9BA10CE957400081887 /* Models */ = {
    6.37 +		78DEF9BA10CE957400081887 /* Model */ = {
    6.38  			isa = PBXGroup;
    6.39  			children = (
    6.40  				78DEF8B310CE8ABA00081887 /* NXObject.h */,
    6.41 @@ -352,7 +352,7 @@
    6.42  				78DEF8BB10CE8BA000081887 /* NXDocument.h */,
    6.43  				78DEF8BC10CE8BA000081887 /* NXDocument.m */,
    6.44  			);
    6.45 -			name = Models;
    6.46 +			name = Model;
    6.47  			sourceTree = "<group>";
    6.48  		};
    6.49  		78DEFA7E10CEA96000081887 /* Utilities */ = {