It displays stuff

diff --git a/English.lproj/NotiPod.xib b/English.lproj/NotiPod.xib
index 817f2567766d62c922a7870eac12adecd903b683..4ef5559d60e2264426d307bbe5590c8c96727695 100644 (file)
--- a/English.lproj/NotiPod.xib
+++ b/English.lproj/NotiPod.xib
@@ -2,14 +2,14 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">9L30</string>
+               <string key="IBDocument.SystemVersion">10H574</string>
                <string key="IBDocument.InterfaceBuilderVersion">677</string>
-               <string key="IBDocument.AppKitVersion">949.54</string>
-               <string key="IBDocument.HIToolboxVersion">353.00</string>
+               <string key="IBDocument.AppKitVersion">1038.35</string>
+               <string key="IBDocument.HIToolboxVersion">461.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="29"/>
                        <integer value="372"/>
+                       <integer value="29"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -18,7 +18,7 @@
                </object>
                <object class="NSMutableDictionary" key="IBDocument.Metadata">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <object class="NSArray" key="dict.sortedKeys">
+                       <object class="NSArray" key="dict.sortedKeys" id="0">
                                <bool key="EncodedWithXMLCoder">YES</bool>
                        </object>
                        <object class="NSMutableArray" key="dict.values">
@@ -188,7 +188,7 @@
                        <object class="NSWindowTemplate" id="972006081">
                                <int key="NSWindowStyleMask">7</int>
                                <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{335, 417}, {288, 333}}</string>
+                               <string key="NSWindowRect">{{335, 205}, {381, 545}}</string>
                                <int key="NSWTFlags">1946157056</int>
                                <string key="NSWindowTitle">NotiPod</string>
                                <string key="NSWindowClass">NSWindow</string>
@@ -202,7 +202,7 @@
                                                <object class="NSTextField" id="818249148">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 296}, {161, 17}}</string>
+                                                       <string key="NSFrame">{{17, 508}, {161, 17}}</string>
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="574520385">
@@ -221,14 +221,14 @@
                                                                        <string key="NSColorName">controlColor</string>
                                                                        <object class="NSColor" key="NSColor" id="22211674">
                                                                                <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+                                                                               <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
                                                                        </object>
                                                                </object>
                                                                <object class="NSColor" key="NSTextColor" id="888276067">
                                                                        <int key="NSColorSpace">6</int>
                                                                        <string key="NSCatalogName">System</string>
                                                                        <string key="NSColorName">controlTextColor</string>
-                                                                       <object class="NSColor" key="NSColor" id="815326389">
+                                                                       <object class="NSColor" key="NSColor" id="495955423">
                                                                                <int key="NSColorSpace">3</int>
                                                                                <bytes key="NSWhite">MAA</bytes>
                                                                        </object>
@@ -238,7 +238,7 @@
                                                <object class="NSTextField" id="524945726">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 105}, {254, 17}}</string>
+                                                       <string key="NSFrame">{{17, 135}, {254, 17}}</string>
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="959016606">
@@ -254,7 +254,7 @@
                                                <object class="NSButton" id="703636579">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{118, 12}, {120, 32}}</string>
+                                                       <string key="NSFrame">{{26, 12}, {120, 32}}</string>
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSButtonCell" key="NSCell" id="1061036965">
@@ -274,7 +274,7 @@
                                                <object class="NSPopUpButton" id="997567970">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{29, 73}, {206, 26}}</string>
+                                                       <string key="NSFrame">{{29, 103}, {206, 26}}</string>
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSPopUpButtonCell" key="NSCell" id="467826865">
@@ -330,7 +330,7 @@
                                                <object class="NSTextField" id="323617138">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 22}, {105, 17}}</string>
+                                                       <string key="NSFrame">{{17, 52}, {105, 17}}</string>
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="295895067">
@@ -343,67 +343,72 @@
                                                                <reference key="NSTextColor" ref="888276067"/>
                                                        </object>
                                                </object>
-                                               <object class="NSScrollView" id="1066664982">
+                                               <object class="NSScrollView" id="779802593">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">268</int>
                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                               <object class="NSClipView" id="499395455">
-                                                                       <reference key="NSNextResponder" ref="1066664982"/>
+                                                               <object class="NSClipView" id="860102363">
+                                                                       <reference key="NSNextResponder" ref="779802593"/>
                                                                        <int key="NSvFlags">2304</int>
                                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                               <object class="NSOutlineView" id="695882538">
-                                                                                       <reference key="NSNextResponder" ref="499395455"/>
+                                                                               <object class="NSTableView" id="105029809">
+                                                                                       <reference key="NSNextResponder" ref="860102363"/>
                                                                                        <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrameSize">{219, 102}</string>
-                                                                                       <reference key="NSSuperview" ref="499395455"/>
+                                                                                       <string key="NSFrameSize">{312, 304}</string>
+                                                                                       <reference key="NSSuperview" ref="860102363"/>
                                                                                        <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSTableHeaderView" key="NSHeaderView" id="603767070">
-                                                                                               <reference key="NSNextResponder" ref="175727283"/>
+                                                                                       <object class="NSTableHeaderView" key="NSHeaderView" id="800483137">
+                                                                                               <reference key="NSNextResponder" ref="784098487"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrameSize">{219, 17}</string>
-                                                                                               <reference key="NSSuperview" ref="175727283"/>
-                                                                                               <reference key="NSTableView" ref="695882538"/>
+                                                                                               <string key="NSFrameSize">{312, 17}</string>
+                                                                                               <reference key="NSSuperview" ref="784098487"/>
+                                                                                               <reference key="NSTableView" ref="105029809"/>
                                                                                        </object>
-                                                                                       <object class="_NSCornerView" key="NSCornerView" id="389160094">
-                                                                                               <reference key="NSNextResponder" ref="1066664982"/>
+                                                                                       <object class="_NSCornerView" key="NSCornerView" id="510111226">
+                                                                                               <reference key="NSNextResponder" ref="779802593"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{220, 0}, {16, 17}}</string>
-                                                                                               <reference key="NSSuperview" ref="1066664982"/>
+                                                                                               <string key="NSFrame">{{313, 0}, {16, 17}}</string>
+                                                                                               <reference key="NSSuperview" ref="779802593"/>
                                                                                        </object>
                                                                                        <object class="NSMutableArray" key="NSTableColumns">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                               <object class="NSTableColumn" id="888804271">
-                                                                                                       <double key="NSWidth">1.010000e+02</double>
-                                                                                                       <double key="NSMinWidth">1.600000e+01</double>
-                                                                                                       <double key="NSMaxWidth">1.000000e+03</double>
+                                                                                               <object class="NSTableColumn" id="819126432">
+                                                                                                       <double key="NSWidth">6.400000e+01</double>
+                                                                                                       <double key="NSMinWidth">1.000000e+01</double>
+                                                                                                       <double key="NSMaxWidth">3.402823e+38</double>
                                                                                                        <object class="NSTableHeaderCell" key="NSHeaderCell">
                                                                                                                <int key="NSCellFlags">75628032</int>
                                                                                                                <int key="NSCellFlags2">0</int>
-                                                                                                               <string key="NSContents"/>
-                                                                                                               <object class="NSFont" key="NSSupport" id="26">
+                                                                                                               <string key="NSContents">Playlist</string>
+                                                                                                               <object class="NSFont" key="NSSupport">
                                                                                                                        <string key="NSName">LucidaGrande</string>
                                                                                                                        <double key="NSSize">1.100000e+01</double>
                                                                                                                        <int key="NSfFlags">3100</int>
                                                                                                                </object>
-                                                                                                               <object class="NSColor" key="NSBackgroundColor" id="46157304">
-                                                                                                                       <int key="NSColorSpace">3</int>
-                                                                                                                       <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+                                                                                                               <object class="NSColor" key="NSBackgroundColor">
+                                                                                                                       <int key="NSColorSpace">6</int>
+                                                                                                                       <string key="NSCatalogName">System</string>
+                                                                                                                       <string key="NSColorName">headerColor</string>
+                                                                                                                       <object class="NSColor" key="NSColor" id="1023510502">
+                                                                                                                               <int key="NSColorSpace">3</int>
+                                                                                                                               <bytes key="NSWhite">MQA</bytes>
+                                                                                                                       </object>
                                                                                                                </object>
-                                                                                                               <object class="NSColor" key="NSTextColor" id="974793769">
+                                                                                                               <object class="NSColor" key="NSTextColor">
                                                                                                                        <int key="NSColorSpace">6</int>
                                                                                                                        <string key="NSCatalogName">System</string>
                                                                                                                        <string key="NSColorName">headerTextColor</string>
-                                                                                                                       <reference key="NSColor" ref="815326389"/>
+                                                                                                                       <reference key="NSColor" ref="495955423"/>
                                                                                                                </object>
                                                                                                        </object>
-                                                                                                       <object class="NSTextFieldCell" key="NSDataCell" id="904798784">
+                                                                                                       <object class="NSTextFieldCell" key="NSDataCell" id="64849697">
                                                                                                                <int key="NSCellFlags">337772096</int>
                                                                                                                <int key="NSCellFlags2">2048</int>
                                                                                                                <string key="NSContents">Text Cell</string>
                                                                                                                <reference key="NSSupport" ref="822023840"/>
-                                                                                                               <reference key="NSControlView" ref="695882538"/>
+                                                                                                               <reference key="NSControlView" ref="105029809"/>
                                                                                                                <object class="NSColor" key="NSBackgroundColor" id="928689894">
                                                                                                                        <int key="NSColorSpace">6</int>
                                                                                                                        <string key="NSCatalogName">System</string>
@@ -415,41 +420,12 @@
                                                                                                        <int key="NSResizingMask">3</int>
                                                                                                        <bool key="NSIsResizeable">YES</bool>
                                                                                                        <bool key="NSIsEditable">YES</bool>
-                                                                                                       <reference key="NSTableView" ref="695882538"/>
-                                                                                               </object>
-                                                                                               <object class="NSTableColumn" id="870866881">
-                                                                                                       <double key="NSWidth">1.120000e+02</double>
-                                                                                                       <double key="NSMinWidth">4.000000e+01</double>
-                                                                                                       <double key="NSMaxWidth">1.000000e+03</double>
-                                                                                                       <object class="NSTableHeaderCell" key="NSHeaderCell">
-                                                                                                               <int key="NSCellFlags">75628032</int>
-                                                                                                               <int key="NSCellFlags2">0</int>
-                                                                                                               <string key="NSContents"/>
-                                                                                                               <reference key="NSSupport" ref="26"/>
-                                                                                                               <reference key="NSBackgroundColor" ref="46157304"/>
-                                                                                                               <reference key="NSTextColor" ref="974793769"/>
-                                                                                                       </object>
-                                                                                                       <object class="NSTextFieldCell" key="NSDataCell" id="661397302">
-                                                                                                               <int key="NSCellFlags">337772096</int>
-                                                                                                               <int key="NSCellFlags2">2048</int>
-                                                                                                               <string key="NSContents">Text Cell</string>
-                                                                                                               <reference key="NSSupport" ref="822023840"/>
-                                                                                                               <reference key="NSControlView" ref="695882538"/>
-                                                                                                               <reference key="NSBackgroundColor" ref="928689894"/>
-                                                                                                               <reference key="NSTextColor" ref="888276067"/>
-                                                                                                       </object>
-                                                                                                       <int key="NSResizingMask">3</int>
-                                                                                                       <bool key="NSIsResizeable">YES</bool>
-                                                                                                       <bool key="NSIsEditable">YES</bool>
-                                                                                                       <reference key="NSTableView" ref="695882538"/>
+                                                                                                       <reference key="NSTableView" ref="105029809"/>
                                                                                                </object>
                                                                                        </object>
                                                                                        <double key="NSIntercellSpacingWidth">3.000000e+00</double>
                                                                                        <double key="NSIntercellSpacingHeight">2.000000e+00</double>
-                                                                                       <object class="NSColor" key="NSBackgroundColor">
-                                                                                               <int key="NSColorSpace">3</int>
-                                                                                               <bytes key="NSWhite">MQA</bytes>
-                                                                                       </object>
+                                                                                       <reference key="NSBackgroundColor" ref="1023510502"/>
                                                                                        <object class="NSColor" key="NSGridColor">
                                                                                                <int key="NSColorSpace">6</int>
                                                                                                <string key="NSCatalogName">System</string>
@@ -460,69 +436,69 @@
                                                                                                </object>
                                                                                        </object>
                                                                                        <double key="NSRowHeight">1.700000e+01</double>
-                                                                                       <int key="NSTvFlags">-767557632</int>
+                                                                                       <int key="NSTvFlags">-700448768</int>
                                                                                        <int key="NSColumnAutoresizingStyle">4</int>
                                                                                        <int key="NSDraggingSourceMaskForLocal">15</int>
                                                                                        <int key="NSDraggingSourceMaskForNonLocal">0</int>
                                                                                        <bool key="NSAllowsTypeSelect">YES</bool>
+                                                                                       <int key="NSTableViewDraggingDestinationStyle">1</int>
                                                                                </object>
                                                                        </object>
-                                                                       <string key="NSFrame">{{1, 17}, {219, 102}}</string>
-                                                                       <reference key="NSSuperview" ref="1066664982"/>
-                                                                       <reference key="NSNextKeyView" ref="695882538"/>
-                                                                       <reference key="NSDocView" ref="695882538"/>
+                                                                       <string key="NSFrame">{{1, 17}, {312, 304}}</string>
+                                                                       <reference key="NSSuperview" ref="779802593"/>
+                                                                       <reference key="NSNextKeyView" ref="105029809"/>
+                                                                       <reference key="NSDocView" ref="105029809"/>
                                                                        <reference key="NSBGColor" ref="928689894"/>
                                                                        <int key="NScvFlags">4</int>
                                                                </object>
-                                                               <object class="NSScroller" id="73800878">
-                                                                       <reference key="NSNextResponder" ref="1066664982"/>
+                                                               <object class="NSScroller" id="133059945">
+                                                                       <reference key="NSNextResponder" ref="779802593"/>
                                                                        <int key="NSvFlags">256</int>
-                                                                       <string key="NSFrame">{{220, 17}, {15, 102}}</string>
-                                                                       <reference key="NSSuperview" ref="1066664982"/>
-                                                                       <reference key="NSTarget" ref="1066664982"/>
+                                                                       <string key="NSFrame">{{313, 17}, {15, 304}}</string>
+                                                                       <reference key="NSSuperview" ref="779802593"/>
+                                                                       <reference key="NSTarget" ref="779802593"/>
                                                                        <string key="NSAction">_doScroller:</string>
-                                                                       <double key="NSCurValue">3.700000e+01</double>
-                                                                       <double key="NSPercent">1.390978e-01</double>
+                                                                       <double key="NSPercent">4.742590e-01</double>
                                                                </object>
-                                                               <object class="NSScroller" id="1013241997">
-                                                                       <reference key="NSNextResponder" ref="1066664982"/>
+                                                               <object class="NSScroller" id="1071968096">
+                                                                       <reference key="NSNextResponder" ref="779802593"/>
                                                                        <int key="NSvFlags">256</int>
-                                                                       <string key="NSFrame">{{1, 119}, {219, 15}}</string>
-                                                                       <reference key="NSSuperview" ref="1066664982"/>
+                                                                       <string key="NSFrame">{{1, 321}, {312, 15}}</string>
+                                                                       <reference key="NSSuperview" ref="779802593"/>
                                                                        <int key="NSsFlags">1</int>
-                                                                       <reference key="NSTarget" ref="1066664982"/>
+                                                                       <reference key="NSTarget" ref="779802593"/>
                                                                        <string key="NSAction">_doScroller:</string>
                                                                        <double key="NSPercent">5.714286e-01</double>
                                                                </object>
-                                                               <object class="NSClipView" id="175727283">
-                                                                       <reference key="NSNextResponder" ref="1066664982"/>
+                                                               <object class="NSClipView" id="784098487">
+                                                                       <reference key="NSNextResponder" ref="779802593"/>
                                                                        <int key="NSvFlags">2304</int>
                                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                               <reference ref="603767070"/>
+                                                                               <reference ref="800483137"/>
                                                                        </object>
-                                                                       <string key="NSFrame">{{1, 0}, {219, 17}}</string>
-                                                                       <reference key="NSSuperview" ref="1066664982"/>
-                                                                       <reference key="NSNextKeyView" ref="603767070"/>
-                                                                       <reference key="NSDocView" ref="603767070"/>
+                                                                       <string key="NSFrame">{{1, 0}, {312, 17}}</string>
+                                                                       <reference key="NSSuperview" ref="779802593"/>
+                                                                       <reference key="NSNextKeyView" ref="800483137"/>
+                                                                       <reference key="NSDocView" ref="800483137"/>
                                                                        <reference key="NSBGColor" ref="928689894"/>
                                                                        <int key="NScvFlags">4</int>
                                                                </object>
-                                                               <reference ref="389160094"/>
+                                                               <reference ref="510111226"/>
                                                        </object>
-                                                       <string key="NSFrame">{{32, 153}, {236, 135}}</string>
+                                                       <string key="NSFrame">{{32, 163}, {329, 337}}</string>
                                                        <reference key="NSSuperview" ref="439893737"/>
-                                                       <reference key="NSNextKeyView" ref="499395455"/>
+                                                       <reference key="NSNextKeyView" ref="860102363"/>
                                                        <int key="NSsFlags">50</int>
-                                                       <reference key="NSVScroller" ref="73800878"/>
-                                                       <reference key="NSHScroller" ref="1013241997"/>
-                                                       <reference key="NSContentView" ref="499395455"/>
-                                                       <reference key="NSHeaderClipView" ref="175727283"/>
-                                                       <reference key="NSCornerView" ref="389160094"/>
+                                                       <reference key="NSVScroller" ref="133059945"/>
+                                                       <reference key="NSHScroller" ref="1071968096"/>
+                                                       <reference key="NSContentView" ref="860102363"/>
+                                                       <reference key="NSHeaderClipView" ref="784098487"/>
+                                                       <reference key="NSCornerView" ref="510111226"/>
                                                        <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
                                                </object>
                                        </object>
-                                       <string key="NSFrameSize">{288, 333}</string>
+                                       <string key="NSFrameSize">{381, 545}</string>
                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1024, 746}}</string>
@@ -580,6 +556,9 @@
                                <string key="NSScreenRect">{{0, 0}, {1024, 746}}</string>
                                <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
                        </object>
+                       <object class="NSCustomObject" id="251429857">
+                               <string key="NSClassName">PlaylistTableModel</string>
+                       </object>
                </object>
                <object class="IBObjectContainer" key="IBDocument.Objects">
                        <object class="NSMutableArray" key="connectionRecords">
@@ -672,21 +651,37 @@
                                        </object>
                                        <int key="connectionID">435</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">folderPopup</string>
+                                               <reference key="source" ref="567503449"/>
+                                               <reference key="destination" ref="997567970"/>
+                                       </object>
+                                       <int key="connectionID">451</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">playlistView</string>
                                                <reference key="source" ref="567503449"/>
-                                               <reference key="destination" ref="695882538"/>
+                                               <reference key="destination" ref="105029809"/>
                                        </object>
-                                       <int key="connectionID">450</int>
+                                       <int key="connectionID">461</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">folderPopup</string>
+                                               <string key="label">playlistModel</string>
                                                <reference key="source" ref="567503449"/>
-                                               <reference key="destination" ref="997567970"/>
+                                               <reference key="destination" ref="251429857"/>
                                        </object>
-                                       <int key="connectionID">451</int>
+                                       <int key="connectionID">463</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">tableView</string>
+                                               <reference key="source" ref="251429857"/>
+                                               <reference key="destination" ref="105029809"/>
+                                       </object>
+                                       <int key="connectionID">464</int>
                                </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
@@ -694,28 +689,26 @@
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">0</int>
-                                               <object class="NSArray" key="object" id="1049">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                               </object>
+                                               <reference key="object" ref="0"/>
                                                <reference key="children" ref="1048"/>
                                                <nil key="parent"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">-2</int>
                                                <reference key="object" ref="1021"/>
-                                               <reference key="parent" ref="1049"/>
+                                               <reference key="parent" ref="0"/>
                                                <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">-1</int>
                                                <reference key="object" ref="1014"/>
-                                               <reference key="parent" ref="1049"/>
+                                               <reference key="parent" ref="0"/>
                                                <string key="objectName">First Responder</string>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">-3</int>
                                                <reference key="object" ref="1050"/>
-                                               <reference key="parent" ref="1049"/>
+                                               <reference key="parent" ref="0"/>
                                                <string key="objectName">Application</string>
                                        </object>
                                        <object class="IBObjectRecord">
@@ -726,7 +719,7 @@
                                                        <reference ref="694149608"/>
                                                        <reference ref="391199113"/>
                                                </object>
-                                               <reference key="parent" ref="1049"/>
+                                               <reference key="parent" ref="0"/>
                                                <string key="objectName">MainMenu</string>
                                        </object>
                                        <object class="IBObjectRecord">
@@ -842,7 +835,7 @@
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="439893737"/>
                                                </object>
-                                               <reference key="parent" ref="1049"/>
+                                               <reference key="parent" ref="0"/>
                                                <string key="objectName">NotiPod</string>
                                        </object>
                                        <object class="IBObjectRecord">
@@ -851,11 +844,11 @@
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="818249148"/>
-                                                       <reference ref="703636579"/>
-                                                       <reference ref="323617138"/>
-                                                       <reference ref="1066664982"/>
                                                        <reference ref="524945726"/>
                                                        <reference ref="997567970"/>
+                                                       <reference ref="323617138"/>
+                                                       <reference ref="779802593"/>
+                                                       <reference ref="703636579"/>
                                                </object>
                                                <reference key="parent" ref="972006081"/>
                                        </object>
@@ -904,7 +897,7 @@
                                        <object class="IBObjectRecord">
                                                <int key="objectID">404</int>
                                                <reference key="object" ref="567503449"/>
-                                               <reference key="parent" ref="1049"/>
+                                               <reference key="parent" ref="0"/>
                                                <string key="objectName">NotiPodController</string>
                                        </object>
                                        <object class="IBObjectRecord">
@@ -943,7 +936,7 @@
                                        <object class="IBObjectRecord">
                                                <int key="objectID">425</int>
                                                <reference key="object" ref="719278169"/>
-                                               <reference key="parent" ref="1049"/>
+                                               <reference key="parent" ref="0"/>
                                                <string key="objectName">NotiPodAppDelegate</string>
                                        </object>
                                        <object class="IBObjectRecord">
@@ -953,7 +946,7 @@
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="851027294"/>
                                                </object>
-                                               <reference key="parent" ref="1049"/>
+                                               <reference key="parent" ref="0"/>
                                                <string key="objectName">NotiPodLoading</string>
                                        </object>
                                        <object class="IBObjectRecord">
@@ -1005,75 +998,65 @@
                                                <reference key="parent" ref="323617138"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">440</int>
-                                               <reference key="object" ref="1066664982"/>
+                                               <int key="objectID">452</int>
+                                               <reference key="object" ref="779802593"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="73800878"/>
-                                                       <reference ref="1013241997"/>
-                                                       <reference ref="695882538"/>
-                                                       <reference ref="603767070"/>
+                                                       <reference ref="133059945"/>
+                                                       <reference ref="1071968096"/>
+                                                       <reference ref="105029809"/>
+                                                       <reference ref="800483137"/>
                                                </object>
                                                <reference key="parent" ref="439893737"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">441</int>
-                                               <reference key="object" ref="73800878"/>
-                                               <reference key="parent" ref="1066664982"/>
+                                               <int key="objectID">453</int>
+                                               <reference key="object" ref="133059945"/>
+                                               <reference key="parent" ref="779802593"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">442</int>
-                                               <reference key="object" ref="1013241997"/>
-                                               <reference key="parent" ref="1066664982"/>
+                                               <int key="objectID">454</int>
+                                               <reference key="object" ref="1071968096"/>
+                                               <reference key="parent" ref="779802593"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">443</int>
-                                               <reference key="object" ref="695882538"/>
+                                               <int key="objectID">455</int>
+                                               <reference key="object" ref="105029809"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="888804271"/>
-                                                       <reference ref="870866881"/>
+                                                       <reference ref="819126432"/>
                                                </object>
-                                               <reference key="parent" ref="1066664982"/>
+                                               <reference key="parent" ref="779802593"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">444</int>
-                                               <reference key="object" ref="603767070"/>
-                                               <reference key="parent" ref="1066664982"/>
+                                               <int key="objectID">456</int>
+                                               <reference key="object" ref="800483137"/>
+                                               <reference key="parent" ref="779802593"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">445</int>
-                                               <reference key="object" ref="888804271"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="904798784"/>
-                                               </object>
-                                               <reference key="parent" ref="695882538"/>
+                                               <int key="objectID">462</int>
+                                               <reference key="object" ref="251429857"/>
+                                               <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">446</int>
-                                               <reference key="object" ref="870866881"/>
+                                               <int key="objectID">465</int>
+                                               <reference key="object" ref="819126432"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="661397302"/>
+                                                       <reference ref="64849697"/>
                                                </object>
-                                               <reference key="parent" ref="695882538"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">447</int>
-                                               <reference key="object" ref="661397302"/>
-                                               <reference key="parent" ref="870866881"/>
+                                               <reference key="parent" ref="105029809"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">448</int>
-                                               <reference key="object" ref="904798784"/>
-                                               <reference key="parent" ref="888804271"/>
+                                               <int key="objectID">466</int>
+                                               <reference key="object" ref="64849697"/>
+                                               <reference key="parent" ref="819126432"/>
                                        </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
                                <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="NSMutableArray" key="dict.sortedKeys">
+                               <object class="NSArray" key="dict.sortedKeys">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <string>-1.IBPluginDependency</string>
                                        <string>-2.IBPluginDependency</string>
@@ -1138,15 +1121,12 @@
                                        <string>436.IBPluginDependency</string>
                                        <string>437.IBPluginDependency</string>
                                        <string>438.IBPluginDependency</string>
-                                       <string>440.IBPluginDependency</string>
-                                       <string>441.IBPluginDependency</string>
-                                       <string>442.IBPluginDependency</string>
-                                       <string>443.IBPluginDependency</string>
-                                       <string>444.IBPluginDependency</string>
-                                       <string>445.IBPluginDependency</string>
-                                       <string>446.IBPluginDependency</string>
-                                       <string>447.IBPluginDependency</string>
-                                       <string>448.IBPluginDependency</string>
+                                       <string>452.IBPluginDependency</string>
+                                       <string>453.IBPluginDependency</string>
+                                       <string>454.IBPluginDependency</string>
+                                       <string>455.IBPluginDependency</string>
+                                       <string>456.IBPluginDependency</string>
+                                       <string>462.IBPluginDependency</string>
                                        <string>56.IBPluginDependency</string>
                                        <string>56.ImportedFromIB2</string>
                                        <string>57.IBPluginDependency</string>
@@ -1191,8 +1171,8 @@
                                        <reference ref="9"/>
                                        <string>{74, 862}</string>
                                        <string>{{529, 476}, {148, 20}}</string>
-                                       <string>{{343, 40}, {288, 333}}</string>
-                                       <string>{{343, 40}, {288, 333}}</string>
+                                       <string>{{253, 91}, {381, 545}}</string>
+                                       <string>{{253, 91}, {381, 545}}</string>
                                        <reference ref="9"/>
                                        <string>{{505, 213}, {252, 190}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1227,9 +1207,6 @@
                                        <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>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
@@ -1240,9 +1217,7 @@
                        </object>
                        <object class="NSMutableDictionary" key="unlocalizedProperties">
                                <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="NSArray" key="dict.sortedKeys">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                               </object>
+                               <reference key="dict.sortedKeys" ref="0"/>
                                <object class="NSMutableArray" key="dict.values">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                </object>
@@ -1250,15 +1225,13 @@
                        <nil key="activeLocalization"/>
                        <object class="NSMutableDictionary" key="localizations">
                                <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="NSArray" key="dict.sortedKeys">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                               </object>
+                               <reference key="dict.sortedKeys" ref="0"/>
                                <object class="NSMutableArray" key="dict.values">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">451</int>
+                       <int key="maxID">466</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1266,9 +1239,9 @@
                                <object class="IBPartialClassDescription">
                                        <string key="className">NotiPodAppDelegate</string>
                                        <string key="superclassName">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="344772374">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">NotiPodAppDelegate.py</string>
+                                               <string key="minorKey">NotiPod.py</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
@@ -1284,7 +1257,7 @@
                                        <string key="superclassName">NSObject</string>
                                        <object class="NSMutableDictionary" key="actions">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSMutableArray" key="dict.sortedKeys">
+                                               <object class="NSArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>doSelectFolder:</string>
                                                        <string>doSync:</string>
@@ -1297,11 +1270,11 @@
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSMutableArray" key="dict.sortedKeys">
+                                               <object class="NSArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>folderPopup</string>
                                                        <string>loadingSheet</string>
-                                                       <string>playlistView</string>
+                                                       <string>playlistModel</string>
                                                        <string>window</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
@@ -1312,10 +1285,7 @@
                                                        <string>id</string>
                                                </object>
                                        </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">NotiPodController.py</string>
-                                       </object>
+                                       <reference key="sourceIdentifier" ref="344772374"/>
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NotiPodController</string>
@@ -1325,6 +1295,15 @@
                                                <string key="minorKey"/>
                                        </object>
                                </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">PlaylistTableModel</string>
+                                       <string key="superclassName">NSObject</string>
+                                       <object class="NSMutableDictionary" key="outlets">
+                                               <string key="NS.key.0">tableView</string>
+                                               <string key="NS.object.0">id</string>
+                                       </object>
+                                       <reference key="sourceIdentifier" ref="344772374"/>
+                               </object>
                        </object>
                </object>
                <int key="IBDocument.localizationMode">0</int>

diff --git a/NotiPodController.py b/NotiPod.py
similarity index 50%
rename from NotiPodController.py
rename to NotiPod.py
index e415cef9e86fc041bc15e7aad58c33983160ed09..bb810ba38c50b4c0ff3c077ed8d2794da2b728b3 100644 (file)
--- a/NotiPodController.py
+++ b/NotiPod.py
@@ -2,35 +2,57 @@
 # Copyright 2009 James Bunton <jamesbunton@fastmail.fm>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
+import objc
 from Foundation import *
 from AppKit import *
-import objc
+from PyObjCTools import AppHelper
+
+import libsyncitunes
+
+
+class PlaylistTableModel(NSObject):
+       tableView = objc.IBOutlet()
+
+       def awakeFromNib(self):
+               self.playlists = []
+               self.tableView.setDataSource_(self)
+       
+       def setPlaylists(self, playlists):
+               self.playlists = playlists
+               self.tableView.reloadData()
+
+       def tableView_objectValueForTableColumn_row_(self, tableView, col, row):
+               assert 0 <= row < len(self.playlists)
+               return self.playlists[row]
+
+       def numberOfRowsInTableView_(self, tableView):
+               print "get number of rows", len(self.playlists)
+               return len(self.playlists)
+
 
-import itunes
 
 class NotiPodController(NSObject):
-       playlistView = objc.IBOutlet()
+       playlistModel = objc.IBOutlet()
        folderPopup = objc.IBOutlet()
        window = objc.IBOutlet()
        loadingSheet = objc.IBOutlet()
 
 
        def awakeFromNib(self):
-###            self.loadLibrary()
                self.performSelectorInBackground_withObject_(self.loadLibrary, None)
                print "awakeFromNib"
        
        def finishLoading(self):
-               self.playlistView.setDataSource_(self.library)
+               self.playlistModel.setPlaylists(self.library.list_playlists())
                self.folderPopup.addItemsWithTitles_(NSApp.delegate().folders())
 
        def loadLibrary(self):
                pool = NSAutoreleasePool.alloc().init()
                NSApp.beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_(self.loadingSheet, self.window, None, None, None)
-               self.library = itunes.Library.alloc().init()
+               self.library = libsyncitunes.ITunesLibrary.alloc().init()
                self.loadingSheet.close()
-               self.performSelectorOnMainThread_withObject_waitUntilDone_(self.finishLoading, None, False)
-               pool.drain()
+               self.performSelectorOnMainThread_withObject_waitUntilDone_(self.finishLoading, None, True)
+               del pool
 
        @objc.signature("v@:@ii")
        def selectFolderEnd_returnCode_contextInfo_(self, panel, ret, _):
@@ -63,3 +85,51 @@ class NotiPodController(NSObject):
        def doSync_(self, sender):
                print "hello me"
 
+
+class NotiPodAppDelegate(NSObject):
+
+       # Delegate methods
+
+       def applicationWillFinishLaunching_(self, _):
+               print "loading prefs"
+               prefs = NSUserDefaults.standardUserDefaults()
+               self._playlists = prefs.stringArrayForKey_("playlists")
+               self._folders = prefs.stringArrayForKey_("folders")
+               print "folders", self._folders
+               print "playlists", self._playlists
+
+       def applicationDidFinishLaunching_(self, _):
+               pass
+
+       def applicationWillTerminate_(self, _):
+               prefs = NSUserDefaults.standardUserDefaults()
+               prefs.synchronize()
+
+       def applicationShouldTerminateAfterLastWindowClosed_(self, _):
+               return True
+
+
+       # Public accessors
+
+       def playlists(self):
+               return self._playlists
+
+       def folders(self):
+               return self._folders or []
+
+       def addFolder_(self, folder):
+               self._folders.insert(0, folder)
+
+       def hasPlaylist_(self, playlist):
+               return playlist in self._playlists
+       
+       def removePlaylist_(self, playlist):
+               self._playlists.remove(playlist)
+       
+       def addPlaylist_(self, playlist):
+               self._playlists.append(playlist)
+
+
+
+AppHelper.runEventLoop()
+

diff --git a/NotiPodAppDelegate.py b/NotiPodAppDelegate.py
deleted file mode 100644 (file)
index 9cf4d28..0000000
--- a/NotiPodAppDelegate.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2009 James Bunton <jamesbunton@fastmail.fm>
-# Licensed for distribution under the GPL version 2, check COPYING for details
-
-from Foundation import *
-from AppKit import *
-import objc
-
-import itunes
-
-class NotiPodAppDelegate(NSObject):
-
-       # Delegate methods
-
-       def applicationWillFinishLaunching_(self, _):
-               prefs = NSUserDefaults.standardUserDefaults()
-               self._playlists = prefs.stringArrayForKey_("playlists")
-               self._folders = prefs.stringArrayForKey_("folders")
-
-       def applicationDidFinishLaunching_(self, _):
-               pass
-
-       def applicationWillTerminate_(self, _):
-               prefs = NSUserDefaults.standardUserDefaults()
-               prefs.synchronize()
-
-       def applicationShouldTerminateAfterLastWindowClosed_(self, _):
-               return True
-
-
-       # Public accessors
-
-       def playlists(self):
-               return self._playlists
-
-       def folders(self):
-               return self._folders or []
-
-       def addFolder_(self, folder):
-               self._folders.insert(0, folder)
-
-       def hasPlaylist_(self, playlist):
-               return playlist in self._playlists
-       
-       def removePlaylist_(self, playlist):
-               self._playlists.remove(playlist)
-       
-       def addPlaylist_(self, playlist):
-               self._playlists.append(playlist)
-
-

diff --git a/libsyncitunes.py b/libsyncitunes.py
index ea3754118d03b1f8ff93694d087d98cb86e98f08..096abc2ab6ecd06cd0f53c88bcac3a5a0ac665e7 100644 (file)
--- a/libsyncitunes.py
+++ b/libsyncitunes.py
@@ -30,7 +30,7 @@ class Playlist(object):
                if parent is not None:
                        parent.children.append(self)
 
-class Library(NSObject):
+class ITunesLibrary(NSObject):
        def init(self):
                return self.initWithFilename_("~/Music/iTunes/iTunes Music Library.xml")
 

diff --git a/main.m b/main.m
index 505c846a75b4a8fbe6a2c82ab1278afc76af296d..d9f789b1ddfc92547064eedb0f2e2e723698b3b0 100644 (file)
--- a/main.m
+++ b/main.m
@@ -20,12 +20,12 @@ main(int argc, char** argv)
        NSString* mainFilePath = nil;
 
        for(NSString* possibleMainExtension in possibleMainExtensions) {
-               mainFilePath = [mainBundle pathForResource: @"main" ofType: possibleMainExtension];
+               mainFilePath = [mainBundle pathForResource: @"NotiPod" ofType: possibleMainExtension];
                if(mainFilePath != nil) break;
        }
 
        if(!mainFilePath) {
-               [NSException raise: NSInternalInconsistencyException format: @"%s:%d main() Failed to find the main.{py,pyc,pyo} file in the application wrapper's Resources directory.", __FILE__, __LINE__];
+               [NSException raise: NSInternalInconsistencyException format: @"%s:%d main() Failed to find the main file in the application wrapper's Resources directory.", __FILE__, __LINE__];
        }
 
        Py_SetProgramName("/usr/bin/python");

diff --git a/main.py b/main.py
deleted file mode 100644 (file)
index 1ddbb89..0000000
--- a/main.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2009 James Bunton <jamesbunton@fastmail.fm>
-# Licensed for distribution under the GPL version 2, check COPYING for details
-
-import objc
-import Foundation
-import AppKit
-from PyObjCTools import AppHelper
-
-import NotiPodAppDelegate
-import NotiPodController
-
-AppHelper.runEventLoop()
-

diff --git a/notipod.xcodeproj/project.pbxproj b/notipod.xcodeproj/project.pbxproj
index db5ae1a1385fa812a7d2d07942f7d5ff484cd31c..7d61add92d3123ec2c771e1dc6b996f351bfdef9 100644 (file)
--- a/notipod.xcodeproj/project.pbxproj
+++ b/notipod.xcodeproj/project.pbxproj
@@ -8,15 +8,12 @@
 
 /* Begin PBXBuildFile section */
                77631A270C06C501005415CB /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77631A260C06C501005415CB /* Python.framework */; };
-               77631A3F0C0748CF005415CB /* main.py in Resources */ = {isa = PBXBuildFile; fileRef = 77631A3E0C0748CF005415CB /* main.py */; };
-               7790198F0C07548A00326F66 /* NotiPodController.py in Resources */ = {isa = PBXBuildFile; fileRef = 7790198E0C07548A00326F66 /* NotiPodController.py */; };
                77C8C1F90C07829500965286 /* NotiPod.xib in Resources */ = {isa = PBXBuildFile; fileRef = 77C8C1F70C07829500965286 /* NotiPod.xib */; };
                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
                8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-               93F5D8EB0F930158006FB1E6 /* itunes.py in Resources */ = {isa = PBXBuildFile; fileRef = 93F5D8E90F930158006FB1E6 /* itunes.py */; };
-               93F5D8EC0F930158006FB1E6 /* sync.py in Resources */ = {isa = PBXBuildFile; fileRef = 93F5D8EA0F930158006FB1E6 /* sync.py */; };
-               93F5D91D0F933A00006FB1E6 /* NotiPodAppDelegate.py in Resources */ = {isa = PBXBuildFile; fileRef = 93F5D91C0F933A00006FB1E6 /* NotiPodAppDelegate.py */; };
+               93D64A9A12D030190093DEC9 /* libsyncitunes.py in Resources */ = {isa = PBXBuildFile; fileRef = 93D64A9912D030190093DEC9 /* libsyncitunes.py */; };
+               93D64AB212D037890093DEC9 /* NotiPod.py in Resources */ = {isa = PBXBuildFile; fileRef = 93D64AB112D037890093DEC9 /* NotiPod.py */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,14 +24,11 @@
                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
                32CA4F630368D1EE00C91783 /* notipod_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = notipod_Prefix.pch; sourceTree = "<group>"; };
                77631A260C06C501005415CB /* Python.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Python.framework; path = /System/Library/Frameworks/Python.framework; sourceTree = "<absolute>"; };
-               77631A3E0C0748CF005415CB /* main.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = main.py; sourceTree = "<group>"; };
-               7790198E0C07548A00326F66 /* NotiPodController.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = NotiPodController.py; sourceTree = "<group>"; };
                77C8C1F80C07829500965286 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NotiPod.xib; sourceTree = "<group>"; };
                8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                8D1107320486CEB800E47090 /* notipod.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = notipod.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               93F5D8E90F930158006FB1E6 /* itunes.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = itunes.py; sourceTree = "<group>"; };
-               93F5D8EA0F930158006FB1E6 /* sync.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = sync.py; sourceTree = "<group>"; };
-               93F5D91C0F933A00006FB1E6 /* NotiPodAppDelegate.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = NotiPodAppDelegate.py; sourceTree = "<group>"; };
+               93D64A9912D030190093DEC9 /* libsyncitunes.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = libsyncitunes.py; sourceTree = "<group>"; };
+               93D64AB112D037890093DEC9 /* NotiPod.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = NotiPod.py; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -50,15 +44,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-               080E96DDFE201D6D7F000001 /* Classes */ = {
-                       isa = PBXGroup;
-                       children = (
-                               93F5D91C0F933A00006FB1E6 /* NotiPodAppDelegate.py */,
-                               7790198E0C07548A00326F66 /* NotiPodController.py */,
-                       );
-                       name = Classes;
-                       sourceTree = "<group>";
-               };
                1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
                        isa = PBXGroup;
                        children = (
@@ -88,8 +73,7 @@
                29B97314FDCFA39411CA2CEA /* notipod */ = {
                        isa = PBXGroup;
                        children = (
-                               080E96DDFE201D6D7F000001 /* Classes */,
-                               29B97315FDCFA39411CA2CEA /* Other Sources */,
+                               29B97315FDCFA39411CA2CEA /* Sources */,
                                29B97317FDCFA39411CA2CEA /* Resources */,
                                29B97323FDCFA39411CA2CEA /* Frameworks */,
                                19C28FACFE9D520D11CA2CBB /* Products */,
@@ -97,16 +81,15 @@
                        name = notipod;
                        sourceTree = "<group>";
                };
-               29B97315FDCFA39411CA2CEA /* Other Sources */ = {
+               29B97315FDCFA39411CA2CEA /* Sources */ = {
                        isa = PBXGroup;
                        children = (
-                               93F5D8E90F930158006FB1E6 /* itunes.py */,
-                               93F5D8EA0F930158006FB1E6 /* sync.py */,
                                32CA4F630368D1EE00C91783 /* notipod_Prefix.pch */,
                                29B97316FDCFA39411CA2CEA /* main.m */,
-                               77631A3E0C0748CF005415CB /* main.py */,
+                               93D64AB112D037890093DEC9 /* NotiPod.py */,
+                               93D64A9912D030190093DEC9 /* libsyncitunes.py */,
                        );
-                       name = "Other Sources";
+                       name = Sources;
                        sourceTree = "<group>";
                };
                29B97317FDCFA39411CA2CEA /* Resources */ = {
@@ -172,12 +155,9 @@
                        buildActionMask = 2147483647;
                        files = (
                                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
-                               77631A3F0C0748CF005415CB /* main.py in Resources */,
-                               7790198F0C07548A00326F66 /* NotiPodController.py in Resources */,
                                77C8C1F90C07829500965286 /* NotiPod.xib in Resources */,
-                               93F5D8EB0F930158006FB1E6 /* itunes.py in Resources */,
-                               93F5D8EC0F930158006FB1E6 /* sync.py in Resources */,
-                               93F5D91D0F933A00006FB1E6 /* NotiPodAppDelegate.py in Resources */,
+                               93D64A9A12D030190093DEC9 /* libsyncitunes.py in Resources */,
+                               93D64AB212D037890093DEC9 /* NotiPod.py in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/syncitunes.py b/syncitunes.py
index a35447054a383bd170a6f13c681b3af9b86dfea1..0f507807bb7c602d2f3b5abdb4e68458cefa5af5 100755 (executable)
--- a/syncitunes.py
+++ b/syncitunes.py
@@ -59,7 +59,7 @@ def main():
                sys.exit(1)
 
        logging.info("Loading library")
-       library = libsyncitunes.Library.alloc()
+       library = libsyncitunes.ITunesLibrary.alloc()
        if opts.itunes_library:
                library = library.initWithFilename_(opts.itunes_library)
        else: