Commits

Ivan Vučica committed ea9ace2

Restored stream delegate. Removed dummy service. Fixed sheet removal when service is resolved, especially for for Win32. Repositioned main app window.

  • Participants
  • Parent commits 7e8cd0f

Comments (0)

Files changed (2)

File English.lproj/MainMenu.xib

 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="372"/>
 			<integer value="628"/>
-			<integer value="372"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{-35, 322}, {540, 384}}</string>
+					<string>{{163, 604}, {540, 384}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{-35, 322}, {540, 384}}</string>
+					<string>{{163, 604}, {540, 384}}</string>
 					<integer value="1"/>
 					<string>{{33, 99}, {480, 360}}</string>
 					<string>{3.40282e+38, 3.40282e+38}</string>
 						<bytes key="NSTransformStruct">P4AAAL+AAABD7AAAwigAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{0, 296}, {468, 326}}</string>
+					<string>{{35, 646}, {468, 326}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{0, 296}, {468, 326}}</string>
+					<string>{{35, 646}, {468, 326}}</string>
 					<boolean value="NO"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>

File HIDPadDesktopAppDelegate.m

 	}
 	
 	
-	NSNetService*dummy=[[NSNetService alloc] initWithDomain:@"" type:@"_http._tcp" name:@"" port:80];
-	[dummy publish];
+	//NSNetService*dummy=[[NSNetService alloc] initWithDomain:@"" type:@"_http._tcp" name:@"" port:80];
+	//[dummy publish];
 	
 	
 	data = [[NSMutableData alloc] init];
 {
 	
 	NSLog(@"Host: %@", [service hostName]);
-	
 	[service getInputStream:&inputStream outputStream:&outputStream];
 	
-	//inputStream.delegate = self;
-	//outputStream.delegate = self;
+	inputStream.delegate = self;
+	outputStream.delegate = self;
 	[inputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
 	[outputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
 	
 	[inputStream open];
 	[outputStream open];
 	
+	
 	NSLog(@"Opened %@", inputStream);
 	
-	//[servicePickerSheet orderOut:nil];	
+	[NSApp endSheet:servicePickerSheet]; // endSheet must be called on all platforms, but especially on Cocotron which does not hide
+	[servicePickerSheet orderOut:nil];	 // the sheet with orderOut unless endSheet was called, too
 }
 
 #pragma mark -