It works! :)

diff --git a/English.lproj/NotiPod.xib b/English.lproj/NotiPod.xib
index b1b20bfd73f551e358a35f1c44f424a95fb81b8b..7e0f0f3228242b4ce753483c452c559d331580da 100644 (file)
--- a/English.lproj/NotiPod.xib
+++ b/English.lproj/NotiPod.xib
@@ -8,8 +8,10 @@
                <string key="IBDocument.HIToolboxVersion">461.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="372"/>
                        <integer value="29"/>
+                       <integer value="372"/>
+                       <integer value="428"/>
+                       <integer value="503"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -343,21 +345,21 @@
                                                                <reference key="NSTextColor" ref="888276067"/>
                                                        </object>
                                                </object>
-                                               <object class="NSScrollView" id="153822869">
+                                               <object class="NSScrollView" id="186167268">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">268</int>
                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                               <object class="NSClipView" id="593099093">
-                                                                       <reference key="NSNextResponder" ref="153822869"/>
+                                                               <object class="NSClipView" id="397930844">
+                                                                       <reference key="NSNextResponder" ref="186167268"/>
                                                                        <int key="NSvFlags">2304</int>
                                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                               <object class="NSOutlineView" id="1032464155">
-                                                                                       <reference key="NSNextResponder" ref="593099093"/>
+                                                                               <object class="NSOutlineView" id="1001442506">
+                                                                                       <reference key="NSNextResponder" ref="397930844"/>
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrameSize">{327, 338}</string>
-                                                                                       <reference key="NSSuperview" ref="593099093"/>
+                                                                                       <reference key="NSSuperview" ref="397930844"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="_NSCornerView" key="NSCornerView">
                                                                                                <nil key="NSNextResponder"/>
@@ -366,7 +368,7 @@
                                                                                        </object>
                                                                                        <object class="NSMutableArray" key="NSTableColumns">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                               <object class="NSTableColumn" id="428715212">
+                                                                                               <object class="NSTableColumn" id="685692152">
                                                                                                        <string key="NSIdentifier">selected</string>
                                                                                                        <double key="NSWidth">4.000000e+01</double>
                                                                                                        <double key="NSMinWidth">1.600000e+01</double>
@@ -384,19 +386,19 @@
                                                                                                                        <int key="NSColorSpace">3</int>
                                                                                                                        <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
                                                                                                                </object>
-                                                                                                               <object class="NSColor" key="NSTextColor" id="1008090455">
+                                                                                                               <object class="NSColor" key="NSTextColor" id="121437991">
                                                                                                                        <int key="NSColorSpace">6</int>
                                                                                                                        <string key="NSCatalogName">System</string>
                                                                                                                        <string key="NSColorName">headerTextColor</string>
                                                                                                                        <reference key="NSColor" ref="495955423"/>
                                                                                                                </object>
                                                                                                        </object>
-                                                                                                       <object class="NSButtonCell" key="NSDataCell" id="824905231">
+                                                                                                       <object class="NSButtonCell" key="NSDataCell" id="269710851">
                                                                                                                <int key="NSCellFlags">67239424</int>
                                                                                                                <int key="NSCellFlags2">131072</int>
                                                                                                                <string key="NSContents"/>
                                                                                                                <reference key="NSSupport" ref="26"/>
-                                                                                                               <reference key="NSControlView" ref="1032464155"/>
+                                                                                                               <reference key="NSControlView" ref="1001442506"/>
                                                                                                                <int key="NSButtonFlags">1211912703</int>
                                                                                                                <int key="NSButtonFlags2">130</int>
                                                                                                                <object class="NSCustomResource" key="NSNormalImage">
@@ -414,9 +416,9 @@
                                                                                                        <int key="NSResizingMask">1</int>
                                                                                                        <bool key="NSIsResizeable">YES</bool>
                                                                                                        <bool key="NSIsEditable">YES</bool>
-                                                                                                       <reference key="NSTableView" ref="1032464155"/>
+                                                                                                       <reference key="NSTableView" ref="1001442506"/>
                                                                                                </object>
-                                                                                               <object class="NSTableColumn" id="403831249">
+                                                                                               <object class="NSTableColumn" id="724891593">
                                                                                                        <string key="NSIdentifier">playlist</string>
                                                                                                        <double key="NSWidth">2.810000e+02</double>
                                                                                                        <double key="NSMinWidth">1.000000e+01</double>
@@ -435,14 +437,14 @@
                                                                                                                                <bytes key="NSWhite">MQA</bytes>
                                                                                                                        </object>
                                                                                                                </object>
-                                                                                                               <reference key="NSTextColor" ref="1008090455"/>
+                                                                                                               <reference key="NSTextColor" ref="121437991"/>
                                                                                                        </object>
-                                                                                                       <object class="NSTextFieldCell" key="NSDataCell" id="825348797">
+                                                                                                       <object class="NSTextFieldCell" key="NSDataCell" id="590433265">
                                                                                                                <int key="NSCellFlags">337772096</int>
                                                                                                                <int key="NSCellFlags2">2048</int>
                                                                                                                <string key="NSContents"/>
                                                                                                                <reference key="NSSupport" ref="822023840"/>
-                                                                                                               <reference key="NSControlView" ref="1032464155"/>
+                                                                                                               <reference key="NSControlView" ref="1001442506"/>
                                                                                                                <object class="NSColor" key="NSBackgroundColor" id="928689894">
                                                                                                                        <int key="NSColorSpace">6</int>
                                                                                                                        <string key="NSCatalogName">System</string>
@@ -453,7 +455,7 @@
                                                                                                        </object>
                                                                                                        <int key="NSResizingMask">1</int>
                                                                                                        <bool key="NSIsResizeable">YES</bool>
-                                                                                                       <reference key="NSTableView" ref="1032464155"/>
+                                                                                                       <reference key="NSTableView" ref="1001442506"/>
                                                                                                </object>
                                                                                        </object>
                                                                                        <double key="NSIntercellSpacingWidth">3.000000e+00</double>
@@ -478,39 +480,39 @@
                                                                                </object>
                                                                        </object>
                                                                        <string key="NSFrame">{{1, 1}, {327, 338}}</string>
-                                                                       <reference key="NSSuperview" ref="153822869"/>
-                                                                       <reference key="NSNextKeyView" ref="1032464155"/>
-                                                                       <reference key="NSDocView" ref="1032464155"/>
+                                                                       <reference key="NSSuperview" ref="186167268"/>
+                                                                       <reference key="NSNextKeyView" ref="1001442506"/>
+                                                                       <reference key="NSDocView" ref="1001442506"/>
                                                                        <reference key="NSBGColor" ref="928689894"/>
                                                                        <int key="NScvFlags">4</int>
                                                                </object>
-                                                               <object class="NSScroller" id="330926440">
-                                                                       <reference key="NSNextResponder" ref="153822869"/>
+                                                               <object class="NSScroller" id="907655601">
+                                                                       <reference key="NSNextResponder" ref="186167268"/>
                                                                        <int key="NSvFlags">-2147483392</int>
                                                                        <string key="NSFrame">{{313, 1}, {15, 323}}</string>
-                                                                       <reference key="NSSuperview" ref="153822869"/>
-                                                                       <reference key="NSTarget" ref="153822869"/>
+                                                                       <reference key="NSSuperview" ref="186167268"/>
+                                                                       <reference key="NSTarget" ref="186167268"/>
                                                                        <string key="NSAction">_doScroller:</string>
                                                                        <double key="NSPercent">9.970502e-01</double>
                                                                </object>
-                                                               <object class="NSScroller" id="646502877">
-                                                                       <reference key="NSNextResponder" ref="153822869"/>
+                                                               <object class="NSScroller" id="928290431">
+                                                                       <reference key="NSNextResponder" ref="186167268"/>
                                                                        <int key="NSvFlags">-2147483392</int>
                                                                        <string key="NSFrame">{{1, 324}, {327, 15}}</string>
-                                                                       <reference key="NSSuperview" ref="153822869"/>
+                                                                       <reference key="NSSuperview" ref="186167268"/>
                                                                        <int key="NSsFlags">1</int>
-                                                                       <reference key="NSTarget" ref="153822869"/>
+                                                                       <reference key="NSTarget" ref="186167268"/>
                                                                        <string key="NSAction">_doScroller:</string>
                                                                        <double key="NSPercent">9.969512e-01</double>
                                                                </object>
                                                        </object>
                                                        <string key="NSFrame">{{32, 160}, {329, 340}}</string>
                                                        <reference key="NSSuperview" ref="439893737"/>
-                                                       <reference key="NSNextKeyView" ref="593099093"/>
+                                                       <reference key="NSNextKeyView" ref="397930844"/>
                                                        <int key="NSsFlags">562</int>
-                                                       <reference key="NSVScroller" ref="330926440"/>
-                                                       <reference key="NSHScroller" ref="646502877"/>
-                                                       <reference key="NSContentView" ref="593099093"/>
+                                                       <reference key="NSVScroller" ref="907655601"/>
+                                                       <reference key="NSHScroller" ref="928290431"/>
+                                                       <reference key="NSContentView" ref="397930844"/>
                                                        <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
                                                </object>
                                        </object>
@@ -533,7 +535,7 @@
                                <nil key="NSViewClass"/>
                                <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
                                <object class="NSView" key="NSWindowView" id="851027294">
-                                       <nil key="NSNextResponder"/>
+                                       <reference key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
                                        <object class="NSMutableArray" key="NSSubviews">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -565,16 +567,63 @@
                                                </object>
                                        </object>
                                        <string key="NSFrameSize">{204, 74}</string>
+                                       <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1024, 746}}</string>
                                <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
                        </object>
-                       <object class="NSCustomObject" id="792415288">
+                       <object class="NSCustomObject" id="704797183">
                                <string key="NSClassName">PlaylistModel</string>
                        </object>
-                       <object class="NSCustomObject" id="236606853">
+                       <object class="NSCustomObject" id="742491374">
                                <string key="NSClassName">FolderModel</string>
                        </object>
+                       <object class="NSWindowTemplate" id="402449766">
+                               <int key="NSWindowStyleMask">15</int>
+                               <int key="NSWindowBacking">2</int>
+                               <string key="NSWindowRect">{{196, 429}, {279, 81}}</string>
+                               <int key="NSWTFlags">603979776</int>
+                               <string key="NSWindowTitle">Synchronising</string>
+                               <string key="NSWindowClass">NSWindow</string>
+                               <nil key="NSViewClass"/>
+                               <object class="NSView" key="NSWindowView" id="940630610">
+                                       <reference key="NSNextResponder"/>
+                                       <int key="NSvFlags">256</int>
+                                       <object class="NSMutableArray" key="NSSubviews">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSTextField" id="718745198">
+                                                       <reference key="NSNextResponder" ref="940630610"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{17, 44}, {245, 17}}</string>
+                                                       <reference key="NSSuperview" ref="940630610"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="354903640">
+                                                               <int key="NSCellFlags">68288064</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents">Synchronising.. This may take a while.</string>
+                                                               <reference key="NSSupport" ref="822023840"/>
+                                                               <reference key="NSControlView" ref="718745198"/>
+                                                               <reference key="NSBackgroundColor" ref="439689891"/>
+                                                               <reference key="NSTextColor" ref="888276067"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSProgressIndicator" id="33995010">
+                                                       <reference key="NSNextResponder" ref="940630610"/>
+                                                       <int key="NSvFlags">1292</int>
+                                                       <object class="NSPSMatrix" key="NSDrawMatrix"/>
+                                                       <string key="NSFrame">{{18, 16}, {243, 20}}</string>
+                                                       <reference key="NSSuperview" ref="940630610"/>
+                                                       <int key="NSpiFlags">16394</int>
+                                                       <double key="NSMinValue">2.000000e+01</double>
+                                                       <double key="NSMaxValue">1.000000e+02</double>
+                                               </object>
+                                       </object>
+                                       <string key="NSFrameSize">{279, 81}</string>
+                                       <reference key="NSSuperview"/>
+                               </object>
+                               <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
+                               <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+                       </object>
                </object>
                <object class="IBObjectContainer" key="IBDocument.Objects">
                        <object class="NSMutableArray" key="connectionRecords">
@@ -638,15 +687,15 @@
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">outlineView</string>
-                                               <reference key="source" ref="792415288"/>
-                                               <reference key="destination" ref="1032464155"/>
+                                               <reference key="source" ref="704797183"/>
+                                               <reference key="destination" ref="1001442506"/>
                                        </object>
                                        <int key="connectionID">478</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">folderPopup</string>
-                                               <reference key="source" ref="236606853"/>
+                                               <reference key="source" ref="742491374"/>
                                                <reference key="destination" ref="997567970"/>
                                        </object>
                                        <int key="connectionID">493</int>
@@ -654,7 +703,7 @@
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">doSelectFolder:</string>
-                                               <reference key="source" ref="236606853"/>
+                                               <reference key="source" ref="742491374"/>
                                                <reference key="destination" ref="997567970"/>
                                        </object>
                                        <int key="connectionID">495</int>
@@ -662,7 +711,7 @@
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">window</string>
-                                               <reference key="source" ref="236606853"/>
+                                               <reference key="source" ref="742491374"/>
                                                <reference key="destination" ref="972006081"/>
                                        </object>
                                        <int key="connectionID">496</int>
@@ -679,7 +728,7 @@
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">playlistModel</string>
                                                <reference key="source" ref="719278169"/>
-                                               <reference key="destination" ref="792415288"/>
+                                               <reference key="destination" ref="704797183"/>
                                        </object>
                                        <int key="connectionID">498</int>
                                </object>
@@ -687,7 +736,7 @@
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">folderModel</string>
                                                <reference key="source" ref="719278169"/>
-                                               <reference key="destination" ref="236606853"/>
+                                               <reference key="destination" ref="742491374"/>
                                        </object>
                                        <int key="connectionID">499</int>
                                </object>
@@ -707,6 +756,14 @@
                                        </object>
                                        <int key="connectionID">501</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">synchronizingSheet</string>
+                                               <reference key="source" ref="719278169"/>
+                                               <reference key="destination" ref="402449766"/>
+                                       </object>
+                                       <int key="connectionID">508</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -870,7 +927,7 @@
                                                        <reference ref="818249148"/>
                                                        <reference ref="323617138"/>
                                                        <reference ref="703636579"/>
-                                                       <reference ref="153822869"/>
+                                                       <reference ref="186167268"/>
                                                        <reference ref="524945726"/>
                                                        <reference ref="997567970"/>
                                                </object>
@@ -965,7 +1022,7 @@
                                                        <reference ref="851027294"/>
                                                </object>
                                                <reference key="parent" ref="0"/>
-                                               <string key="objectName">NotiPodLoading</string>
+                                               <string key="objectName">LoadingSheet</string>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">429</int>
@@ -1017,72 +1074,111 @@
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">467</int>
-                                               <reference key="object" ref="153822869"/>
+                                               <reference key="object" ref="186167268"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="330926440"/>
-                                                       <reference ref="646502877"/>
-                                                       <reference ref="1032464155"/>
+                                                       <reference ref="907655601"/>
+                                                       <reference ref="928290431"/>
+                                                       <reference ref="1001442506"/>
                                                </object>
                                                <reference key="parent" ref="439893737"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">468</int>
-                                               <reference key="object" ref="330926440"/>
-                                               <reference key="parent" ref="153822869"/>
+                                               <reference key="object" ref="907655601"/>
+                                               <reference key="parent" ref="186167268"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">469</int>
-                                               <reference key="object" ref="646502877"/>
-                                               <reference key="parent" ref="153822869"/>
+                                               <reference key="object" ref="928290431"/>
+                                               <reference key="parent" ref="186167268"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">470</int>
-                                               <reference key="object" ref="1032464155"/>
+                                               <reference key="object" ref="1001442506"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="428715212"/>
-                                                       <reference ref="403831249"/>
+                                                       <reference ref="685692152"/>
+                                                       <reference ref="724891593"/>
                                                </object>
-                                               <reference key="parent" ref="153822869"/>
+                                               <reference key="parent" ref="186167268"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">472</int>
-                                               <reference key="object" ref="428715212"/>
+                                               <reference key="object" ref="685692152"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="824905231"/>
+                                                       <reference ref="269710851"/>
                                                </object>
-                                               <reference key="parent" ref="1032464155"/>
+                                               <reference key="parent" ref="1001442506"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">477</int>
-                                               <reference key="object" ref="792415288"/>
+                                               <reference key="object" ref="704797183"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">484</int>
-                                               <reference key="object" ref="824905231"/>
-                                               <reference key="parent" ref="428715212"/>
+                                               <reference key="object" ref="269710851"/>
+                                               <reference key="parent" ref="685692152"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">485</int>
-                                               <reference key="object" ref="403831249"/>
+                                               <reference key="object" ref="724891593"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="825348797"/>
+                                                       <reference ref="590433265"/>
                                                </object>
-                                               <reference key="parent" ref="1032464155"/>
+                                               <reference key="parent" ref="1001442506"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">486</int>
-                                               <reference key="object" ref="825348797"/>
-                                               <reference key="parent" ref="403831249"/>
+                                               <reference key="object" ref="590433265"/>
+                                               <reference key="parent" ref="724891593"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">490</int>
-                                               <reference key="object" ref="236606853"/>
+                                               <reference key="object" ref="742491374"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">503</int>
+                                               <reference key="object" ref="402449766"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="940630610"/>
+                                               </object>
                                                <reference key="parent" ref="0"/>
+                                               <string key="objectName">SynchronizingSheet</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">504</int>
+                                               <reference key="object" ref="940630610"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="718745198"/>
+                                                       <reference ref="33995010"/>
+                                               </object>
+                                               <reference key="parent" ref="402449766"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">505</int>
+                                               <reference key="object" ref="718745198"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="354903640"/>
+                                               </object>
+                                               <reference key="parent" ref="940630610"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">506</int>
+                                               <reference key="object" ref="354903640"/>
+                                               <reference key="parent" ref="718745198"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">507</int>
+                                               <reference key="object" ref="33995010"/>
+                                               <reference key="parent" ref="940630610"/>
                                        </object>
                                </object>
                        </object>
@@ -1095,6 +1191,7 @@
                                        <string>-3.IBPluginDependency</string>
                                        <string>103.IBPluginDependency</string>
                                        <string>103.ImportedFromIB2</string>
+                                       <string>106.IBEditorWindowLastContentRect</string>
                                        <string>106.IBPluginDependency</string>
                                        <string>106.ImportedFromIB2</string>
                                        <string>106.editorWindowContentRectSynchronizationRect</string>
@@ -1160,6 +1257,14 @@
                                        <string>477.IBPluginDependency</string>
                                        <string>484.IBPluginDependency</string>
                                        <string>490.IBPluginDependency</string>
+                                       <string>503.IBEditorWindowLastContentRect</string>
+                                       <string>503.IBPluginDependency</string>
+                                       <string>503.IBWindowTemplateEditedContentRect</string>
+                                       <string>503.NSWindowTemplate.visibleAtLaunch</string>
+                                       <string>504.IBPluginDependency</string>
+                                       <string>505.IBPluginDependency</string>
+                                       <string>506.IBPluginDependency</string>
+                                       <string>507.IBPluginDependency</string>
                                        <string>56.IBPluginDependency</string>
                                        <string>56.ImportedFromIB2</string>
                                        <string>57.IBPluginDependency</string>
@@ -1175,6 +1280,7 @@
                                        <string>com.apple.InterfaceBuilderKit</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1" id="9"/>
+                                       <string>{{87, 691}, {163, 23}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>{{98, 681}, {163, 23}}</string>
@@ -1240,6 +1346,14 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{42, 607}, {279, 81}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{42, 607}, {279, 81}}</string>
+                                       <boolean value="YES"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1265,7 +1379,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">502</int>
+                       <int key="maxID">508</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1309,6 +1423,7 @@
                                                        <string>folderModel</string>
                                                        <string>loadingSheet</string>
                                                        <string>playlistModel</string>
+                                                       <string>synchronizingSheet</string>
                                                        <string>window</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
@@ -1317,6 +1432,7 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <reference key="sourceIdentifier" ref="344772374"/>

diff --git a/NotiPod.py b/NotiPod.py
index 610d4059353bc5aacd044bd70b4e0f197fe9baa3..df65459724b4f0a44deaeb8253bd1338498efd8a 100644 (file)
--- a/NotiPod.py
+++ b/NotiPod.py
@@ -71,10 +71,13 @@ class FolderModel(NSObject):
        def awakeFromNib(self):
                self.folderPopup.addItemsWithTitles_(NSApp.delegate().folders())
                self.folderPopup.selectItemAtIndex_(2)
+               self.lastIndex = 2
 
        @objc.IBAction
        def doSelectFolder_(self, sender):
-               if self.folderPopup.indexOfSelectedItem() >= 2:
+               currentIndex = self.folderPopup.indexOfSelectedItem()
+               if currentIndex >= 2:
+                       self.lastIndex = currentIndex
                        NSApp.delegate().addFolder_(self.folderPopup.titleOfSelectedItem())
                        return
                panel = NSOpenPanel.openPanel()
@@ -92,6 +95,8 @@ class FolderModel(NSObject):
                        NSApp.delegate().addFolder_(folder)
                        self.folderPopup.insertItemWithTitle_atIndex_(folder, 2)
                        self.folderPopup.selectItemAtIndex_(2)
+               else:
+                       self.folderPopup.selectItemAtIndex_(self.lastIndex)
 
 
 class NotiPodAppDelegate(NSObject):
@@ -99,6 +104,7 @@ class NotiPodAppDelegate(NSObject):
        playlistModel = objc.IBOutlet()
        folderModel = objc.IBOutlet()
        loadingSheet = objc.IBOutlet()
+       synchronizingSheet = objc.IBOutlet()
 
 
        # Delegate methods
@@ -129,19 +135,31 @@ class NotiPodAppDelegate(NSObject):
 
        @objc.IBAction
        def doSync_(self, sender):
+               NSApp.beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_(self.synchronizingSheet, self.window, None, None, None)
+               self.performSelectorInBackground_withObject_(self.syncFromThread, None)
+
+       def syncFromThread(self):
+               pool = NSAutoreleasePool.alloc().init()
+
                folder = self.folders()[0]
                playlists = [self.library.get_playlist_pid(pid) for pid in self.playlists()]
 
                all_tracks = []
                for playlist in playlists:
-                       print playlist.name, playlist.tracks
                        all_tracks.extend(playlist.tracks)
-                       libsyncitunes.export_m3u(dry_run=True, dest=folder, path_prefix="",
+                       libsyncitunes.export_m3u(dry_run=False, dest=folder, path_prefix="",
                                        playlist_name=playlist.name, files=playlist.tracks)
 
-               libsyncitunes.sync(dry_run=True,
+               libsyncitunes.sync(dry_run=False,
                        source=self.library.folder, dest=folder, files=all_tracks)
 
+               self.performSelectorOnMainThread_withObject_waitUntilDone_(self.finishSync, None, True)
+               del pool
+
+       def finishSync(self):
+               NSApp.endSheet_(self.synchronizingSheet)
+               self.synchronizingSheet.close()
+
 
        # Public accessors
 
@@ -180,8 +198,8 @@ class NotiPodAppDelegate(NSObject):
 
 
 def main():
-       logging.basicConfig(format="%(levelname)s: %(message)s")
-       logging.getLogger().setLevel(logging.DEBUG)
+###    logging.basicConfig(format="%(levelname)s: %(message)s")
+###    logging.getLogger().setLevel(logging.DEBUG)
        AppHelper.runEventLoop()
 
 if __name__ == "__main__":

diff --git a/libsyncitunes.py b/libsyncitunes.py
index e9ed9cd1bf3f5504c55145a249d930b5cf06250a..3bccfec30a9bbe1e4a00d279028ca6a9bddbb02e 100644 (file)
--- a/libsyncitunes.py
+++ b/libsyncitunes.py
@@ -120,10 +120,14 @@ class ITunesLibrary(NSObject):
 def export_m3u(dry_run, dest, path_prefix, playlist_name, files):
        if dry_run:
                return
-       f = open(os.path.join(dest, playlist_name) + ".m3u", "w")
+       playlist_file = os.path.join(dest, playlist_name) + ".m3u"
+       logging.info("Writing: " + playlist_file)
+       f = open(playlist_file, "w")
        for filename in files:
-               filename = filename.replace("/", "\\").encode("utf-8")
-               f.write("%s\\%s\\%s\n" % (path_prefix, filename))
+               if path_prefix.find("\\") > 0:
+                       filename = filename.replace("/", "\\")
+               filename = filename.encode("utf-8")
+               f.write("%s%s\n" % (path_prefix, filename))
        f.close()
 
 def strip_prefix(s, prefix):
@@ -173,7 +177,7 @@ def sync(dry_run, source, dest, files):
                                else:
                                        logging.debug("update: " + filename)
 
-                       elif not filename.startswith("Playlists/"):
+                       elif not filename.endswith(".m3u"):
                                logging.debug("delete: " + filename)
                                if not dry_run:
                                        os.unlink(join(dest, filename))

diff --git a/syncitunes.py b/syncitunes.py
index 16c64bfb6c136e4855e65ce022d6f92393d6c6a6..1de4faea89bc101d8e10b31e5c79631c558361f5 100755 (executable)
--- a/syncitunes.py
+++ b/syncitunes.py
@@ -24,7 +24,7 @@ def parse_options():
        parser.add_option("--itunes-library",
                action="store", dest="itunes_library", default=None)
        parser.add_option("--path-prefix",
-               action="store", dest="path_prefix", default="E:")
+               action="store", dest="path_prefix", default="E:\\")
 
        opts, args = parser.parse_args(sys.argv[1:])
        if len(args) < 2: