r81059 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r81058‎ | r81059 | r81060 >
Date:22:19, 26 January 2011
Author:hartman
Status:deferred
Tags:
Comment:
* Add a license field to the settings view
* Added a picker for the license field (no data model yet)
* Some small cleanup in xibs
Modified paths:
  • /trunk/tools/WikiSnaps/Classes/Configuration.h (modified) (history)
  • /trunk/tools/WikiSnaps/Classes/SettingsViewController.h (modified) (history)
  • /trunk/tools/WikiSnaps/Classes/SettingsViewController.m (modified) (history)
  • /trunk/tools/WikiSnaps/ImageDetailsViewController.xib (modified) (history)
  • /trunk/tools/WikiSnaps/ImageUploadViewController.xib (modified) (history)
  • /trunk/tools/WikiSnaps/MainWindow.xib (modified) (history)
  • /trunk/tools/WikiSnaps/SettingsViewController.xib (modified) (history)

Diff [purge]

Index: trunk/tools/WikiSnaps/SettingsViewController.xib
——@@ -2,17 +2,18 @@
33 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
44 <data>
55 <int key="IBDocument.SystemTarget">1056</int>
6 - <string key="IBDocument.SystemVersion">10H574</string>
 6+ <string key="IBDocument.SystemVersion">10J567</string>
77 <string key="IBDocument.InterfaceBuilderVersion">823</string>
88 <string key="IBDocument.AppKitVersion">1038.35</string>
9 - <string key="IBDocument.HIToolboxVersion">461.00</string>
 9+ <string key="IBDocument.HIToolboxVersion">462.00</string>
1010 <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1111 <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
1212 <string key="NS.object.0">132</string>
1313 </object>
1414 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
1515 <bool key="EncodedWithXMLCoder">YES</bool>
16 - <integer value="1"/>
 16+ <integer value="23"/>
 17+ <integer value="31"/>
1718 </object>
1819 <object class="NSArray" key="IBDocument.PluginDependencies">
1920 <bool key="EncodedWithXMLCoder">YES</bool>
——@@ -44,8 +45,8 @@
4546 <bool key="EncodedWithXMLCoder">YES</bool>
4647 <object class="IBUITextField" id="1021023533">
4748 <reference key="NSNextResponder" ref="191373211"/>
48 - <int key="NSvFlags">292</int>
49 - <string key="NSFrame">{{20, 20}, {280, 31}}</string>
 49+ <int key="NSvFlags">288</int>
 50+ <string key="NSFrame">{{19, 46}, {280, 31}}</string>
5051 <reference key="NSSuperview" ref="191373211"/>
5152 <bool key="IBUIOpaque">NO</bool>
5253 <bool key="IBUIClipsSubviews">YES</bool>
——@@ -72,8 +73,8 @@
7374 </object>
7475 <object class="IBUITextField" id="307778079">
7576 <reference key="NSNextResponder" ref="191373211"/>
76 - <int key="NSvFlags">292</int>
77 - <string key="NSFrame">{{20, 59}, {280, 31}}</string>
 77+ <int key="NSvFlags">288</int>
 78+ <string key="NSFrame">{{19, 111}, {280, 31}}</string>
7879 <reference key="NSSuperview" ref="191373211"/>
7980 <bool key="IBUIOpaque">NO</bool>
8081 <bool key="IBUIClipsSubviews">YES</bool>
——@@ -98,7 +99,7 @@
99100 </object>
100101 <object class="IBUIButton" id="449457945">
101102 <reference key="NSNextResponder" ref="191373211"/>
102 - <int key="NSvFlags">292</int>
 103+ <int key="NSvFlags">288</int>
103104 <string key="NSFrame">{{74, 359}, {171, 37}}</string>
104105 <reference key="NSSuperview" ref="191373211"/>
105106 <bool key="IBUIOpaque">NO</bool>
——@@ -112,7 +113,7 @@
113114 </object>
114115 <int key="IBUIButtonType">1</int>
115116 <string key="IBUINormalTitle">Save</string>
116 - <object class="NSColor" key="IBUIHighlightedTitleColor">
 117+ <object class="NSColor" key="IBUIHighlightedTitleColor" id="317385407">
117118 <int key="NSColorSpace">3</int>
118119 <bytes key="NSWhite">MQA</bytes>
119120 </object>
——@@ -125,6 +126,86 @@
126127 <bytes key="NSWhite">MC41AA</bytes>
127128 </object>
128129 </object>
 130+ <object class="IBUILabel" id="180329537">
 131+ <reference key="NSNextResponder" ref="191373211"/>
 132+ <int key="NSvFlags">288</int>
 133+ <string key="NSFrame">{{20, 150}, {280, 18}}</string>
 134+ <reference key="NSSuperview" ref="191373211"/>
 135+ <bool key="IBUIOpaque">NO</bool>
 136+ <bool key="IBUIClipsSubviews">YES</bool>
 137+ <int key="IBUIContentMode">7</int>
 138+ <bool key="IBUIUserInteractionEnabled">NO</bool>
 139+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 140+ <string key="IBUIText">License</string>
 141+ <object class="NSFont" key="IBUIFont" id="173062393">
 142+ <string key="NSName">Helvetica</string>
 143+ <double key="NSSize">14</double>
 144+ <int key="NSfFlags">16</int>
 145+ </object>
 146+ <object class="NSColor" key="IBUITextColor" id="685033555">
 147+ <int key="NSColorSpace">1</int>
 148+ <bytes key="NSRGB">MCAwIDAAA</bytes>
 149+ </object>
 150+ <reference key="IBUIHighlightedColor" ref="317385407"/>
 151+ <int key="IBUIBaselineAdjustment">1</int>
 152+ <float key="IBUIMinimumFontSize">10</float>
 153+ </object>
 154+ <object class="IBUITextField" id="261756187">
 155+ <reference key="NSNextResponder" ref="191373211"/>
 156+ <int key="NSvFlags">288</int>
 157+ <string key="NSFrame">{{20, 176}, {280, 31}}</string>
 158+ <reference key="NSSuperview" ref="191373211"/>
 159+ <bool key="IBUIOpaque">NO</bool>
 160+ <bool key="IBUIClipsSubviews">YES</bool>
 161+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 162+ <int key="IBUIContentVerticalAlignment">0</int>
 163+ <string key="IBUIText"/>
 164+ <int key="IBUIBorderStyle">3</int>
 165+ <object class="NSColor" key="IBUITextColor">
 166+ <int key="NSColorSpace">3</int>
 167+ <bytes key="NSWhite">MAA</bytes>
 168+ <reference key="NSCustomColorSpace" ref="437644164"/>
 169+ </object>
 170+ <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 171+ <float key="IBUIMinimumFontSize">17</float>
 172+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
 173+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 174+ </object>
 175+ </object>
 176+ <object class="IBUILabel" id="257871712">
 177+ <reference key="NSNextResponder" ref="191373211"/>
 178+ <int key="NSvFlags">288</int>
 179+ <string key="NSFrame">{{20, 20}, {280, 18}}</string>
 180+ <reference key="NSSuperview" ref="191373211"/>
 181+ <bool key="IBUIOpaque">NO</bool>
 182+ <bool key="IBUIClipsSubviews">YES</bool>
 183+ <int key="IBUIContentMode">7</int>
 184+ <bool key="IBUIUserInteractionEnabled">NO</bool>
 185+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 186+ <string key="IBUIText">Username</string>
 187+ <reference key="IBUIFont" ref="173062393"/>
 188+ <reference key="IBUITextColor" ref="685033555"/>
 189+ <reference key="IBUIHighlightedColor" ref="317385407"/>
 190+ <int key="IBUIBaselineAdjustment">1</int>
 191+ <float key="IBUIMinimumFontSize">10</float>
 192+ </object>
 193+ <object class="IBUILabel" id="476251156">
 194+ <reference key="NSNextResponder" ref="191373211"/>
 195+ <int key="NSvFlags">288</int>
 196+ <string key="NSFrame">{{20, 85}, {280, 18}}</string>
 197+ <reference key="NSSuperview" ref="191373211"/>
 198+ <bool key="IBUIOpaque">NO</bool>
 199+ <bool key="IBUIClipsSubviews">YES</bool>
 200+ <int key="IBUIContentMode">7</int>
 201+ <bool key="IBUIUserInteractionEnabled">NO</bool>
 202+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 203+ <string key="IBUIText">Password</string>
 204+ <reference key="IBUIFont" ref="173062393"/>
 205+ <reference key="IBUITextColor" ref="685033555"/>
 206+ <reference key="IBUIHighlightedColor" ref="317385407"/>
 207+ <int key="IBUIBaselineAdjustment">1</int>
 208+ <float key="IBUIMinimumFontSize">10</float>
 209+ </object>
129210 </object>
130211 <string key="NSFrameSize">{320, 416}</string>
131212 <reference key="NSSuperview"/>
——@@ -166,6 +247,46 @@
167248 </object>
168249 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
169250 </object>
 251+ <object class="IBUIView" id="75492359">
 252+ <reference key="NSNextResponder"/>
 253+ <int key="NSvFlags">292</int>
 254+ <object class="NSMutableArray" key="NSSubviews">
 255+ <bool key="EncodedWithXMLCoder">YES</bool>
 256+ <object class="IBUINavigationBar" id="697282909">
 257+ <reference key="NSNextResponder" ref="75492359"/>
 258+ <int key="NSvFlags">288</int>
 259+ <string key="NSFrameSize">{320, 44}</string>
 260+ <reference key="NSSuperview" ref="75492359"/>
 261+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 262+ <object class="NSArray" key="IBUIItems">
 263+ <bool key="EncodedWithXMLCoder">YES</bool>
 264+ <object class="IBUINavigationItem" id="840534712">
 265+ <reference key="IBUINavigationBar" ref="697282909"/>
 266+ <string key="IBUITitle">Title</string>
 267+ <object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="345818059">
 268+ <string key="IBUITitle">Item</string>
 269+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 270+ <int key="IBUIStyle">1</int>
 271+ <reference key="IBUINavigationItem" ref="840534712"/>
 272+ </object>
 273+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 274+ </object>
 275+ </object>
 276+ </object>
 277+ <object class="IBUIPickerView" id="871605169">
 278+ <reference key="NSNextResponder" ref="75492359"/>
 279+ <int key="NSvFlags">288</int>
 280+ <string key="NSFrame">{{0, 44}, {320, 216}}</string>
 281+ <reference key="NSSuperview" ref="75492359"/>
 282+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 283+ <bool key="IBUIShowsSelectionIndicator">YES</bool>
 284+ </object>
 285+ </object>
 286+ <string key="NSFrameSize">{320, 258}</string>
 287+ <reference key="NSSuperview"/>
 288+ <reference key="IBUIBackgroundColor" ref="685033555"/>
 289+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 290+ </object>
170291 </object>
171292 <object class="IBObjectContainer" key="IBDocument.Objects">
172293 <object class="NSMutableArray" key="connectionRecords">
——@@ -245,6 +366,94 @@
246367 </object>
247368 <int key="connectionID">21</int>
248369 </object>
 370+ <object class="IBConnectionRecord">
 371+ <object class="IBCocoaTouchOutletConnection" key="connection">
 372+ <string key="label">usernameLabel</string>
 373+ <reference key="source" ref="372490531"/>
 374+ <reference key="destination" ref="257871712"/>
 375+ </object>
 376+ <int key="connectionID">26</int>
 377+ </object>
 378+ <object class="IBConnectionRecord">
 379+ <object class="IBCocoaTouchOutletConnection" key="connection">
 380+ <string key="label">licenseLabel</string>
 381+ <reference key="source" ref="372490531"/>
 382+ <reference key="destination" ref="180329537"/>
 383+ </object>
 384+ <int key="connectionID">27</int>
 385+ </object>
 386+ <object class="IBConnectionRecord">
 387+ <object class="IBCocoaTouchOutletConnection" key="connection">
 388+ <string key="label">license</string>
 389+ <reference key="source" ref="372490531"/>
 390+ <reference key="destination" ref="261756187"/>
 391+ </object>
 392+ <int key="connectionID">28</int>
 393+ </object>
 394+ <object class="IBConnectionRecord">
 395+ <object class="IBCocoaTouchOutletConnection" key="connection">
 396+ <string key="label">passwordLabel</string>
 397+ <reference key="source" ref="372490531"/>
 398+ <reference key="destination" ref="476251156"/>
 399+ </object>
 400+ <int key="connectionID">29</int>
 401+ </object>
 402+ <object class="IBConnectionRecord">
 403+ <object class="IBCocoaTouchOutletConnection" key="connection">
 404+ <string key="label">delegate</string>
 405+ <reference key="source" ref="261756187"/>
 406+ <reference key="destination" ref="372490531"/>
 407+ </object>
 408+ <int key="connectionID">30</int>
 409+ </object>
 410+ <object class="IBConnectionRecord">
 411+ <object class="IBCocoaTouchOutletConnection" key="connection">
 412+ <string key="label">delegate</string>
 413+ <reference key="source" ref="871605169"/>
 414+ <reference key="destination" ref="372490531"/>
 415+ </object>
 416+ <int key="connectionID">35</int>
 417+ </object>
 418+ <object class="IBConnectionRecord">
 419+ <object class="IBCocoaTouchOutletConnection" key="connection">
 420+ <string key="label">dataSource</string>
 421+ <reference key="source" ref="871605169"/>
 422+ <reference key="destination" ref="372490531"/>
 423+ </object>
 424+ <int key="connectionID">36</int>
 425+ </object>
 426+ <object class="IBConnectionRecord">
 427+ <object class="IBCocoaTouchOutletConnection" key="connection">
 428+ <string key="label">navItem</string>
 429+ <reference key="source" ref="372490531"/>
 430+ <reference key="destination" ref="840534712"/>
 431+ </object>
 432+ <int key="connectionID">38</int>
 433+ </object>
 434+ <object class="IBConnectionRecord">
 435+ <object class="IBCocoaTouchOutletConnection" key="connection">
 436+ <string key="label">pickerControl</string>
 437+ <reference key="source" ref="372490531"/>
 438+ <reference key="destination" ref="871605169"/>
 439+ </object>
 440+ <int key="connectionID">40</int>
 441+ </object>
 442+ <object class="IBConnectionRecord">
 443+ <object class="IBCocoaTouchOutletConnection" key="connection">
 444+ <string key="label">pickerView</string>
 445+ <reference key="source" ref="372490531"/>
 446+ <reference key="destination" ref="75492359"/>
 447+ </object>
 448+ <int key="connectionID">41</int>
 449+ </object>
 450+ <object class="IBConnectionRecord">
 451+ <object class="IBCocoaTouchOutletConnection" key="connection">
 452+ <string key="label">dismissButton</string>
 453+ <reference key="source" ref="372490531"/>
 454+ <reference key="destination" ref="345818059"/>
 455+ </object>
 456+ <int key="connectionID">42</int>
 457+ </object>
249458 </object>
250459 <object class="IBMutableOrderedSet" key="objectRecords">
251460 <object class="NSArray" key="orderedObjects">
——@@ -260,9 +469,13 @@
261470 <reference key="object" ref="191373211"/>
262471 <object class="NSMutableArray" key="children">
263472 <bool key="EncodedWithXMLCoder">YES</bool>
 473+ <reference ref="449457945"/>
 474+ <reference ref="257871712"/>
264475 <reference ref="1021023533"/>
 476+ <reference ref="476251156"/>
265477 <reference ref="307778079"/>
266 - <reference ref="449457945"/>
 478+ <reference ref="180329537"/>
 479+ <reference ref="261756187"/>
267480 </object>
268481 <reference key="parent" ref="0"/>
269482 </object>
——@@ -292,6 +505,65 @@
293506 <reference key="object" ref="449457945"/>
294507 <reference key="parent" ref="191373211"/>
295508 </object>
 509+ <object class="IBObjectRecord">
 510+ <int key="objectID">22</int>
 511+ <reference key="object" ref="180329537"/>
 512+ <reference key="parent" ref="191373211"/>
 513+ </object>
 514+ <object class="IBObjectRecord">
 515+ <int key="objectID">23</int>
 516+ <reference key="object" ref="261756187"/>
 517+ <reference key="parent" ref="191373211"/>
 518+ </object>
 519+ <object class="IBObjectRecord">
 520+ <int key="objectID">24</int>
 521+ <reference key="object" ref="257871712"/>
 522+ <reference key="parent" ref="191373211"/>
 523+ </object>
 524+ <object class="IBObjectRecord">
 525+ <int key="objectID">25</int>
 526+ <reference key="object" ref="476251156"/>
 527+ <reference key="parent" ref="191373211"/>
 528+ </object>
 529+ <object class="IBObjectRecord">
 530+ <int key="objectID">31</int>
 531+ <reference key="object" ref="75492359"/>
 532+ <object class="NSMutableArray" key="children">
 533+ <bool key="EncodedWithXMLCoder">YES</bool>
 534+ <reference ref="697282909"/>
 535+ <reference ref="871605169"/>
 536+ </object>
 537+ <reference key="parent" ref="0"/>
 538+ <string key="objectName">pickerview</string>
 539+ </object>
 540+ <object class="IBObjectRecord">
 541+ <int key="objectID">32</int>
 542+ <reference key="object" ref="697282909"/>
 543+ <object class="NSMutableArray" key="children">
 544+ <bool key="EncodedWithXMLCoder">YES</bool>
 545+ <reference ref="840534712"/>
 546+ </object>
 547+ <reference key="parent" ref="75492359"/>
 548+ </object>
 549+ <object class="IBObjectRecord">
 550+ <int key="objectID">33</int>
 551+ <reference key="object" ref="840534712"/>
 552+ <object class="NSMutableArray" key="children">
 553+ <bool key="EncodedWithXMLCoder">YES</bool>
 554+ <reference ref="345818059"/>
 555+ </object>
 556+ <reference key="parent" ref="697282909"/>
 557+ </object>
 558+ <object class="IBObjectRecord">
 559+ <int key="objectID">34</int>
 560+ <reference key="object" ref="871605169"/>
 561+ <reference key="parent" ref="75492359"/>
 562+ </object>
 563+ <object class="IBObjectRecord">
 564+ <int key="objectID">37</int>
 565+ <reference key="object" ref="345818059"/>
 566+ <reference key="parent" ref="840534712"/>
 567+ </object>
296568 </object>
297569 </object>
298570 <object class="NSMutableDictionary" key="flattenedProperties">
——@@ -302,9 +574,25 @@
303575 <string>-2.CustomClassName</string>
304576 <string>1.IBEditorWindowLastContentRect</string>
305577 <string>1.IBPluginDependency</string>
 578+ <string>22.IBPluginDependency</string>
 579+ <string>22.IBViewBoundsToFrameTransform</string>
 580+ <string>23.IBPluginDependency</string>
 581+ <string>23.IBViewBoundsToFrameTransform</string>
 582+ <string>24.IBPluginDependency</string>
 583+ <string>24.IBViewBoundsToFrameTransform</string>
 584+ <string>25.IBPluginDependency</string>
 585+ <string>25.IBViewBoundsToFrameTransform</string>
 586+ <string>31.IBEditorWindowLastContentRect</string>
 587+ <string>31.IBPluginDependency</string>
 588+ <string>32.IBPluginDependency</string>
 589+ <string>32.IBViewBoundsToFrameTransform</string>
 590+ <string>33.IBPluginDependency</string>
 591+ <string>34.IBPluginDependency</string>
 592+ <string>37.IBPluginDependency</string>
306593 <string>5.IBPluginDependency</string>
307594 <string>5.IBViewBoundsToFrameTransform</string>
308595 <string>6.IBPluginDependency</string>
 596+ <string>6.IBViewBoundsToFrameTransform</string>
309597 <string>7.IBPluginDependency</string>
310598 <string>7.IBViewBoundsToFrameTransform</string>
311599 </object>
——@@ -316,11 +604,39 @@
317605 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
318606 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
319607 <object class="NSAffineTransform">
320 - <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwwMAAA</bytes>
 608+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwy0AAA</bytes>
321609 </object>
322610 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 611+ <object class="NSAffineTransform">
 612+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw1QAAA</bytes>
 613+ </object>
323614 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
324615 <object class="NSAffineTransform">
 616+ <bytes key="NSTransformStruct">AUGgAABDHQAAA</bytes>
 617+ </object>
 618+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 619+ <object class="NSAffineTransform">
 620+ <bytes key="NSTransformStruct">AUGgAABDHQAAA</bytes>
 621+ </object>
 622+ <string>{{190, 299}, {320, 258}}</string>
 623+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 624+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 625+ <object class="NSAffineTransform">
 626+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAwigAAA</bytes>
 627+ </object>
 628+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 629+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 630+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 631+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 632+ <object class="NSAffineTransform">
 633+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwtIAAA</bytes>
 634+ </object>
 635+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 636+ <object class="NSAffineTransform">
 637+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwxAAAA</bytes>
 638+ </object>
 639+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 640+ <object class="NSAffineTransform">
325641 <bytes key="NSTransformStruct">P4AAAL+AAABClAAAw9sAAA</bytes>
326642 </object>
327643 </object>
——@@ -341,7 +657,7 @@
342658 </object>
343659 </object>
344660 <nil key="sourceID"/>
345 - <int key="maxID">21</int>
 661+ <int key="maxID">46</int>
346662 </object>
347663 <object class="IBClassDescriber" key="IBDocument.Classes">
348664 <object class="NSMutableArray" key="referencedPartialClassDescriptions">
——@@ -353,6 +669,8 @@
354670 <bool key="EncodedWithXMLCoder">YES</bool>
355671 <object class="NSArray" key="dict.sortedKeys">
356672 <bool key="EncodedWithXMLCoder">YES</bool>
 673+ <string>dismissLicensePicker:</string>
 674+ <string>pickLicensePicker:</string>
357675 <string>saveAction:</string>
358676 <string>textFieldDidEnd:</string>
359677 </object>
——@@ -360,18 +678,30 @@
361679 <bool key="EncodedWithXMLCoder">YES</bool>
362680 <string>id</string>
363681 <string>id</string>
 682+ <string>id</string>
 683+ <string>id</string>
364684 </object>
365685 </object>
366686 <object class="NSMutableDictionary" key="actionInfosByName">
367687 <bool key="EncodedWithXMLCoder">YES</bool>
368688 <object class="NSArray" key="dict.sortedKeys">
369689 <bool key="EncodedWithXMLCoder">YES</bool>
 690+ <string>dismissLicensePicker:</string>
 691+ <string>pickLicensePicker:</string>
370692 <string>saveAction:</string>
371693 <string>textFieldDidEnd:</string>
372694 </object>
373695 <object class="NSMutableArray" key="dict.values">
374696 <bool key="EncodedWithXMLCoder">YES</bool>
375697 <object class="IBActionInfo">
 698+ <string key="name">dismissLicensePicker:</string>
 699+ <string key="candidateClassName">id</string>
 700+ </object>
 701+ <object class="IBActionInfo">
 702+ <string key="name">pickLicensePicker:</string>
 703+ <string key="candidateClassName">id</string>
 704+ </object>
 705+ <object class="IBActionInfo">
376706 <string key="name">saveAction:</string>
377707 <string key="candidateClassName">id</string>
378708 </object>
——@@ -385,32 +715,84 @@
386716 <bool key="EncodedWithXMLCoder">YES</bool>
387717 <object class="NSArray" key="dict.sortedKeys">
388718 <bool key="EncodedWithXMLCoder">YES</bool>
 719+ <string>dismissButton</string>
 720+ <string>license</string>
 721+ <string>licenseLabel</string>
 722+ <string>navItem</string>
389723 <string>password</string>
 724+ <string>passwordLabel</string>
 725+ <string>pickerControl</string>
 726+ <string>pickerView</string>
390727 <string>save</string>
391728 <string>username</string>
 729+ <string>usernameLabel</string>
392730 </object>
393731 <object class="NSMutableArray" key="dict.values">
394732 <bool key="EncodedWithXMLCoder">YES</bool>
 733+ <string>UIBarButtonItem</string>
395734 <string>UITextField</string>
 735+ <string>UILabel</string>
 736+ <string>UINavigationItem</string>
 737+ <string>UITextField</string>
 738+ <string>UILabel</string>
 739+ <string>UIPickerView</string>
 740+ <string>UIView</string>
396741 <string>UIButton</string>
397742 <string>UITextField</string>
 743+ <string>UILabel</string>
398744 </object>
399745 </object>
400746 <object class="NSMutableDictionary" key="toOneOutletInfosByName">
401747 <bool key="EncodedWithXMLCoder">YES</bool>
402748 <object class="NSArray" key="dict.sortedKeys">
403749 <bool key="EncodedWithXMLCoder">YES</bool>
 750+ <string>dismissButton</string>
 751+ <string>license</string>
 752+ <string>licenseLabel</string>
 753+ <string>navItem</string>
404754 <string>password</string>
 755+ <string>passwordLabel</string>
 756+ <string>pickerControl</string>
 757+ <string>pickerView</string>
405758 <string>save</string>
406759 <string>username</string>
 760+ <string>usernameLabel</string>
407761 </object>
408762 <object class="NSMutableArray" key="dict.values">
409763 <bool key="EncodedWithXMLCoder">YES</bool>
410764 <object class="IBToOneOutletInfo">
 765+ <string key="name">dismissButton</string>
 766+ <string key="candidateClassName">UIBarButtonItem</string>
 767+ </object>
 768+ <object class="IBToOneOutletInfo">
 769+ <string key="name">license</string>
 770+ <string key="candidateClassName">UITextField</string>
 771+ </object>
 772+ <object class="IBToOneOutletInfo">
 773+ <string key="name">licenseLabel</string>
 774+ <string key="candidateClassName">UILabel</string>
 775+ </object>
 776+ <object class="IBToOneOutletInfo">
 777+ <string key="name">navItem</string>
 778+ <string key="candidateClassName">UINavigationItem</string>
 779+ </object>
 780+ <object class="IBToOneOutletInfo">
411781 <string key="name">password</string>
412782 <string key="candidateClassName">UITextField</string>
413783 </object>
414784 <object class="IBToOneOutletInfo">
 785+ <string key="name">passwordLabel</string>
 786+ <string key="candidateClassName">UILabel</string>
 787+ </object>
 788+ <object class="IBToOneOutletInfo">
 789+ <string key="name">pickerControl</string>
 790+ <string key="candidateClassName">UIPickerView</string>
 791+ </object>
 792+ <object class="IBToOneOutletInfo">
 793+ <string key="name">pickerView</string>
 794+ <string key="candidateClassName">UIView</string>
 795+ </object>
 796+ <object class="IBToOneOutletInfo">
415797 <string key="name">save</string>
416798 <string key="candidateClassName">UIButton</string>
417799 </object>
——@@ -418,11 +800,15 @@
419801 <string key="name">username</string>
420802 <string key="candidateClassName">UITextField</string>
421803 </object>
 804+ <object class="IBToOneOutletInfo">
 805+ <string key="name">usernameLabel</string>
 806+ <string key="candidateClassName">UILabel</string>
 807+ </object>
422808 </object>
423809 </object>
424810 <object class="IBClassDescriptionSource" key="sourceIdentifier">
425811 <string key="majorKey">IBProjectSource</string>
426 - <string key="minorKey">SettingsViewController.h</string>
 812+ <string key="minorKey">Classes/SettingsViewController.h</string>
427813 </object>
428814 </object>
429815 </object>
——@@ -520,6 +906,22 @@
521907 </object>
522908 </object>
523909 <object class="IBPartialClassDescription">
 910+ <string key="className">UIBarButtonItem</string>
 911+ <string key="superclassName">UIBarItem</string>
 912+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
 913+ <string key="majorKey">IBFrameworkSource</string>
 914+ <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
 915+ </object>
 916+ </object>
 917+ <object class="IBPartialClassDescription">
 918+ <string key="className">UIBarItem</string>
 919+ <string key="superclassName">NSObject</string>
 920+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
 921+ <string key="majorKey">IBFrameworkSource</string>
 922+ <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
 923+ </object>
 924+ </object>
 925+ <object class="IBPartialClassDescription">
524926 <string key="className">UIButton</string>
525927 <string key="superclassName">UIControl</string>
526928 <object class="IBClassDescriptionSource" key="sourceIdentifier">
——@@ -536,6 +938,35 @@
537939 </object>
538940 </object>
539941 <object class="IBPartialClassDescription">
 942+ <string key="className">UILabel</string>
 943+ <string key="superclassName">UIView</string>
 944+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
 945+ <string key="majorKey">IBFrameworkSource</string>
 946+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
 947+ </object>
 948+ </object>
 949+ <object class="IBPartialClassDescription">
 950+ <string key="className">UINavigationBar</string>
 951+ <string key="superclassName">UIView</string>
 952+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="525548119">
 953+ <string key="majorKey">IBFrameworkSource</string>
 954+ <string key="minorKey">UIKit.framework/Headers/UINavigationBar.h</string>
 955+ </object>
 956+ </object>
 957+ <object class="IBPartialClassDescription">
 958+ <string key="className">UINavigationItem</string>
 959+ <string key="superclassName">NSObject</string>
 960+ <reference key="sourceIdentifier" ref="525548119"/>
 961+ </object>
 962+ <object class="IBPartialClassDescription">
 963+ <string key="className">UIPickerView</string>
 964+ <string key="superclassName">UIView</string>
 965+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
 966+ <string key="majorKey">IBFrameworkSource</string>
 967+ <string key="minorKey">UIKit.framework/Headers/UIPickerView.h</string>
 968+ </object>
 969+ </object>
 970+ <object class="IBPartialClassDescription">
540971 <string key="className">UIResponder</string>
541972 <string key="superclassName">NSObject</string>
542973 <reference key="sourceIdentifier" ref="577610225"/>
——@@ -632,7 +1063,7 @@
6331064 <integer value="3000" key="NS.object.0"/>
6341065 </object>
6351066 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
636 - <string key="IBDocument.LastKnownRelativeProjectPath">photopicker.xcodeproj</string>
 1067+ <string key="IBDocument.LastKnownRelativeProjectPath">WikiSnaps.xcodeproj</string>
6371068 <int key="IBDocument.defaultPropertyAccessControl">3</int>
6381069 <string key="IBCocoaTouchPluginVersion">132</string>
6391070 </data>
Index: trunk/tools/WikiSnaps/Classes/SettingsViewController.h
——@@ -13,16 +13,38 @@
1414 @interface SettingsViewController : UIViewController <UINavigationControllerDelegate,
1515 UITextFieldDelegate>{
1616
 17+ IBOutlet UILabel *usernameLabel;
 18+ IBOutlet UILabel *passwordLabel;
 19+ IBOutlet UILabel *licenseLabel;
 20+
1721 IBOutlet UITextField *username;
1822 IBOutlet UITextField *password;
 23+ IBOutlet UITextField *license;
1924 IBOutlet UIButton *save;
 25+
 26+ IBOutlet UIView *pickerView;
 27+ IBOutlet UIBarButtonItem *dismissButton;
 28+ IBOutlet UINavigationItem *navItem;
 29+ IBOutlet UIPickerView *pickerControl;
 30+
2031 }
2132
 33+@property (retain, nonatomic) UILabel *usernameLabel;
 34+@property (retain, nonatomic) UILabel *passwordLabel;
 35+@property (retain, nonatomic) UILabel *licenseLabel;
 36+
2237 @property (retain, nonatomic) UITextField *username;
2338 @property (retain, nonatomic) UITextField *password;
 39+@property (retain, nonatomic) UITextField *license;
2440 @property (retain, nonatomic) UIButton *save;
2541
2642 -(IBAction)textFieldDidEnd:(id)sender;
 43+-(IBAction)pickLicensePicker:(id)sender;
 44+-(IBAction)dismissLicensePicker:(id)sender;
2745
2846 -(IBAction)saveAction:(id)sender;
 47+
 48+- (void)popupView: (UIView*) popupView;
 49+- (void)popdownView: (UIView*) popupView;
 50+
2951 @end
Index: trunk/tools/WikiSnaps/Classes/SettingsViewController.m
——@@ -13,7 +13,9 @@
1414
1515 @implementation SettingsViewController
1616
17 -@synthesize username,password,save;
 17+@synthesize usernameLabel, passwordLabel, licenseLabel;
 18+@synthesize username,password,license;
 19+@synthesize save;
1820
1921 // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
2022 /*
——@@ -30,9 +32,14 @@
3133 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
3234 - (void)viewDidLoad {
3335 [super viewDidLoad];
34 - self.title = NSLocalizedString( @"Settings", @"Title of the settings view" );
 36+ self.title = NSLocalizedString( @"Settings", @"Title of the settings view" );
 37+ usernameLabel.text = NSLocalizedString( @"Username", @"Label of the username textfield" );
 38+ usernameLabel.text = NSLocalizedString( @"Password", @"Label of the password textfield" );
 39+ usernameLabel.text = NSLocalizedString( @"License", @"Label of the license textfield" );
 40+
3541 username.text = [[NSUserDefaults standardUserDefaults] valueForKey: COMMONS_USERNAME_KEY];
3642 password.text = [[NSUserDefaults standardUserDefaults] valueForKey: COMMONS_PASSWORD_KEY];
 43+ license.text = [[NSUserDefaults standardUserDefaults] valueForKey: COMMONS_LICENSE_KEY];
3744
3845 }
3946
——@@ -90,18 +97,124 @@
9198 [super dealloc];
9299 }
93100
 101+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField {
 102+ // Show UIPickerView
 103+ if( textField == license ) {
 104+ [self pickLicensePicker:textField];
 105+ return NO;
 106+ }
 107+ return YES;
 108+}
94109
95 --(IBAction)textFieldDidEnd:(id)sender {
 110+- (IBAction)textFieldDidEnd:(id)sender {
96111 if(sender == username ) {
97112 [password becomeFirstResponder];
98113 return;
 114+ } else if (sender == license) {
 115+ [self dismissLicensePicker:sender];
99116 }
100117 [sender resignFirstResponder];
101118 }
102119
103 --(IBAction)saveAction:(id)sender {
 120+- (IBAction)saveAction:(id)sender {
104121 /* Return to Primary view */
105122 [self.navigationController popViewControllerAnimated:YES];
106123 }
107124
 125+- (IBAction) pickLicensePicker:(id)sender{
 126+ navItem.title = NSLocalizedString( @"License", @"Title for the license picker" );
 127+ dismissButton.title = NSLocalizedString( @"Select", "Title for the select button in license picker" );
 128+ dismissButton.target = self;
 129+ dismissButton.action = @selector( dismissLicensePicker: );
 130+
 131+ /* Select the row that is selected by default atm */
 132+ //[pickerControl selectRow: 0 inComponent: 0 animated: NO];
 133+
 134+ // Slide picker view in
 135+ [self popupView: pickerView];
 136+
 137+}
 138+
 139+
 140+- (IBAction) dismissLicensePicker: (id) sender
 141+{
 142+ // Get the data we need
 143+ [self popdownView: pickerView];
 144+}
 145+
 146+
 147+#pragma mark Helper functions to pop up a view
 148+- (void)popupView: (UIView *)popupView
 149+{
 150+ CGRect settingsFrame = self.view.frame;
 151+
 152+ // Move view under the screen
 153+ popupView.frame = CGRectMake(popupView.frame.origin.x,
 154+ settingsFrame.size.height,
 155+ popupView.frame.size.width,
 156+ popupView.frame.size.height);
 157+ // Add view as subview
 158+ [self.view addSubview: popupView];
 159+
 160+ // Animate view slide (as keyboard shows)
 161+
 162+ [UIView beginAnimations: @"addPopupView" context: popupView];
 163+
 164+ [UIView setAnimationDuration: 0.3];
 165+ [UIView setAnimationDelegate: self];
 166+ [UIView setAnimationDidStopSelector: @selector(animationDidStop: finished: context:)];
 167+
 168+ popupView.frame = CGRectMake(popupView.frame.origin.x,
 169+ settingsFrame.size.height - popupView.frame.size.height,
 170+ popupView.frame.size.width,
 171+ popupView.frame.size.height);
 172+
 173+ [UIView commitAnimations];
 174+}
 175+
 176+
 177+- (void)popdownView: (UIView *)popupView
 178+{
 179+ [UIView beginAnimations: @"removePopupView" context: popupView];
 180+
 181+ [UIView setAnimationDuration: 0.3];
 182+ [UIView setAnimationDelegate: self];
 183+ [UIView setAnimationDidStopSelector: @selector(animationDidStop: finished: context:)];
 184+
 185+ popupView.frame = CGRectMake(popupView.frame.origin.x,
 186+ popupView.frame.origin.y + popupView.frame.size.height,
 187+ popupView.frame.size.width,
 188+ popupView.frame.size.height);
 189+
 190+ [UIView commitAnimations];
 191+}
 192+
 193+
 194+#pragma mark UIPickerViewDelegate
 195+
 196+- (NSString*)pickerView: (UIPickerView *)pickerView
 197+ titleForRow: (NSInteger)row
 198+ forComponent: (NSInteger)component
 199+{
 200+ return [NSString stringWithFormat: @"TEST %d" ];
 201+ return @"";
 202+}
 203+
 204+
 205+
 206+#pragma mark UIPickerViewDataSource
 207+
 208+- (NSInteger)numberOfComponentsInPickerView: (UIPickerView *)pickerView
 209+{
 210+ return 1;
 211+}
 212+
 213+
 214+- (NSInteger)pickerView: (UIPickerView *)pickerView numberOfRowsInComponent: (NSInteger)component
 215+{
 216+ NSInteger numberOfRows = 1;
 217+
 218+ return numberOfRows;
 219+}
 220+
108221 @end
Index: trunk/tools/WikiSnaps/Classes/Configuration.h
——@@ -11,6 +11,7 @@
1212
1313 // Keys for preferences
1414 #define COMMONS_USERNAME_KEY @"CommonsUsernameKey"
 15+#define COMMONS_LICENSE_KEY @"CommonsLicenseKey"
1516 // FIXME insecure
1617 #define COMMONS_PASSWORD_KEY @"CommonsPasswordKey"
1718
Index: trunk/tools/WikiSnaps/MainWindow.xib
——@@ -40,15 +40,6 @@
4141 <object class="IBUICustomObject" id="664661524">
4242 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
4343 </object>
44 - <object class="IBUIViewController" id="943309135">
45 - <string key="IBUINibName">PhotoPickerViewController</string>
46 - <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
47 - <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
48 - <int key="interfaceOrientation">1</int>
49 - </object>
50 - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
51 - <bool key="IBUIHorizontal">NO</bool>
52 - </object>
5344 <object class="IBUIWindow" id="117978783">
5445 <nil key="NSNextResponder"/>
5546 <int key="NSvFlags">292</int>
——@@ -110,14 +101,6 @@
111102 </object>
112103 <object class="IBConnectionRecord">
113104 <object class="IBCocoaTouchOutletConnection" key="connection">
114 - <string key="label">viewController</string>
115 - <reference key="source" ref="664661524"/>
116 - <reference key="destination" ref="943309135"/>
117 - </object>
118 - <int key="connectionID">11</int>
119 - </object>
120 - <object class="IBConnectionRecord">
121 - <object class="IBCocoaTouchOutletConnection" key="connection">
122105 <string key="label">window</string>
123106 <reference key="source" ref="664661524"/>
124107 <reference key="destination" ref="117978783"/>
——@@ -168,11 +151,6 @@
169152 <reference key="parent" ref="0"/>
170153 </object>
171154 <object class="IBObjectRecord">
172 - <int key="objectID">10</int>
173 - <reference key="object" ref="943309135"/>
174 - <reference key="parent" ref="0"/>
175 - </object>
176 - <object class="IBObjectRecord">
177155 <int key="objectID">12</int>
178156 <reference key="object" ref="117978783"/>
179157 <reference key="parent" ref="0"/>
——@@ -217,9 +195,6 @@
218196 <bool key="EncodedWithXMLCoder">YES</bool>
219197 <string>-1.CustomClassName</string>
220198 <string>-2.CustomClassName</string>
221 - <string>10.CustomClassName</string>
222 - <string>10.IBEditorWindowLastContentRect</string>
223 - <string>10.IBPluginDependency</string>
224199 <string>12.IBEditorWindowLastContentRect</string>
225200 <string>12.IBPluginDependency</string>
226201 <string>15.IBEditorWindowLastContentRect</string>
——@@ -235,9 +210,6 @@
236211 <bool key="EncodedWithXMLCoder">YES</bool>
237212 <string>UIApplication</string>
238213 <string>UIResponder</string>
239 - <string>PhotoPickerViewController</string>
240 - <string>{{512, 351}, {320, 480}}</string>
241 - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
242214 <string>{{525, 346}, {320, 480}}</string>
243215 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
244216 <string>{{577, 526}, {320, 480}}</string>
——@@ -327,16 +299,16 @@
328300 </object>
329301 </object>
330302 <object class="IBPartialClassDescription">
331 - <string key="className">PhotoPickerViewController</string>
332 - <string key="superclassName">UIViewController</string>
 303+ <string key="className">SourcePickerViewController</string>
 304+ <string key="superclassName">UITableViewController</string>
333305 <object class="NSMutableDictionary" key="actions">
334306 <bool key="EncodedWithXMLCoder">YES</bool>
335307 <object class="NSArray" key="dict.sortedKeys">
336308 <bool key="EncodedWithXMLCoder">YES</bool>
337 - <string>onCameraClicked</string>
338 - <string>onCancelUploadClicked</string>
339 - <string>onPhotoLibraryClicked</string>
340 - <string>onSettingsClicked</string>
 309+ <string>infoPressed:</string>
 310+ <string>onCameraClicked:</string>
 311+ <string>onPhotoLibraryClicked:</string>
 312+ <string>settingsPressed:</string>
341313 </object>
342314 <object class="NSMutableArray" key="dict.values">
343315 <bool key="EncodedWithXMLCoder">YES</bool>
——@@ -350,119 +322,26 @@
351323 <bool key="EncodedWithXMLCoder">YES</bool>
352324 <object class="NSArray" key="dict.sortedKeys">
353325 <bool key="EncodedWithXMLCoder">YES</bool>
354 - <string>onCameraClicked</string>
355 - <string>onCancelUploadClicked</string>
356 - <string>onPhotoLibraryClicked</string>
357 - <string>onSettingsClicked</string>
 326+ <string>infoPressed:</string>
 327+ <string>onCameraClicked:</string>
 328+ <string>onPhotoLibraryClicked:</string>
 329+ <string>settingsPressed:</string>
358330 </object>
359331 <object class="NSMutableArray" key="dict.values">
360332 <bool key="EncodedWithXMLCoder">YES</bool>
361333 <object class="IBActionInfo">
362 - <string key="name">onCameraClicked</string>
 334+ <string key="name">infoPressed:</string>
363335 <string key="candidateClassName">id</string>
364336 </object>
365337 <object class="IBActionInfo">
366 - <string key="name">onCancelUploadClicked</string>
 338+ <string key="name">onCameraClicked:</string>
367339 <string key="candidateClassName">id</string>
368340 </object>
369341 <object class="IBActionInfo">
370 - <string key="name">onPhotoLibraryClicked</string>
 342+ <string key="name">onPhotoLibraryClicked:</string>
371343 <string key="candidateClassName">id</string>
372344 </object>
373345 <object class="IBActionInfo">
374 - <string key="name">onSettingsClicked</string>
375 - <string key="candidateClassName">id</string>
376 - </object>
377 - </object>
378 - </object>
379 - <object class="NSMutableDictionary" key="outlets">
380 - <bool key="EncodedWithXMLCoder">YES</bool>
381 - <object class="NSArray" key="dict.sortedKeys">
382 - <bool key="EncodedWithXMLCoder">YES</bool>
383 - <string>takePhotoButton</string>
384 - <string>uploadOverlayImage</string>
385 - <string>uploadPhotoOverlay</string>
386 - <string>uploadProgress</string>
387 - <string>uploadProgressMessage</string>
388 - </object>
389 - <object class="NSMutableArray" key="dict.values">
390 - <bool key="EncodedWithXMLCoder">YES</bool>
391 - <string>UIButton</string>
392 - <string>UIImageView</string>
393 - <string>UIView</string>
394 - <string>UIProgressView</string>
395 - <string>UILabel</string>
396 - </object>
397 - </object>
398 - <object class="NSMutableDictionary" key="toOneOutletInfosByName">
399 - <bool key="EncodedWithXMLCoder">YES</bool>
400 - <object class="NSArray" key="dict.sortedKeys">
401 - <bool key="EncodedWithXMLCoder">YES</bool>
402 - <string>takePhotoButton</string>
403 - <string>uploadOverlayImage</string>
404 - <string>uploadPhotoOverlay</string>
405 - <string>uploadProgress</string>
406 - <string>uploadProgressMessage</string>
407 - </object>
408 - <object class="NSMutableArray" key="dict.values">
409 - <bool key="EncodedWithXMLCoder">YES</bool>
410 - <object class="IBToOneOutletInfo">
411 - <string key="name">takePhotoButton</string>
412 - <string key="candidateClassName">UIButton</string>
413 - </object>
414 - <object class="IBToOneOutletInfo">
415 - <string key="name">uploadOverlayImage</string>
416 - <string key="candidateClassName">UIImageView</string>
417 - </object>
418 - <object class="IBToOneOutletInfo">
419 - <string key="name">uploadPhotoOverlay</string>
420 - <string key="candidateClassName">UIView</string>
421 - </object>
422 - <object class="IBToOneOutletInfo">
423 - <string key="name">uploadProgress</string>
424 - <string key="candidateClassName">UIProgressView</string>
425 - </object>
426 - <object class="IBToOneOutletInfo">
427 - <string key="name">uploadProgressMessage</string>
428 - <string key="candidateClassName">UILabel</string>
429 - </object>
430 - </object>
431 - </object>
432 - <object class="IBClassDescriptionSource" key="sourceIdentifier">
433 - <string key="majorKey">IBProjectSource</string>
434 - <string key="minorKey">Classes/PhotoPickerViewController.h</string>
435 - </object>
436 - </object>
437 - <object class="IBPartialClassDescription">
438 - <string key="className">SourcePickerViewController</string>
439 - <string key="superclassName">UITableViewController</string>
440 - <object class="NSMutableDictionary" key="actions">
441 - <bool key="EncodedWithXMLCoder">YES</bool>
442 - <object class="NSArray" key="dict.sortedKeys">
443 - <bool key="EncodedWithXMLCoder">YES</bool>
444 - <string>infoPressed:</string>
445 - <string>settingsPressed:</string>
446 - </object>
447 - <object class="NSMutableArray" key="dict.values">
448 - <bool key="EncodedWithXMLCoder">YES</bool>
449 - <string>id</string>
450 - <string>id</string>
451 - </object>
452 - </object>
453 - <object class="NSMutableDictionary" key="actionInfosByName">
454 - <bool key="EncodedWithXMLCoder">YES</bool>
455 - <object class="NSArray" key="dict.sortedKeys">
456 - <bool key="EncodedWithXMLCoder">YES</bool>
457 - <string>infoPressed:</string>
458 - <string>settingsPressed:</string>
459 - </object>
460 - <object class="NSMutableArray" key="dict.values">
461 - <bool key="EncodedWithXMLCoder">YES</bool>
462 - <object class="IBActionInfo">
463 - <string key="name">infoPressed:</string>
464 - <string key="candidateClassName">id</string>
465 - </object>
466 - <object class="IBActionInfo">
467346 <string key="name">settingsPressed:</string>
468347 <string key="candidateClassName">id</string>
469348 </object>
——@@ -592,38 +471,6 @@
593472 </object>
594473 </object>
595474 <object class="IBPartialClassDescription">
596 - <string key="className">UIButton</string>
597 - <string key="superclassName">UIControl</string>
598 - <object class="IBClassDescriptionSource" key="sourceIdentifier">
599 - <string key="majorKey">IBFrameworkSource</string>
600 - <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
601 - </object>
602 - </object>
603 - <object class="IBPartialClassDescription">
604 - <string key="className">UIControl</string>
605 - <string key="superclassName">UIView</string>
606 - <object class="IBClassDescriptionSource" key="sourceIdentifier">
607 - <string key="majorKey">IBFrameworkSource</string>
608 - <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
609 - </object>
610 - </object>
611 - <object class="IBPartialClassDescription">
612 - <string key="className">UIImageView</string>
613 - <string key="superclassName">UIView</string>
614 - <object class="IBClassDescriptionSource" key="sourceIdentifier">
615 - <string key="majorKey">IBFrameworkSource</string>
616 - <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
617 - </object>
618 - </object>
619 - <object class="IBPartialClassDescription">
620 - <string key="className">UILabel</string>
621 - <string key="superclassName">UIView</string>
622 - <object class="IBClassDescriptionSource" key="sourceIdentifier">
623 - <string key="majorKey">IBFrameworkSource</string>
624 - <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
625 - </object>
626 - </object>
627 - <object class="IBPartialClassDescription">
628475 <string key="className">UINavigationBar</string>
629476 <string key="superclassName">UIView</string>
630477 <object class="IBClassDescriptionSource" key="sourceIdentifier" id="531943622">
——@@ -645,14 +492,6 @@
646493 <reference key="sourceIdentifier" ref="531943622"/>
647494 </object>
648495 <object class="IBPartialClassDescription">
649 - <string key="className">UIProgressView</string>
650 - <string key="superclassName">UIView</string>
651 - <object class="IBClassDescriptionSource" key="sourceIdentifier">
652 - <string key="majorKey">IBFrameworkSource</string>
653 - <string key="minorKey">UIKit.framework/Headers/UIProgressView.h</string>
654 - </object>
655 - </object>
656 - <object class="IBPartialClassDescription">
657496 <string key="className">UIResponder</string>
658497 <string key="superclassName">NSObject</string>
659498 <reference key="sourceIdentifier" ref="883757416"/>
Index: trunk/tools/WikiSnaps/ImageUploadViewController.xib
——@@ -62,7 +62,7 @@
6363 </object>
6464 <object class="IBUIImageView" id="182060304">
6565 <reference key="NSNextResponder" ref="1015022196"/>
66 - <int key="NSvFlags">292</int>
 66+ <int key="NSvFlags">288</int>
6767 <string key="NSFrame">{{20, 64}, {279, 310}}</string>
6868 <reference key="NSSuperview" ref="1015022196"/>
6969 <bool key="IBUIOpaque">NO</bool>
——@@ -73,7 +73,7 @@
7474 </object>
7575 <object class="IBUIButton" id="860458292">
7676 <reference key="NSNextResponder" ref="1015022196"/>
77 - <int key="NSvFlags">292</int>
 77+ <int key="NSvFlags">288</int>
7878 <string key="NSFrame">{{21, 394}, {278, 46}}</string>
7979 <reference key="NSSuperview" ref="1015022196"/>
8080 <bool key="IBUIOpaque">NO</bool>
——@@ -109,7 +109,7 @@
110110 </object>
111111 <object class="IBUIProgressView" id="413664359">
112112 <reference key="NSNextResponder" ref="1015022196"/>
113 - <int key="NSvFlags">292</int>
 113+ <int key="NSvFlags">288</int>
114114 <string key="NSFrame">{{78, 26}, {164, 11}}</string>
115115 <reference key="NSSuperview" ref="1015022196"/>
116116 <bool key="IBUIOpaque">NO</bool>
——@@ -121,7 +121,7 @@
122122 </object>
123123 <object class="IBUILabel" id="329379503">
124124 <reference key="NSNextResponder" ref="1015022196"/>
125 - <int key="NSvFlags">292</int>
 125+ <int key="NSvFlags">288</int>
126126 <string key="NSFrameSize">{320, 23}</string>
127127 <reference key="NSSuperview" ref="1015022196"/>
128128 <bool key="IBUIOpaque">NO</bool>
——@@ -648,7 +648,7 @@
649649 <integer value="3000" key="NS.object.0"/>
650650 </object>
651651 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
652 - <string key="IBDocument.LastKnownRelativeProjectPath">../WikiSnaps.xcodeproj</string>
 652+ <string key="IBDocument.LastKnownRelativeProjectPath">WikiSnaps.xcodeproj</string>
653653 <int key="IBDocument.defaultPropertyAccessControl">3</int>
654654 <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
655655 <bool key="EncodedWithXMLCoder">YES</bool>
Index: trunk/tools/WikiSnaps/ImageDetailsViewController.xib
——@@ -44,7 +44,7 @@
4545 <bool key="EncodedWithXMLCoder">YES</bool>
4646 <object class="IBUITextField" id="717110592">
4747 <reference key="NSNextResponder" ref="191373211"/>
48 - <int key="NSvFlags">292</int>
 48+ <int key="NSvFlags">288</int>
4949 <string key="NSFrame">{{20, 20}, {280, 31}}</string>
5050 <reference key="NSSuperview" ref="191373211"/>
5151 <bool key="IBUIOpaque">NO</bool>
——@@ -69,7 +69,7 @@
7070 </object>
7171 <object class="IBUITextView" id="786444300">
7272 <reference key="NSNextResponder" ref="191373211"/>
73 - <int key="NSvFlags">292</int>
 73+ <int key="NSvFlags">288</int>
7474 <string key="NSFrame">{{20, 84}, {280, 142}}</string>
7575 <reference key="NSSuperview" ref="191373211"/>
7676 <object class="NSColor" key="IBUIBackgroundColor">
——@@ -88,8 +88,8 @@
8989 </object>
9090 <object class="IBUILabel" id="995657542">
9191 <reference key="NSNextResponder" ref="191373211"/>
92 - <int key="NSvFlags">292</int>
93 - <string key="NSFrame">{{20, 59}, {86, 21}}</string>
 92+ <int key="NSvFlags">288</int>
 93+ <string key="NSFrame">{{20, 59}, {280, 21}}</string>
9494 <reference key="NSSuperview" ref="191373211"/>
9595 <bool key="IBUIOpaque">NO</bool>
9696 <bool key="IBUIClipsSubviews">YES</bool>
——@@ -193,6 +193,15 @@
194194 </object>
195195 <int key="connectionID">13</int>
196196 </object>
 197+ <object class="IBConnectionRecord">
 198+ <object class="IBCocoaTouchEventConnection" key="connection">
 199+ <string key="label">textFieldDidEnd:</string>
 200+ <reference key="source" ref="717110592"/>
 201+ <reference key="destination" ref="372490531"/>
 202+ <int key="IBEventType">20</int>
 203+ </object>
 204+ <int key="connectionID">17</int>
 205+ </object>
197206 </object>
198207 <object class="IBMutableOrderedSet" key="objectRecords">
199208 <object class="NSArray" key="orderedObjects">
——@@ -289,7 +298,7 @@
290299 </object>
291300 </object>
292301 <nil key="sourceID"/>
293 - <int key="maxID">15</int>
 302+ <int key="maxID">17</int>
294303 </object>
295304 <object class="IBClassDescriber" key="IBDocument.Classes">
296305 <object class="NSMutableArray" key="referencedPartialClassDescriptions">
——@@ -589,7 +598,7 @@
590599 <integer value="3000" key="NS.object.0"/>
591600 </object>
592601 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
593 - <string key="IBDocument.LastKnownRelativeProjectPath">../photopicker.xcodeproj</string>
 602+ <string key="IBDocument.LastKnownRelativeProjectPath">WikiSnaps.xcodeproj</string>
594603 <int key="IBDocument.defaultPropertyAccessControl">3</int>
595604 <string key="IBCocoaTouchPluginVersion">132</string>
596605 </data>

Status & tagging log