From 729acc2f2d4954130798ed382dca478eade14302 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 24 Oct 2010 11:30:12 +0000 Subject: - Split out all of SPExportController's delegate methods to their own category. - Prepare for the implementation of PDF and HTML export by hiding the export options box for export types that don't need it. - Fix some spacing issues on the export dialog. - Create a new SPCategoryAdditions header that is included in the apps precompiled header, making all additions available to all classes. - Update strings files. --- Interfaces/English.lproj/ExportDialog.xib | 295 ++++++------------------------ 1 file changed, 52 insertions(+), 243 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib index 6afa968d..17f90795 100644 --- a/Interfaces/English.lproj/ExportDialog.xib +++ b/Interfaces/English.lproj/ExportDialog.xib @@ -3,7 +3,7 @@ 1050 10F569 - 788 + 823 1038.29 461.00 @@ -15,30 +15,23 @@ YES - 788 + 823 1.2.5 YES + - - - YES - com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit + com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -54,12 +47,12 @@ 4111 2 - {{610, 291}, {449, 480}} + {{610, 291}, {451, 480}} 611845120 Export NSWindow - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {449, 480} @@ -69,17 +62,16 @@ 18 - {{-14, 69}, {473, 405}} + {{-8, 69}, {467, 405}} YES sql - + 256 - {{10, 33}, {453, 359}} - + {{10, 33}, {447, 359}} SQL @@ -88,7 +80,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -98,7 +90,7 @@ 256 - {{10, 33}, {451, 359}} + {{10, 33}, {447, 359}} CSV @@ -109,7 +101,7 @@ 256 - {{10, 33}, {451, 359}} + {{10, 33}, {447, 359}} XML @@ -118,16 +110,17 @@ dot - + 256 - {{10, 33}, {451, 359}} + {{10, 33}, {447, 359}} + Dot - + LucidaGrande 13 @@ -137,7 +130,7 @@ YES YES - + @@ -432,12 +425,12 @@ - {449, 480} + {451, 480} {{0, 0}, {1680, 1028}} {449, 502} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} SPExportWindow @@ -450,10 +443,10 @@ View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 50} - + 256 YES @@ -571,11 +564,10 @@ {379, 139} - {{0, 0}, {1680, 1028}} {213, 72} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -587,10 +579,10 @@ View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} - + 256 YES @@ -771,11 +763,10 @@ {405, 267} - {{0, 0}, {1680, 1028}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -1454,7 +1445,9 @@ NaN YES - + + YES + YES @@ -1795,7 +1788,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA csv - + 256 YES @@ -2298,8 +2291,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{10, 7}, {189, 229}} - + {{10, 7}, {168, 229}} CSV @@ -2310,48 +2302,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - - YES - - - 268 - {{12, 176}, {71, 18}} - - YES - - -2080244224 - 131072 - Structure - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 268 - {{11, 200}, {53, 14}} - - YES - - 68288064 - 272761856 - Include: - - - - - - - - {{10, 7}, {189, 229}} + {{10, 7}, {168, 229}} HTML @@ -2407,50 +2358,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA pdf - + 256 - - YES - - - 268 - {{12, 176}, {71, 18}} - - YES - - -2080244224 - 131072 - Structure - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 268 - {{11, 200}, {53, 14}} - - YES - - 68288064 - 272761856 - Include: - - - - - - - {{10, 7}, {189, 229}} + PDF @@ -2468,14 +2379,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + 4 YES YES YES - + @@ -3128,22 +3039,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1284 - - - exportHTMLIncludeStructureCheck - - - - 1285 - - - - exportPDFIncludeStructureCheck - - - - 1286 - exportInputPopUpButton @@ -4468,39 +4363,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - - - 1211 - - - YES - - - - - - 1212 - - - YES - - - - - - 1213 - - - - - 1214 - - - 1215 @@ -4544,39 +4409,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - - - 1221 - - - YES - - - - - - 1222 - - - YES - - - - - - 1223 - - - - - 1224 - - - 1225 @@ -4849,6 +4684,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1087.IBPluginDependency 1088.IBAttributePlaceholdersKey 1088.IBPluginDependency + 1088.IBViewBoundsToFrameTransform 1092.IBPluginDependency 1093.IBPluginDependency 1094.IBPluginDependency @@ -4981,20 +4817,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1208.IBPluginDependency 1209.IBPluginDependency 1210.IBPluginDependency - 1211.IBPluginDependency - 1212.IBPluginDependency - 1213.IBPluginDependency - 1214.IBPluginDependency 1215.IBPluginDependency 1216.IBPluginDependency 1217.IBPluginDependency 1218.IBPluginDependency 1219.IBPluginDependency 1220.IBPluginDependency - 1221.IBPluginDependency - 1222.IBPluginDependency - 1223.IBPluginDependency - 1224.IBPluginDependency 1225.IBPluginDependency 1226.IBPluginDependency 1227.IBPluginDependency @@ -5100,15 +4928,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES com.apple.InterfaceBuilder.CocoaPlugin - {{395, 209}, {449, 480}} + {{509, 248}, {451, 480}} com.apple.InterfaceBuilder.CocoaPlugin - {{395, 209}, {449, 480}} + {{509, 248}, {451, 480}} {449, 480} - {{439, 411}, {450, 359}} + {{226, 235}, {450, 359}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5120,6 +4948,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDYQAAw4OAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5332,14 +5163,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin YES @@ -5483,7 +5306,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 1350 + 1354 @@ -5495,13 +5318,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Frameworks/PSMTabBar/PSMTabDragAssistant.h - - NSObject - - IBProjectSource - Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h - - NSObject @@ -5865,11 +5681,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox - exportHTMLIncludeStructureCheck exportInputPopUpButton exportOptionsTabBar exportOutputCompressionFormatPopupButton - exportPDFIncludeStructureCheck exportPathField exportProcessLowMemoryButton exportProgressIndicator @@ -5921,11 +5735,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSMatrix NSButton NSBox - NSButton NSPopUpButton NSTabView NSPopUpButton - NSButton NSTextField NSButton NSProgressIndicator @@ -5980,11 +5792,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox - exportHTMLIncludeStructureCheck exportInputPopUpButton exportOptionsTabBar exportOutputCompressionFormatPopupButton - exportPDFIncludeStructureCheck exportPathField exportProcessLowMemoryButton exportProgressIndicator @@ -6102,10 +5912,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportFilenameDividerBox NSBox - - exportHTMLIncludeStructureCheck - NSButton - exportInputPopUpButton NSPopUpButton @@ -6118,10 +5924,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportOutputCompressionFormatPopupButton NSPopUpButton - - exportPDFIncludeStructureCheck - NSButton - exportPathField NSTextField @@ -6233,6 +6035,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Source/SPExportController.h + + SPExportController + + IBProjectSource + Source/SPExportControllerDelegate.h + + SPExportController -- cgit v1.2.3