From 58a7e8165e87d445e0ce99701b2ffb964da3d510 Mon Sep 17 00:00:00 2001
From: Antoine Rosset <rossetantoine@bluewin.ch>
Date: Mon, 20 May 2013 20:32:23 +0200
Subject: [PATCH] MD-234

---
 Binaries/English.lproj/Send.xib | 310 +++++++++++++++++++++++++-------
 DefaultsOsiriX.m                |   1 +
 DicomDatabase.mm                |  19 +-
 SendController.h                |   1 -
 SendController.m                | 170 ++++++++++++++----
 5 files changed, 389 insertions(+), 112 deletions(-)

diff --git a/Binaries/English.lproj/Send.xib b/Binaries/English.lproj/Send.xib
index da9f68da6b..2cb2255970 100644
--- a/Binaries/English.lproj/Send.xib
+++ b/Binaries/English.lproj/Send.xib
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E52</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">3084</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSUserDefaultsController</string>
-			<string>NSPopUpButton</string>
 			<string>NSButton</string>
-			<string>NSMenu</string>
-			<string>NSTextFieldCell</string>
 			<string>NSButtonCell</string>
-			<string>NSMenuItem</string>
-			<string>NSMatrix</string>
 			<string>NSCustomObject</string>
+			<string>NSMatrix</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSUserDefaultsController</string>
 			<string>NSView</string>
 			<string>NSWindowTemplate</string>
-			<string>NSTextField</string>
-			<string>NSPopUpButtonCell</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -45,7 +45,7 @@
 			<object class="NSWindowTemplate" id="806021229">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{329, 257}, {531, 214}}</string>
+				<string key="NSWindowRect">{{329, 257}, {531, 292}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">DICOM Send</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -55,21 +55,22 @@
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
 				<object class="NSView" key="NSWindowView" id="866985817">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSMatrix" id="995218247">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{79, 40}, {343, 58}}</string>
+							<string key="NSFrame">{{178, 85}, {343, 58}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
-							<reference key="NSNextKeyView" ref="430532717"/>
+							<reference key="NSNextKeyView" ref="5729003"/>
 							<bool key="NSEnabled">YES</bool>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							<int key="NSNumRows">3</int>
 							<int key="NSNumCols">1</int>
 							<array class="NSMutableArray" key="NSCells">
 								<object class="NSButtonCell" id="214590439">
-									<int key="NSCellFlags">-2080244224</int>
+									<int key="NSCellFlags">-2080374784</int>
 									<int key="NSCellFlags2">0</int>
 									<string key="NSContents">All images</string>
 									<object class="NSFont" key="NSSupport" id="550823874">
@@ -78,7 +79,7 @@
 										<int key="NSfFlags">1044</int>
 									</object>
 									<reference key="NSControlView" ref="995218247"/>
-									<int key="NSButtonFlags">1211912703</int>
+									<int key="NSButtonFlags">1211912448</int>
 									<int key="NSButtonFlags2">0</int>
 									<object class="NSButtonImageSource" key="NSAlternateImage" id="809719172">
 										<string key="NSImageName">NSRadioButton</string>
@@ -91,13 +92,13 @@
 									<int key="NSPeriodicInterval">25</int>
 								</object>
 								<object class="NSButtonCell" id="89639489">
-									<int key="NSCellFlags">67239424</int>
+									<int key="NSCellFlags">67108864</int>
 									<int key="NSCellFlags2">0</int>
 									<string key="NSContents">Only key images</string>
 									<reference key="NSSupport" ref="550823874"/>
 									<reference key="NSControlView" ref="995218247"/>
 									<int key="NSTag">1</int>
-									<int key="NSButtonFlags">1211912703</int>
+									<int key="NSButtonFlags">1211912448</int>
 									<int key="NSButtonFlags2">0</int>
 									<reference key="NSAlternateImage" ref="809719172"/>
 									<reference key="NSAlternateContents" ref="474706129"/>
@@ -106,13 +107,13 @@
 									<int key="NSPeriodicInterval">25</int>
 								</object>
 								<object class="NSButtonCell" id="713712501">
-									<int key="NSCellFlags">67239424</int>
+									<int key="NSCellFlags">67108864</int>
 									<int key="NSCellFlags2">0</int>
 									<string key="NSContents">Only Secondary Captures (SC)</string>
 									<reference key="NSSupport" ref="550823874"/>
 									<reference key="NSControlView" ref="995218247"/>
 									<int key="NSTag">2</int>
-									<int key="NSButtonFlags">1211912703</int>
+									<int key="NSButtonFlags">1211912448</int>
 									<int key="NSButtonFlags2">0</int>
 									<reference key="NSAlternateImage" ref="809719172"/>
 									<string key="NSAlternateContents"/>
@@ -126,11 +127,11 @@
 							<int key="NSMatrixFlags">1143472128</int>
 							<string key="NSCellClass">NSActionCell</string>
 							<object class="NSButtonCell" key="NSProtoCell" id="1047418212">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Radio</string>
 								<reference key="NSSupport" ref="550823874"/>
-								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags">1211912448</int>
 								<int key="NSButtonFlags2">0</int>
 								<object class="NSImage" key="NSNormalImage">
 									<int key="NSImageFlags">549453824</int>
@@ -197,19 +198,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="NSButton" id="240316940">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{420, 57}, {97, 32}}</string>
+							<string key="NSFrame">{{420, 13}, {97, 32}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
-							<reference key="NSNextKeyView" ref="5729003"/>
+							<reference key="NSNextKeyView"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="849776364">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134217728</int>
 								<string key="NSContents">Send</string>
 								<reference key="NSSupport" ref="550823874"/>
 								<reference key="NSControlView" ref="240316940"/>
 								<int key="NSTag">1</int>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="550823874"/>
 								<string key="NSAlternateContents"/>
@@ -217,21 +218,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="430532717">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{323, 57}, {97, 32}}</string>
+							<string key="NSFrame">{{323, 13}, {97, 32}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="240316940"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="100776659">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">134217728</int>
 								<string key="NSContents">Cancel</string>
 								<reference key="NSSupport" ref="550823874"/>
 								<reference key="NSControlView" ref="430532717"/>
-								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags">-2038284288</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="550823874"/>
 								<string key="NSAlternateContents"/>
@@ -239,16 +241,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="203583737">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{6, 187}, {161, 17}}</string>
+							<string key="NSFrame">{{6, 265}, {161, 17}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="1021516115"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="635186925">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Number of files:</string>
 								<reference key="NSSupport" ref="550823874"/>
@@ -264,16 +267,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									</object>
 								</object>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="1021516115">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{175, 187}, {339, 17}}</string>
+							<string key="NSFrame">{{175, 265}, {339, 17}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="487707830"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="899357661">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4194304</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="550823874"/>
@@ -281,16 +285,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<reference key="NSBackgroundColor" ref="259323990"/>
 								<reference key="NSTextColor" ref="679027791"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="487707830">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{6, 157}, {161, 17}}</string>
+							<string key="NSFrame">{{6, 235}, {161, 17}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="678662655"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="851545278">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Select destination:</string>
 								<reference key="NSSupport" ref="550823874"/>
@@ -298,16 +303,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<reference key="NSBackgroundColor" ref="259323990"/>
 								<reference key="NSTextColor" ref="679027791"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="1057004229">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{50, 107}, {117, 17}}</string>
+							<string key="NSFrame">{{50, 185}, {117, 17}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="531353558"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1064157806">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Transfer Syntax:</string>
 								<reference key="NSSupport" ref="550823874"/>
@@ -315,16 +321,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<reference key="NSBackgroundColor" ref="259323990"/>
 								<reference key="NSTextColor" ref="679027791"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="1025931440">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{-3, 81}, {70, 17}}</string>
+							<string key="NSFrame">{{-3, 126}, {170, 17}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="995218247"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="448380518">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Send:</string>
 								<reference key="NSSupport" ref="550823874"/>
@@ -332,21 +339,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<reference key="NSBackgroundColor" ref="259323990"/>
 								<reference key="NSTextColor" ref="679027791"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="531353558">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{169, 101}, {345, 26}}</string>
+							<string key="NSFrame">{{169, 179}, {345, 26}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
-							<reference key="NSNextKeyView" ref="1025931440"/>
+							<reference key="NSNextKeyView" ref="530307169"/>
 							<int key="NSTag">6</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="754284985">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">2048</int>
 								<reference key="NSSupport" ref="550823874"/>
 								<reference key="NSControlView" ref="531353558"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">1</int>
 								<object class="NSFont" key="NSAlternateImage">
 									<string key="NSName">LucidaGrande</string>
@@ -551,16 +559,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">1</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="893932893">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{175, 133}, {333, 17}}</string>
+							<string key="NSFrame">{{175, 211}, {333, 17}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="1057004229"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="979733076">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">4194304</int>
 								<string key="NSContents">129.195.163.200 : 4096</string>
 								<reference key="NSSupport" ref="550823874"/>
@@ -568,20 +577,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<reference key="NSBackgroundColor" ref="259323990"/>
 								<reference key="NSTextColor" ref="679027791"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSButton" id="475640896">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{79, 11}, {428, 18}}</string>
+							<string key="NSFrame">{{178, 59}, {428, 18}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
+							<reference key="NSNextKeyView" ref="430532717"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="545104597">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">0</int>
 								<string key="NSContents">Include ROIs, Comments, Reports, ...</string>
 								<reference key="NSSupport" ref="550823874"/>
 								<reference key="NSControlView" ref="475640896"/>
-								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags">1211912448</int>
 								<int key="NSButtonFlags2">2</int>
 								<object class="NSButtonImageSource" key="NSAlternateImage">
 									<string key="NSImageName">NSSwitch</string>
@@ -591,16 +602,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSTextField" id="5729003">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{-47, 12}, {114, 17}}</string>
+							<string key="NSFrame">{{6, 60}, {161, 17}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="475640896"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="29670638">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">67108864</int>
 								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">ROIs:</string>
 								<reference key="NSSupport" ref="550823874"/>
@@ -608,20 +620,39 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<reference key="NSBackgroundColor" ref="259323990"/>
 								<reference key="NSTextColor" ref="679027791"/>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="530307169">
+							<reference key="NSNextResponder" ref="866985817"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{-3, 151}, {170, 21}}</string>
+							<reference key="NSSuperview" ref="866985817"/>
+							<reference key="NSNextKeyView" ref="320052421"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="554061695">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">71303168</int>
+								<string key="NSContents">Number of associations:</string>
+								<reference key="NSSupport" ref="550823874"/>
+								<reference key="NSControlView" ref="530307169"/>
+								<reference key="NSBackgroundColor" ref="259323990"/>
+								<reference key="NSTextColor" ref="679027791"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 						<object class="NSPopUpButton" id="678662655">
 							<reference key="NSNextResponder" ref="866985817"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{169, 151}, {345, 26}}</string>
+							<string key="NSFrame">{{169, 229}, {345, 26}}</string>
 							<reference key="NSSuperview" ref="866985817"/>
 							<reference key="NSNextKeyView" ref="893932893"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="232635624">
-								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags">-2076180416</int>
 								<int key="NSCellFlags2">2048</int>
 								<reference key="NSSupport" ref="550823874"/>
 								<reference key="NSControlView" ref="678662655"/>
-								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags">109199360</int>
 								<int key="NSButtonFlags2">129</int>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent"/>
@@ -673,9 +704,82 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<bool key="NSAltersState">YES</bool>
 								<int key="NSArrowPosition">2</int>
 							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSPopUpButton" id="320052421">
+							<reference key="NSNextResponder" ref="866985817"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{170, 148}, {344, 26}}</string>
+							<reference key="NSSuperview" ref="866985817"/>
+							<reference key="NSNextKeyView" ref="1025931440"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="674594537">
+								<int key="NSCellFlags">-2076180416</int>
+								<int key="NSCellFlags2">2048</int>
+								<reference key="NSSupport" ref="550823874"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="320052421"/>
+								<int key="NSButtonFlags">109199360</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<nil key="NSMenuItem"/>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="576883354">
+									<string key="NSTitle">OtherViews</string>
+									<array class="NSMutableArray" key="NSMenuItems">
+										<object class="NSMenuItem" id="305825272">
+											<reference key="NSMenu" ref="576883354"/>
+											<string key="NSTitle">Single association</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="870332039"/>
+											<reference key="NSMixedImage" ref="425171829"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<int key="NSTag">1</int>
+											<reference key="NSTarget" ref="674594537"/>
+										</object>
+										<object class="NSMenuItem" id="723777638">
+											<reference key="NSMenu" ref="576883354"/>
+											<string key="NSTitle">2 simultaneous associations</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="870332039"/>
+											<reference key="NSMixedImage" ref="425171829"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<int key="NSTag">2</int>
+											<reference key="NSTarget" ref="674594537"/>
+										</object>
+										<object class="NSMenuItem" id="745407235">
+											<reference key="NSMenu" ref="576883354"/>
+											<string key="NSTitle">4 simultaneous associations</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="870332039"/>
+											<reference key="NSMixedImage" ref="425171829"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<int key="NSTag">4</int>
+											<reference key="NSTarget" ref="674594537"/>
+										</object>
+									</array>
+									<reference key="NSMenuFont" ref="550823874"/>
+								</object>
+								<int key="NSSelectedIndex">-1</int>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 					</array>
-					<string key="NSFrameSize">{531, 214}</string>
+					<string key="NSFrameSize">{531, 292}</string>
+					<reference key="NSSuperview"/>
 					<reference key="NSNextKeyView" ref="203583737"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
@@ -837,6 +941,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">93</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedTag: values.SendControllerConcurrentThreads</string>
+						<reference key="source" ref="320052421"/>
+						<reference key="destination" ref="998487040"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="320052421"/>
+							<reference key="NSDestination" ref="998487040"/>
+							<string key="NSLabel">selectedTag: values.SendControllerConcurrentThreads</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">values.SendControllerConcurrentThreads</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">160</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -873,15 +993,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<array class="NSMutableArray" key="children">
 							<reference ref="531353558"/>
 							<reference ref="1057004229"/>
-							<reference ref="995218247"/>
 							<reference ref="203583737"/>
 							<reference ref="1021516115"/>
-							<reference ref="1025931440"/>
 							<reference ref="487707830"/>
 							<reference ref="893932893"/>
+							<reference ref="678662655"/>
+							<reference ref="995218247"/>
+							<reference ref="1025931440"/>
 							<reference ref="475640896"/>
 							<reference ref="5729003"/>
-							<reference ref="678662655"/>
+							<reference ref="320052421"/>
+							<reference ref="530307169"/>
 							<reference ref="240316940"/>
 							<reference ref="430532717"/>
 						</array>
@@ -1208,6 +1330,60 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="273244457"/>
 						<reference key="parent" ref="769070058"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">152</int>
+						<reference key="object" ref="530307169"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="554061695"/>
+						</array>
+						<reference key="parent" ref="866985817"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">153</int>
+						<reference key="object" ref="554061695"/>
+						<reference key="parent" ref="530307169"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">154</int>
+						<reference key="object" ref="320052421"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="674594537"/>
+						</array>
+						<reference key="parent" ref="866985817"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">155</int>
+						<reference key="object" ref="674594537"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="576883354"/>
+						</array>
+						<reference key="parent" ref="320052421"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">156</int>
+						<reference key="object" ref="576883354"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="305825272"/>
+							<reference ref="723777638"/>
+							<reference ref="745407235"/>
+						</array>
+						<reference key="parent" ref="674594537"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">157</int>
+						<reference key="object" ref="305825272"/>
+						<reference key="parent" ref="576883354"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">158</int>
+						<reference key="object" ref="723777638"/>
+						<reference key="parent" ref="576883354"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">159</int>
+						<reference key="object" ref="745407235"/>
+						<reference key="parent" ref="576883354"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1239,6 +1415,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="155.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="156.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="158.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="159.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1271,14 +1455,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">151</int>
+			<int key="maxID">160</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
+			<real value="1070" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
diff --git a/DefaultsOsiriX.m b/DefaultsOsiriX.m
index 730797157e..603503a11c 100644
--- a/DefaultsOsiriX.m
+++ b/DefaultsOsiriX.m
@@ -1043,6 +1043,7 @@ + (NSMutableDictionary*) getDefaults
     [defaultValues setObject:@"30" forKey: @"WebPortalMaximumNumberOfRecentStudies"];
     [defaultValues setObject:@"10" forKey: @"WebPortalMaximumNumberOfDaysForRecentStudies"];
     [defaultValues setObject:@"2" forKey:@"yearOldDatabaseDisplay"];
+    [defaultValues setObject:@"4" forKey:@"SendControllerConcurrentThreads"];
     
 	#ifdef MACAPPSTORE
 	[defaultValues setObject:@"1" forKey:@"MACAPPSTORE"];
diff --git a/DicomDatabase.mm b/DicomDatabase.mm
index 75b43ae474..49ca845984 100644
--- a/DicomDatabase.mm
+++ b/DicomDatabase.mm
@@ -1275,21 +1275,14 @@ -(void)_processFilesAtPaths_processChunk:(NSArray*)io {
 
 -(void)processFilesAtPaths:(NSArray*)paths intoDirAtPath:(NSString*)destDir mode:(int)mode
 {
+    NSThread* thread = [NSThread currentThread];
+    
 	NSString* nameFormat = nil;
-    if (mode == Compress) {
-        if (paths.count != 1)
-            nameFormat = NSLocalizedString(@"Compressing %d files...", @"plural");
-        else nameFormat = NSLocalizedString(@"Compressing %d file...", @"singular");
-    } else {
-        if (paths.count != 1)
-            nameFormat = NSLocalizedString(@"Decompressing %d files...", @"plural");
-        else nameFormat = NSLocalizedString(@"Decompressing %d file...", @"singular");
-    }
+    if (mode == Compress)
+        thread.name = [NSString stringWithFormat: @"Compressing %@", N2LocalizedSingularPluralCount( paths.count, NSLocalizedString(@"file", nil), NSLocalizedString(@"files", nil))];
+    else
+        thread.name = [NSString stringWithFormat: @"Decompressing %@", N2LocalizedSingularPluralCount( paths.count, NSLocalizedString(@"file", nil), NSLocalizedString(@"files", nil))];
 	
-	NSThread* thread = [NSThread currentThread];
-    
-//	[thread pushLevel];
-	thread.name = [NSString stringWithFormat:nameFormat, paths.count];
 	thread.status = NSLocalizedString(@"Waiting for similar threads to complete...", nil);
     thread.progress = -1;
 	
diff --git a/SendController.h b/SendController.h
index 0217249183..134430d706 100644
--- a/SendController.h
+++ b/SendController.h
@@ -55,7 +55,6 @@ enum SendServerType { osirixServer, offisServer };
 	BOOL				_readyForRelease;
 	BOOL				_abort;
 	NSRecursiveLock     *_lock;
-	DCMTKStoreSCU		*storeSCU;
 	NSDictionary		*_destinationServer;
 	
 	IBOutlet NSPopUpButton	*newServerList;
diff --git a/SendController.m b/SendController.m
index 4d4aa8872a..54d612f4ca 100644
--- a/SendController.m
+++ b/SendController.m
@@ -31,6 +31,84 @@
 
 static volatile int sendControllerObjects = 0;
 
+@interface DCMTKStoreSCUOperation: NSOperation
+{
+    NSArray *files;
+    NSDictionary *server;
+    NSThread *thread;
+}
+@property (retain) NSArray *files;
+@property (retain) NSDictionary *server;
+@property (retain) NSThread *thread;
+
+- (id) initWithFiles:(NSArray*) a server: (NSDictionary*) s;
+
+@end
+
+@implementation DCMTKStoreSCUOperation
+@synthesize files, server, thread;
+
+- (id) initWithFiles:(NSArray*) a server:(NSDictionary*) s
+{
+    self = [super init];
+    
+    self.files = a;
+    self.server = s;
+    
+    return self;
+}
+
+- (void) showErrorMessage:(NSException*) ne
+{
+	NSString *message = [NSString stringWithFormat:@"%@\r\r%@\r%@", NSLocalizedString( @"DICOM StoreSCU operation failed.", nil), [ne name], [ne reason]];
+    
+	NSRunCriticalAlertPanel(NSLocalizedString(@"DICOM Send Error",nil), message, NSLocalizedString( @"OK",nil), nil, nil);
+}
+
+- (void) main
+{
+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
+    
+    if( self.isCancelled)
+        return;
+    
+    self.thread = [NSThread currentThread];
+    
+    DCMTKStoreSCU *storeSCU = [[DCMTKStoreSCU alloc] initWithCallingAET: [NSUserDefaults defaultAETitle]
+                                               calledAET: [server objectForKey:@"AETitle"]
+                                                hostname: [server objectForKey:@"Address"]
+                                                    port: [[server objectForKey:@"Port"] intValue]
+                                             filesToSend: files
+                                          transferSyntax: [[NSUserDefaults standardUserDefaults] integerForKey:@"syntaxListOffis"]
+                                             compression: 1.0
+                                         extraParameters: server];
+    
+    @try
+    {
+        [storeSCU run:self];
+    }
+    
+    @catch( NSException *ne)
+    {
+        [self performSelectorOnMainThread:@selector(showErrorMessage:) withObject:ne waitUntilDone: NO];
+    }
+    
+    [storeSCU release];
+    storeSCU = nil;
+
+    [pool release];
+}
+
+- (void) dealloc
+{
+    self.files = nil;
+    self.server = nil;
+    self.thread = nil;
+    [super dealloc];
+}
+
+@end
+
 @implementation SendController
 
 +(int) sendControllerObjects
@@ -391,13 +469,6 @@ - (void) sendToNode: (NSDictionary*) node objects:(NSArray*) objects
 
 #pragma mark Sending functions
 
-- (void) showErrorMessage:(NSException*) ne
-{
-	NSString	*message = [NSString stringWithFormat:@"%@\r\r%@\r%@", NSLocalizedString( @"DICOM StoreSCU operation failed.", nil), [ne name], [ne reason]];
-
-	NSRunCriticalAlertPanel(NSLocalizedString(@"DICOM Send Error",nil), message, NSLocalizedString( @"OK",nil), nil, nil);
-}
-
 - (void) executeSend:(NSArray*) files patientName: (NSString*) patientName
 {
 	if( [NSThread currentThread].isCancelled)
@@ -406,35 +477,64 @@ - (void) executeSend:(NSArray*) files patientName: (NSString*) patientName
 	[NSThread currentThread].name = [NSString stringWithFormat: @"%@ %@", NSLocalizedString( @"Sending...", nil), patientName];
     
 	// Send the collected files from the same patient
-	
-	NSString *calledAET = [[self server] objectForKey:@"AETitle"];
-	NSString *hostname = [[self server] objectForKey:@"Address"];
-	NSString *destPort = [[self server] objectForKey:@"Port"];
-	
-    NSMutableDictionary* xp = [NSMutableDictionary dictionaryWithDictionary:[self server]];
-//    [xp setObject:database forKey:@"DicomDatabase"];
     
-	storeSCU = [[DCMTKStoreSCU alloc] initWithCallingAET:[NSUserDefaults defaultAETitle] 
-			calledAET:calledAET 
-			hostname:hostname 
-			port:[destPort intValue] 
-			filesToSend:files
-			transferSyntax: [[NSUserDefaults standardUserDefaults] integerForKey:@"syntaxListOffis"]
-			compression: 1.0
-			extraParameters:[self server]];
-	
-	@try
-	{
-		[storeSCU run:self];
-	}
-	
-	@catch( NSException *ne)
-	{
-		[self performSelectorOnMainThread:@selector(showErrorMessage:) withObject:ne waitUntilDone: NO];
-	}
-	
-	[storeSCU release];
-	storeSCU = nil;
+    NSMutableArray *operations = [NSMutableArray array];
+    NSOperationQueue *queue = [[[NSOperationQueue alloc] init] autorelease];
+    queue.name = [NSString stringWithFormat: @"%@ %@", NSLocalizedString( @"Sending...", nil), patientName];
+
+    unsigned int maxThreads = [[NSUserDefaults standardUserDefaults] integerForKey: @"SendControllerConcurrentThreads"];
+    if( maxThreads <= 0)
+        maxThreads = 1;
+    unsigned long loc = 0;
+    do
+    {
+        NSRange range = NSMakeRange( loc, ceil( (float)files.count / (float)maxThreads));
+        if( operations.count == maxThreads-1)
+            range.length = files.count - range.location;
+        
+        if( range.length)
+        {
+            loc += range.length;
+            
+            DCMTKStoreSCUOperation *op = [[[DCMTKStoreSCUOperation alloc] initWithFiles: [files subarrayWithRange: range] server: [self server]] autorelease];
+            
+            [operations addObject: op];
+            [queue addOperation: op];
+        }
+                                  
+    }
+    while( loc < files.count);
+    
+    NSUInteger initialOpCount = queue.operationCount;
+    while (queue.operationCount)
+    {
+        if( [[NSThread currentThread] isCancelled])
+        {
+            for( DCMTKStoreSCUOperation *o in operations)
+                [o.thread cancel];
+            
+            [queue cancelAllOperations];
+        }
+        
+        float progress = 0;
+        for( DCMTKStoreSCUOperation *o in operations)
+        {
+            if( [o.thread isFinished])
+                progress += 1;
+            else if( o.thread.progress >= 0)
+                progress += o.thread.progress;
+        }
+        
+        progress /= operations.count;
+        [NSThread currentThread].progress = progress;
+        
+        int remainingFiles = (files.count - files.count * progress);
+        [NSThread currentThread].status = N2LocalizedSingularPluralCount( remainingFiles, NSLocalizedString(@"file", nil), NSLocalizedString(@"files", nil));
+        
+        [NSThread sleepForTimeInterval:0.1];
+    }
+    
+    [queue waitUntilAllOperationsAreFinished];
 }
 
 - (void) sendDICOMFilesOffis:(NSDictionary *) dict