GNAccount.rb @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9F33</string> + <string key="IBDocument.SystemVersion">9G55</string> <string key="IBDocument.InterfaceBuilderVersion">672</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="476"/> + <integer value="488"/> <integer value="373"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> @@ -105,7 +105,7 @@ <object class="NSWindowTemplate" id="885398745"> <int key="NSWindowStyleMask">3</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 155}, {347, 355}}</string> + <string key="NSWindowRect">{{196, 238}, {562, 272}}</string> <int key="NSWTFlags">1677721600</int> <string key="NSWindowTitle">Preferences</string> <string key="NSWindowClass">GNPreferencesWindow</string> @@ -119,7 +119,7 @@ <object class="NSButton" id="153067193"> <reference key="NSNextResponder" ref="329924970"/> <int key="NSvFlags">301</int> - <string key="NSFrame">{{125, 12}, {96, 32}}</string> + <string key="NSFrame">{{441, 12}, {96, 32}}</string> <reference key="NSSuperview" ref="329924970"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="583406282"> @@ -140,395 +140,630 @@ <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSBox" id="440666959"> + <object class="NSTabView" id="717484327"> <reference key="NSNextResponder" ref="329924970"/> - <int key="NSvFlags">36</int> - <object class="NSMutableArray" key="NSSubviews"> + <int key="NSvFlags">12</int> + <string key="NSFrame">{{2, 40}, {536, 226}}</string> + <reference key="NSSuperview" ref="329924970"/> + <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="614539815"> - <reference key="NSNextResponder" ref="440666959"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="99905489"> - <reference key="NSNextResponder" ref="614539815"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{15, 16}, {64, 17}}</string> - <reference key="NSSuperview" ref="614539815"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="357500350"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Password</string> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="99905489"/> - <object class="NSColor" key="NSBackgroundColor" id="232533406"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + <object class="NSTabViewItem" id="235182473"> + <string key="NSIdentifier">1</string> + <object class="NSView" key="NSView" id="1072132677"> + <reference key="NSNextResponder" ref="717484327"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSBox" id="440666959"> + <reference key="NSNextResponder" ref="1072132677"/> + <int key="NSvFlags">36</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="614539815"> + <reference key="NSNextResponder" ref="440666959"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="99905489"> + <reference key="NSNextResponder" ref="614539815"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{15, 16}, {64, 17}}</string> + <reference key="NSSuperview" ref="614539815"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="357500350"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">Password</string> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="99905489"/> + <object class="NSColor" key="NSBackgroundColor" id="232533406"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <object class="NSColor" key="NSColor" id="94645981"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor" id="447846610"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlTextColor</string> + <object class="NSColor" key="NSColor" id="925342094"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + </object> + </object> + </object> + </object> + <object class="NSSecureTextField" id="422810936"> + <reference key="NSNextResponder" ref="614539815"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{98, 14}, {172, 22}}</string> + <reference key="NSSuperview" ref="614539815"/> + <bool key="NSEnabled">YES</bool> + <object class="NSSecureTextFieldCell" key="NSCell" id="189541624"> + <int key="NSCellFlags">343014976</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="422810936"/> + <bool key="NSDrawsBackground">YES</bool> + <object class="NSColor" key="NSBackgroundColor" id="984563618"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor" id="1055869631"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textColor</string> + <reference key="NSColor" ref="925342094"/> + </object> + <object class="NSArray" key="NSAllowedInputLocales"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSAllRomanInputSourcesLocaleIdentifier</string> + </object> + </object> + </object> + <object class="NSTextField" id="121839710"> + <reference key="NSNextResponder" ref="614539815"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{15, 41}, {67, 17}}</string> + <reference key="NSSuperview" ref="614539815"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="712537576"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">Username</string> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="121839710"/> + <reference key="NSBackgroundColor" ref="232533406"/> + <reference key="NSTextColor" ref="447846610"/> + </object> + </object> + <object class="NSTextField" id="879562125"> + <reference key="NSNextResponder" ref="614539815"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{98, 39}, {172, 22}}</string> + <reference key="NSSuperview" ref="614539815"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="119829698"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="879562125"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="984563618"/> + <reference key="NSTextColor" ref="1055869631"/> + </object> + </object> + </object> + <string key="NSFrame">{{1, 1}, {286, 71}}</string> + <reference key="NSSuperview" ref="440666959"/> </object> </object> - <object class="NSColor" key="NSTextColor" id="447846610"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlTextColor</string> - <object class="NSColor" key="NSColor" id="925342094"> + <string key="NSFrame">{{222, 38}, {288, 87}}</string> + <reference key="NSSuperview" ref="1072132677"/> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents"/> + <object class="NSFont" key="NSSupport" id="26"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.100000e+01</double> + <int key="NSfFlags">3100</int> + </object> + <reference key="NSBackgroundColor" ref="984563618"/> + <object class="NSColor" key="NSTextColor"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MAA</bytes> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> </object> </object> + <reference key="NSContentView" ref="614539815"/> + <int key="NSBorderType">1</int> + <int key="NSBoxType">0</int> + <int key="NSTitlePosition">2</int> + <bool key="NSTransparent">NO</bool> </object> - </object> - <object class="NSSecureTextField" id="422810936"> - <reference key="NSNextResponder" ref="614539815"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{98, 14}, {195, 22}}</string> - <reference key="NSSuperview" ref="614539815"/> - <bool key="NSEnabled">YES</bool> - <object class="NSSecureTextFieldCell" key="NSCell" id="189541624"> - <int key="NSCellFlags">343014976</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="422810936"/> - <bool key="NSDrawsBackground">YES</bool> - <object class="NSColor" key="NSBackgroundColor" id="984563618"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> + <object class="NSScrollView" id="277519444"> + <reference key="NSNextResponder" ref="1072132677"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSClipView" id="200186031"> + <reference key="NSNextResponder" ref="277519444"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableView" id="313996060"> + <reference key="NSNextResponder" ref="200186031"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{223, 133}</string> + <reference key="NSSuperview" ref="200186031"/> + <bool key="NSEnabled">YES</bool> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{224, 0}, {16, 17}}</string> + </object> + <object class="NSMutableArray" key="NSTableColumns"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableColumn" id="217188050"> + <double key="NSWidth">2.200000e+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"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> + </object> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">headerTextColor</string> + <reference key="NSColor" ref="925342094"/> + </object> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="643484397"> + <int key="NSCellFlags">337772096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents">Text Cell</string> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="313996060"/> + <object class="NSColor" key="NSBackgroundColor" id="1025968926"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlBackgroundColor</string> + <reference key="NSColor" ref="94645981"/> + </object> + <reference key="NSTextColor" ref="447846610"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <reference key="NSTableView" ref="313996060"/> + </object> + </object> + <double key="NSIntercellSpacingWidth">3.000000e+00</double> + <double key="NSIntercellSpacingHeight">2.000000e+00</double> + <reference key="NSBackgroundColor" ref="1025968926"/> + <object class="NSColor" key="NSGridColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">gridColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + </object> + </object> + <double key="NSRowHeight">1.700000e+01</double> + <int key="NSTvFlags">39845888</int> + <int key="NSColumnAutoresizingStyle">0</int> + <int key="NSDraggingSourceMaskForLocal">15</int> + <int key="NSDraggingSourceMaskForNonLocal">0</int> + <bool key="NSAllowsTypeSelect">YES</bool> + </object> + </object> + <string key="NSFrame">{{1, 1}, {201, 133}}</string> + <reference key="NSSuperview" ref="277519444"/> + <reference key="NSNextKeyView" ref="313996060"/> + <reference key="NSDocView" ref="313996060"/> + <reference key="NSBGColor" ref="1025968926"/> + <int key="NScvFlags">4</int> + </object> + <object class="NSScroller" id="934312738"> + <reference key="NSNextResponder" ref="277519444"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{187, 1}, {15, 133}}</string> + <reference key="NSSuperview" ref="277519444"/> + <reference key="NSTarget" ref="277519444"/> + <string key="NSAction">_doScroller:</string> + <double key="NSCurValue">7.518797e-03</double> + <double key="NSPercent">9.925926e-01</double> + </object> + <object class="NSScroller" id="1015018427"> + <reference key="NSNextResponder" ref="277519444"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{-100, -100}, {223, 15}}</string> + <reference key="NSSuperview" ref="277519444"/> + <bool key="NSEnabled">YES</bool> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="277519444"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">5.714286e-01</double> </object> </object> - <object class="NSColor" key="NSTextColor" id="1055869631"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textColor</string> - <reference key="NSColor" ref="925342094"/> - </object> - <object class="NSArray" key="NSAllowedInputLocales"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSAllRomanInputSourcesLocaleIdentifier</string> + <string key="NSFrame">{{6, 42}, {203, 135}}</string> + <reference key="NSSuperview" ref="1072132677"/> + <reference key="NSNextKeyView" ref="200186031"/> + <int key="NSsFlags">658</int> + <reference key="NSVScroller" ref="934312738"/> + <reference key="NSHScroller" ref="1015018427"/> + <reference key="NSContentView" ref="200186031"/> + <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> + </object> + <object class="NSButton" id="728672173"> + <reference key="NSNextResponder" ref="1072132677"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{6, 11}, {26, 23}}</string> + <reference key="NSSuperview" ref="1072132677"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="887912069"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="728672173"/> + <int key="NSButtonFlags">-2033958657</int> + <int key="NSButtonFlags2">134</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSAddTemplate</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> </object> </object> - </object> - <object class="NSTextField" id="121839710"> - <reference key="NSNextResponder" ref="614539815"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{15, 41}, {67, 17}}</string> - <reference key="NSSuperview" ref="614539815"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="712537576"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Username</string> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="121839710"/> - <reference key="NSBackgroundColor" ref="232533406"/> - <reference key="NSTextColor" ref="447846610"/> + <object class="NSButton" id="69799600"> + <reference key="NSNextResponder" ref="1072132677"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{31, 11}, {26, 23}}</string> + <reference key="NSSuperview" ref="1072132677"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="537221579"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="69799600"/> + <int key="NSButtonFlags">-2033958657</int> + <int key="NSButtonFlags2">134</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSRemoveTemplate</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> </object> - </object> - <object class="NSTextField" id="879562125"> - <reference key="NSNextResponder" ref="614539815"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{98, 39}, {195, 22}}</string> - <reference key="NSSuperview" ref="614539815"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="119829698"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="879562125"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="984563618"/> - <reference key="NSTextColor" ref="1055869631"/> + <object class="NSTextField" id="923777354"> + <reference key="NSNextResponder" ref="1072132677"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{222, 118}, {288, 59}}</string> + <reference key="NSSuperview" ref="1072132677"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="470048455"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">272629760</int> + <string key="NSContents">To add a Google Hosted Account, specify the full email address as username, eg: admin@ashchan.com.</string> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">16</int> + </object> + <reference key="NSControlView" ref="923777354"/> + <reference key="NSBackgroundColor" ref="232533406"/> + <reference key="NSTextColor" ref="447846610"/> + </object> </object> </object> + <string key="NSFrame">{{10, 33}, {516, 180}}</string> + <reference key="NSSuperview" ref="717484327"/> </object> - <string key="NSFrame">{{1, 1}, {311, 71}}</string> - <reference key="NSSuperview" ref="440666959"/> + <string key="NSLabel">Accounts</string> + <reference key="NSColor" ref="232533406"/> + <reference key="NSTabView" ref="717484327"/> </object> - </object> - <string key="NSFrame">{{17, 248}, {313, 87}}</string> - <reference key="NSSuperview" ref="329924970"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Account</string> - <object class="NSFont" key="NSSupport" id="26"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.100000e+01</double> - <int key="NSfFlags">3100</int> - </object> - <reference key="NSBackgroundColor" ref="984563618"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="614539815"/> - <int key="NSBorderType">1</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSBox" id="366723344"> - <reference key="NSNextResponder" ref="329924970"/> - <int key="NSvFlags">36</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="240715761"> - <reference key="NSNextResponder" ref="366723344"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="52512316"> - <reference key="NSNextResponder" ref="240715761"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{232, 36}, {55, 17}}</string> - <reference key="NSSuperview" ref="240715761"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="812362047"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">minutes</string> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="52512316"/> - <reference key="NSBackgroundColor" ref="232533406"/> - <reference key="NSTextColor" ref="447846610"/> - </object> - </object> - <object class="NSButton" id="572484964"> - <reference key="NSNextResponder" ref="240715761"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{16, 12}, {119, 18}}</string> - <reference key="NSSuperview" ref="240715761"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="623878357"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Launch at login</string> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="572484964"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">130</int> - <object class="NSCustomResource" key="NSNormalImage" id="154408030"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSSwitch</string> + <object class="NSTabViewItem" id="335730758"> + <string key="NSIdentifier">2</string> + <object class="NSView" key="NSView" id="901871461"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSBox" id="366723344"> + <reference key="NSNextResponder" ref="901871461"/> + <int key="NSvFlags">36</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="240715761"> + <reference key="NSNextResponder" ref="366723344"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="52512316"> + <reference key="NSNextResponder" ref="240715761"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{232, 36}, {55, 17}}</string> + <reference key="NSSuperview" ref="240715761"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="812362047"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">minutes</string> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="52512316"/> + <reference key="NSBackgroundColor" ref="232533406"/> + <reference key="NSTextColor" ref="447846610"/> + </object> + </object> + <object class="NSButton" id="572484964"> + <reference key="NSNextResponder" ref="240715761"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{16, 12}, {119, 18}}</string> + <reference key="NSSuperview" ref="240715761"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="623878357"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Launch at login</string> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="572484964"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">130</int> + <object class="NSCustomResource" key="NSNormalImage" id="154408030"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSSwitch</string> + </object> + <object class="NSButtonImageSource" key="NSAlternateImage" id="146608033"> + <string key="NSImageName">NSSwitch</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="1045854407"> + <reference key="NSNextResponder" ref="240715761"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{15, 36}, {163, 17}}</string> + <reference key="NSSuperview" ref="240715761"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="565573178"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">Check for new mail every</string> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="1045854407"/> + <reference key="NSBackgroundColor" ref="232533406"/> + <reference key="NSTextColor" ref="447846610"/> + </object> + </object> + <object class="NSTextField" id="759571753"> + <reference key="NSNextResponder" ref="240715761"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{183, 31}, {37, 22}}</string> + <reference key="NSSuperview" ref="240715761"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="734490335"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="759571753"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="984563618"/> + <reference key="NSTextColor" ref="1055869631"/> + </object> + </object> + </object> + <string key="NSFrame">{{1, 1}, {502, 63}}</string> + <reference key="NSSuperview" ref="366723344"/> + </object> </object> - <object class="NSButtonImageSource" key="NSAlternateImage" id="146608033"> - <string key="NSImageName">NSSwitch</string> + <string key="NSFrame">{{6, 101}, {504, 79}}</string> + <reference key="NSSuperview" ref="901871461"/> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Settings</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSBackgroundColor" ref="984563618"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> + </object> </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSTextField" id="1045854407"> - <reference key="NSNextResponder" ref="240715761"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{15, 36}, {163, 17}}</string> - <reference key="NSSuperview" ref="240715761"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="565573178"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Check for new mail every</string> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="1045854407"/> - <reference key="NSBackgroundColor" ref="232533406"/> - <reference key="NSTextColor" ref="447846610"/> - </object> - </object> - <object class="NSTextField" id="759571753"> - <reference key="NSNextResponder" ref="240715761"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{183, 31}, {37, 22}}</string> - <reference key="NSSuperview" ref="240715761"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="734490335"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="759571753"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="984563618"/> - <reference key="NSTextColor" ref="1055869631"/> - </object> - </object> - </object> - <string key="NSFrame">{{1, 1}, {311, 63}}</string> - <reference key="NSSuperview" ref="366723344"/> - </object> - </object> - <string key="NSFrame">{{17, 153}, {313, 79}}</string> - <reference key="NSSuperview" ref="329924970"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Settings</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSBackgroundColor" ref="984563618"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="240715761"/> - <int key="NSBorderType">1</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSBox" id="260850140"> - <reference key="NSNextResponder" ref="329924970"/> - <int key="NSvFlags">36</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="1055022429"> - <reference key="NSNextResponder" ref="260850140"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="499605821"> - <reference key="NSNextResponder" ref="1055022429"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{15, 16}, {84, 17}}</string> - <reference key="NSSuperview" ref="1055022429"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="556654335"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Play Sound</string> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="499605821"/> - <reference key="NSBackgroundColor" ref="232533406"/> - <reference key="NSTextColor" ref="447846610"/> - </object> - </object> - <object class="NSButton" id="836989661"> - <reference key="NSNextResponder" ref="1055022429"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{16, 41}, {163, 18}}</string> - <reference key="NSSuperview" ref="1055022429"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="474748877"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Use Growl Notification</string> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="836989661"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="154408030"/> - <reference key="NSAlternateImage" ref="146608033"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> + <reference key="NSContentView" ref="240715761"/> + <int key="NSBorderType">1</int> + <int key="NSBoxType">0</int> + <int key="NSTitlePosition">2</int> + <bool key="NSTransparent">NO</bool> </object> - </object> - <object class="NSPopUpButton" id="157715493"> - <reference key="NSNextResponder" ref="1055022429"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{110, 10}, {143, 26}}</string> - <reference key="NSSuperview" ref="1055022429"/> - <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="623068287"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="43957172"/> - <reference key="NSControlView" ref="157715493"/> - <int key="NSButtonFlags">109199615</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="747411100"> - <reference key="NSMenu" ref="263661056"/> - <string key="NSTitle">Item 1</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <int key="NSState">1</int> - <reference key="NSOnImage" ref="253178495"/> - <reference key="NSMixedImage" ref="1026465229"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="623068287"/> - </object> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="263661056"> - <string key="NSTitle">OtherViews</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="747411100"/> - <object class="NSMenuItem" id="570386752"> - <reference key="NSMenu" ref="263661056"/> - <string key="NSTitle">Item 2</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="253178495"/> - <reference key="NSMixedImage" ref="1026465229"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="623068287"/> - </object> - <object class="NSMenuItem" id="105209505"> - <reference key="NSMenu" ref="263661056"/> - <string key="NSTitle">Item 3</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="253178495"/> - <reference key="NSMixedImage" ref="1026465229"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="623068287"/> + <object class="NSBox" id="260850140"> + <reference key="NSNextResponder" ref="901871461"/> + <int key="NSvFlags">36</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="1055022429"> + <reference key="NSNextResponder" ref="260850140"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="499605821"> + <reference key="NSNextResponder" ref="1055022429"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{15, 16}, {84, 17}}</string> + <reference key="NSSuperview" ref="1055022429"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="556654335"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">Play Sound</string> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="499605821"/> + <reference key="NSBackgroundColor" ref="232533406"/> + <reference key="NSTextColor" ref="447846610"/> + </object> + </object> + <object class="NSButton" id="836989661"> + <reference key="NSNextResponder" ref="1055022429"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{16, 41}, {163, 18}}</string> + <reference key="NSSuperview" ref="1055022429"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="474748877"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Use Growl Notification</string> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="836989661"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">130</int> + <reference key="NSNormalImage" ref="154408030"/> + <reference key="NSAlternateImage" ref="146608033"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSPopUpButton" id="157715493"> + <reference key="NSNextResponder" ref="1055022429"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{110, 10}, {143, 26}}</string> + <reference key="NSSuperview" ref="1055022429"/> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="623068287"> + <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags2">2048</int> + <reference key="NSSupport" ref="43957172"/> + <reference key="NSControlView" ref="157715493"/> + <int key="NSButtonFlags">109199615</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <object class="NSMenuItem" key="NSMenuItem" id="747411100"> + <reference key="NSMenu" ref="263661056"/> + <string key="NSTitle">Item 1</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> + <reference key="NSOnImage" ref="253178495"/> + <reference key="NSMixedImage" ref="1026465229"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="623068287"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="263661056"> + <string key="NSTitle">OtherViews</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="747411100"/> + <object class="NSMenuItem" id="570386752"> + <reference key="NSMenu" ref="263661056"/> + <string key="NSTitle">Item 2</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="253178495"/> + <reference key="NSMixedImage" ref="1026465229"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="623068287"/> + </object> + <object class="NSMenuItem" id="105209505"> + <reference key="NSMenu" ref="263661056"/> + <string key="NSTitle">Item 3</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="253178495"/> + <reference key="NSMixedImage" ref="1026465229"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="623068287"/> + </object> + </object> + </object> + <int key="NSPreferredEdge">1</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + <int key="NSArrowPosition">2</int> + </object> + </object> </object> + <string key="NSFrame">{{1, 1}, {502, 67}}</string> + <reference key="NSSuperview" ref="260850140"/> + </object> + </object> + <string key="NSFrame">{{6, 4}, {504, 83}}</string> + <reference key="NSSuperview" ref="901871461"/> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Notification</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSBackgroundColor" ref="984563618"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> </object> </object> - <int key="NSPreferredEdge">1</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - <int key="NSArrowPosition">2</int> + <reference key="NSContentView" ref="1055022429"/> + <int key="NSBorderType">1</int> + <int key="NSBoxType">0</int> + <int key="NSTitlePosition">2</int> + <bool key="NSTransparent">NO</bool> </object> </object> + <string key="NSFrame">{{10, 33}, {516, 180}}</string> </object> - <string key="NSFrame">{{1, 1}, {311, 67}}</string> - <reference key="NSSuperview" ref="260850140"/> + <string key="NSLabel">Settings</string> + <reference key="NSColor" ref="232533406"/> + <reference key="NSTabView" ref="717484327"/> </object> </object> - <string key="NSFrame">{{17, 56}, {313, 83}}</string> - <reference key="NSSuperview" ref="329924970"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Notification</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSBackgroundColor" ref="984563618"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> - </object> + <reference key="NSSelectedTabViewItem" ref="235182473"/> + <reference key="NSFont" ref="43957172"/> + <int key="NSTvFlags">0</int> + <bool key="NSAllowTruncatedLabels">YES</bool> + <bool key="NSDrawsBackground">YES</bool> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1072132677"/> </object> - <reference key="NSContentView" ref="1055022429"/> - <int key="NSBorderType">1</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> </object> </object> - <string key="NSFrameSize">{347, 355}</string> + <string key="NSFrameSize">{562, 272}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> @@ -663,14 +898,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">auto_launch</string> - <reference key="source" ref="885398745"/> - <reference key="destination" ref="572484964"/> - </object> - <int key="connectionID">463</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">autoLaunch</string> <reference key="source" ref="885398745"/> <reference key="destination" ref="572484964"/> @@ -687,14 +914,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">souldList</string> - <reference key="source" ref="885398745"/> - <reference key="destination" ref="157715493"/> - </object> - <int key="connectionID">477</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">soundList</string> <reference key="source" ref="885398745"/> <reference key="destination" ref="157715493"/> @@ -709,6 +928,30 @@ </object> <int key="connectionID">479</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">userList</string> + <reference key="source" ref="885398745"/> + <reference key="destination" ref="313996060"/> + </object> + <int key="connectionID">506</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">addUser:</string> + <reference key="source" ref="885398745"/> + <reference key="destination" ref="728672173"/> + </object> + <int key="connectionID">507</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">removeUser:</string> + <reference key="source" ref="885398745"/> + <reference key="destination" ref="69799600"/> + </object> + <int key="connectionID">508</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -798,10 +1041,8 @@ <reference key="object" ref="329924970"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="440666959"/> - <reference ref="366723344"/> - <reference ref="260850140"/> <reference ref="153067193"/> + <reference ref="717484327"/> </object> <reference key="parent" ref="885398745"/> </object> @@ -826,98 +1067,95 @@ <reference key="parent" ref="153067193"/> </object> <object class="IBObjectRecord"> - <int key="objectID">429</int> - <reference key="object" ref="440666959"/> + <int key="objectID">455</int> + <reference key="object" ref="476705891"/> + <reference key="parent" ref="845846908"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">456</int> + <reference key="object" ref="189338223"/> + <reference key="parent" ref="845846908"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">480</int> + <reference key="object" ref="717484327"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="99905489"/> - <reference ref="422810936"/> - <reference ref="121839710"/> - <reference ref="879562125"/> + <reference ref="235182473"/> + <reference ref="335730758"/> </object> <reference key="parent" ref="329924970"/> </object> <object class="IBObjectRecord"> - <int key="objectID">423</int> - <reference key="object" ref="99905489"/> + <int key="objectID">481</int> + <reference key="object" ref="235182473"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="357500350"/> + <reference ref="1072132677"/> </object> - <reference key="parent" ref="440666959"/> + <reference key="parent" ref="717484327"/> </object> <object class="IBObjectRecord"> - <int key="objectID">424</int> - <reference key="object" ref="357500350"/> - <reference key="parent" ref="99905489"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">427</int> - <reference key="object" ref="422810936"/> + <int key="objectID">482</int> + <reference key="object" ref="335730758"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="189541624"/> + <reference ref="901871461"/> </object> - <reference key="parent" ref="440666959"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">428</int> - <reference key="object" ref="189541624"/> - <reference key="parent" ref="422810936"/> + <reference key="parent" ref="717484327"/> </object> <object class="IBObjectRecord"> - <int key="objectID">421</int> - <reference key="object" ref="121839710"/> + <int key="objectID">483</int> + <reference key="object" ref="901871461"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="712537576"/> + <reference ref="366723344"/> + <reference ref="260850140"/> </object> - <reference key="parent" ref="440666959"/> + <reference key="parent" ref="335730758"/> </object> <object class="IBObjectRecord"> - <int key="objectID">422</int> - <reference key="object" ref="712537576"/> - <reference key="parent" ref="121839710"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">425</int> - <reference key="object" ref="879562125"/> + <int key="objectID">484</int> + <reference key="object" ref="1072132677"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="119829698"/> + <reference ref="728672173"/> + <reference ref="69799600"/> + <reference ref="923777354"/> + <reference ref="440666959"/> + <reference ref="277519444"/> </object> - <reference key="parent" ref="440666959"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">426</int> - <reference key="object" ref="119829698"/> - <reference key="parent" ref="879562125"/> + <reference key="parent" ref="235182473"/> </object> <object class="IBObjectRecord"> <int key="objectID">430</int> <reference key="object" ref="366723344"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="52512316"/> - <reference ref="572484964"/> - <reference ref="1045854407"/> <reference ref="759571753"/> + <reference ref="1045854407"/> + <reference ref="572484964"/> + <reference ref="52512316"/> </object> - <reference key="parent" ref="329924970"/> + <reference key="parent" ref="901871461"/> </object> <object class="IBObjectRecord"> - <int key="objectID">397</int> - <reference key="object" ref="52512316"/> + <int key="objectID">415</int> + <reference key="object" ref="759571753"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="812362047"/> + <reference ref="734490335"/> </object> <reference key="parent" ref="366723344"/> </object> <object class="IBObjectRecord"> - <int key="objectID">398</int> - <reference key="object" ref="812362047"/> - <reference key="parent" ref="52512316"/> + <int key="objectID">393</int> + <reference key="object" ref="1045854407"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="565573178"/> + </object> + <reference key="parent" ref="366723344"/> </object> <object class="IBObjectRecord"> <int key="objectID">419</int> @@ -929,58 +1167,53 @@ <reference key="parent" ref="366723344"/> </object> <object class="IBObjectRecord"> - <int key="objectID">420</int> - <reference key="object" ref="623878357"/> - <reference key="parent" ref="572484964"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">393</int> - <reference key="object" ref="1045854407"/> + <int key="objectID">397</int> + <reference key="object" ref="52512316"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="565573178"/> + <reference ref="812362047"/> </object> <reference key="parent" ref="366723344"/> </object> <object class="IBObjectRecord"> + <int key="objectID">398</int> + <reference key="object" ref="812362047"/> + <reference key="parent" ref="52512316"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">420</int> + <reference key="object" ref="623878357"/> + <reference key="parent" ref="572484964"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">394</int> <reference key="object" ref="565573178"/> <reference key="parent" ref="1045854407"/> </object> <object class="IBObjectRecord"> - <int key="objectID">415</int> - <reference key="object" ref="759571753"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="734490335"/> - </object> - <reference key="parent" ref="366723344"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">416</int> <reference key="object" ref="734490335"/> <reference key="parent" ref="759571753"/> </object> <object class="IBObjectRecord"> - <int key="objectID">455</int> - <reference key="object" ref="476705891"/> - <reference key="parent" ref="845846908"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">456</int> - <reference key="object" ref="189338223"/> - <reference key="parent" ref="845846908"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">476</int> <reference key="object" ref="260850140"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="836989661"/> - <reference ref="499605821"/> <reference ref="157715493"/> + <reference ref="499605821"/> + <reference ref="836989661"/> </object> - <reference key="parent" ref="329924970"/> + <reference key="parent" ref="901871461"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">468</int> + <reference key="object" ref="157715493"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="623068287"/> + </object> + <reference key="parent" ref="260850140"/> </object> <object class="IBObjectRecord"> <int key="objectID">474</int> @@ -992,11 +1225,6 @@ <reference key="parent" ref="260850140"/> </object> <object class="IBObjectRecord"> - <int key="objectID">475</int> - <reference key="object" ref="556654335"/> - <reference key="parent" ref="499605821"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">465</int> <reference key="object" ref="836989661"/> <object class="NSMutableArray" key="children"> @@ -1011,13 +1239,9 @@ <reference key="parent" ref="836989661"/> </object> <object class="IBObjectRecord"> - <int key="objectID">468</int> - <reference key="object" ref="157715493"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="623068287"/> - </object> - <reference key="parent" ref="260850140"/> + <int key="objectID">475</int> + <reference key="object" ref="556654335"/> + <reference key="parent" ref="499605821"/> </object> <object class="IBObjectRecord"> <int key="objectID">469</int> @@ -1033,15 +1257,15 @@ <reference key="object" ref="263661056"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="105209505"/> - <reference ref="570386752"/> <reference ref="747411100"/> + <reference ref="570386752"/> + <reference ref="105209505"/> </object> <reference key="parent" ref="623068287"/> </object> <object class="IBObjectRecord"> - <int key="objectID">473</int> - <reference key="object" ref="105209505"/> + <int key="objectID">471</int> + <reference key="object" ref="747411100"/> <reference key="parent" ref="263661056"/> </object> <object class="IBObjectRecord"> @@ -1050,10 +1274,164 @@ <reference key="parent" ref="263661056"/> </object> <object class="IBObjectRecord"> - <int key="objectID">471</int> - <reference key="object" ref="747411100"/> + <int key="objectID">473</int> + <reference key="object" ref="105209505"/> <reference key="parent" ref="263661056"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">429</int> + <reference key="object" ref="440666959"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="879562125"/> + <reference ref="121839710"/> + <reference ref="422810936"/> + <reference ref="99905489"/> + </object> + <reference key="parent" ref="1072132677"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">425</int> + <reference key="object" ref="879562125"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="119829698"/> + </object> + <reference key="parent" ref="440666959"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">421</int> + <reference key="object" ref="121839710"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="712537576"/> + </object> + <reference key="parent" ref="440666959"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">427</int> + <reference key="object" ref="422810936"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="189541624"/> + </object> + <reference key="parent" ref="440666959"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">423</int> + <reference key="object" ref="99905489"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="357500350"/> + </object> + <reference key="parent" ref="440666959"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">424</int> + <reference key="object" ref="357500350"/> + <reference key="parent" ref="99905489"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">428</int> + <reference key="object" ref="189541624"/> + <reference key="parent" ref="422810936"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">422</int> + <reference key="object" ref="712537576"/> + <reference key="parent" ref="121839710"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">426</int> + <reference key="object" ref="119829698"/> + <reference key="parent" ref="879562125"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">485</int> + <reference key="object" ref="277519444"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="934312738"/> + <reference ref="1015018427"/> + <reference ref="313996060"/> + </object> + <reference key="parent" ref="1072132677"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">486</int> + <reference key="object" ref="934312738"/> + <reference key="parent" ref="277519444"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">487</int> + <reference key="object" ref="1015018427"/> + <reference key="parent" ref="277519444"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">488</int> + <reference key="object" ref="313996060"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="217188050"/> + </object> + <reference key="parent" ref="277519444"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">490</int> + <reference key="object" ref="217188050"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="643484397"/> + </object> + <reference key="parent" ref="313996060"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">493</int> + <reference key="object" ref="643484397"/> + <reference key="parent" ref="217188050"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">496</int> + <reference key="object" ref="728672173"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="887912069"/> + </object> + <reference key="parent" ref="1072132677"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">497</int> + <reference key="object" ref="887912069"/> + <reference key="parent" ref="728672173"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">498</int> + <reference key="object" ref="69799600"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="537221579"/> + </object> + <reference key="parent" ref="1072132677"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">499</int> + <reference key="object" ref="537221579"/> + <reference key="parent" ref="69799600"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">504</int> + <reference key="object" ref="923777354"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="470048455"/> + </object> + <reference key="parent" ref="1072132677"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">505</int> + <reference key="object" ref="470048455"/> + <reference key="parent" ref="923777354"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1106,13 +1484,30 @@ <string>473.IBPluginDependency</string> <string>474.IBPluginDependency</string> <string>475.IBPluginDependency</string> + <string>480.IBPluginDependency</string> + <string>481.IBPluginDependency</string> + <string>482.IBPluginDependency</string> + <string>483.IBPluginDependency</string> + <string>484.IBPluginDependency</string> + <string>485.IBPluginDependency</string> + <string>486.IBPluginDependency</string> + <string>487.IBPluginDependency</string> + <string>488.IBPluginDependency</string> + <string>490.IBPluginDependency</string> + <string>493.IBPluginDependency</string> + <string>496.IBPluginDependency</string> + <string>497.IBPluginDependency</string> + <string>498.IBPluginDependency</string> + <string>499.IBPluginDependency</string> + <string>504.IBPluginDependency</string> + <string>505.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilderKit</string> - <string>{{313, 699}, {183, 123}}</string> + <string>{{931, 730}, {183, 123}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1120,9 +1515,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{329, 219}, {347, 355}}</string> + <string>{{345, 381}, {562, 272}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{329, 219}, {347, 355}}</string> + <string>{{345, 381}, {562, 272}}</string> <integer value="0"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1155,6 +1550,23 @@ <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> + <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> + <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> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -1177,7 +1589,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">479</int> + <int key="maxID">508</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1235,6 +1647,9 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>addUser:</string> + <string>numberOfRowsInTableView:</string> + <string>removeUser:</string> <string>save:</string> <string>soundSelect:</string> <string>soundSelected:</string> @@ -1244,6 +1659,9 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -1256,6 +1674,7 @@ <string>interval</string> <string>password</string> <string>soundList</string> + <string>userList</string> <string>username</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -1267,6 +1686,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> English.lproj/MainMenu.nib/designable.nib English.lproj/MainMenu.nib/keyedobjects.nib @@ -18,7 +18,7 @@ class GNPreferences < OSX::NSObject @@soundList = [] - attr_accessor :username, :password, :interval, :autoLaunch, :growl, :sound + attr_accessor :username, :accounts, :password, :interval, :autoLaunch, :growl, :sound def init super_init @@ -26,6 +26,18 @@ class GNPreferences < OSX::NSObject defaults = NSUserDefaults.standardUserDefaults @username = defaults.stringForKey("username") || "" + + @accounts = NSMutableArray.alloc.init + defaults.stringArrayForKey("usernames").each do |u| + @accounts << GNAccount.alloc.initWithName(u) + end + + # import the single username from version before 0.3 + if @accounts.size == 0 && @username.length > 0 + @accounts << GNAccount.alloc.initWithName(@username) + end + + @interval = defaults.integerForKey("interval") || DEFAULT_INTERVAL @growl = defaults.boolForKey("growl") @sound = defaults.stringForKey("sound") || SOUND_NONE @@ -37,6 +49,20 @@ class GNPreferences < OSX::NSObject self end + # clean accounts changes + # return true if there's any changes that need to be written back + def merge_accounts_change + changed = false + @accounts.each do |account| + if account.new? + #new added and deleted account, just leave it + @accounts.removeObject(account) if account.deleted? + else + changed = true if account.changed? + end + end + end + def writeBack @interval = DEFAULT_INTERVAL unless @interval.between?(MIN_INTERVAL, MAX_INTERVAL) @@ -44,14 +70,19 @@ class GNPreferences < OSX::NSObject defaults.setInteger_forKey(@interval, "interval") defaults.setObject_forKey(@username, "username") + + defaults.setObject_forKey(@accounts.collect{ |a| a.username }, "usernames") defaults.setBool_forKey(@growl, "growl") defaults.setObject_forKey(@sound, "sound") # save to Info.plist defaults.synchronize - # save to default keychain - GNKeychain.alloc.init.set_account(@username, @password) + # save accounts to default keychain + #TODO: still don't delete removed accounts for now, perhaps should add this feature to make the keychain clean + @accounts.each do |account| + GNKeychain.alloc.init.set_account(account.username, account.password) if !account.deleted? && account.changed? + end # save to startup items GNStartItems.alloc.init.set(@autoLaunch) @@ -63,6 +94,7 @@ class GNPreferences < OSX::NSObject NSDictionary.dictionaryWithObjectsAndKeys( DEFAULT_INTERVAL, "interval", "", "username", + [], "usernames", "", "password", false, "auto_launch", SOUND_NONE, "sound", GNPreferences.rb @@ -18,16 +18,24 @@ class GNPreferencesWindow < OSX::NSWindow ib_outlet :autoLaunch ib_outlet :growl ib_outlet :soundList + ib_outlet :userList ib_action :save ib_action :soundSelected + ib_action :addUser + ib_action :removeUser def awakeFromNib @soundList.removeAllItems GNPreferences.sounds.each { |s| @soundList.addItemWithTitle(s) } load_defaults - reload_ui self.setDelegate(self) + @userList.dataSource = self + @userList.delegate = self + @username.delegate = self + @password.delegate = self + + reload_ui end def windowWillClose(notification) @@ -40,8 +48,6 @@ class GNPreferencesWindow < OSX::NSWindow self.orderOut(nil) interval = @interval.integerValue - username = @username.stringValue - password = @password.stringValue authChanged = false resetTimer = false @@ -51,12 +57,7 @@ class GNPreferencesWindow < OSX::NSWindow resetTimer = true end - if (username.length > 0 && password.length > 0) && - (username != @preferences.username || password != @preferences.password) - @preferences.username = username - @preferences.password = password - authChanged = true - end + authChanged = @preferences.merge_accounts_change @preferences.autoLaunch = @autoLaunch.state == NSOnState ? true : false @preferences.growl = @growl.state == NSOnState ? true : false @@ -77,12 +78,12 @@ class GNPreferencesWindow < OSX::NSWindow end def reload_ui - @username.setTitleWithMnemonic(@preferences.username) - @password.setTitleWithMnemonic(@preferences.password) @interval.setTitleWithMnemonic(@preferences.interval.to_s) @autoLaunch.setState(@preferences.autoLaunch ? NSOnState : NSOffState) @growl.setState(@preferences.growl ? NSOnState : NSOffState) @soundList.selectItemWithTitle(@preferences.sound) + @userList.reloadData + show_username_and_password end def soundSelect(sender) @@ -90,4 +91,70 @@ class GNPreferencesWindow < OSX::NSWindow sound.play end end + + def addUser(sender) + account = GNAccount.alloc.init + account.username = "username" + account.password = "" + @preferences.accounts << account + @userList.reloadData + @userList.selectRow_byExtendingSelection(accounts.size - 1, false) + @username.selectText(self) + end + + def removeUser(sender) + selected_account = current_account + if selected_account + selected_account.destroy + @userList.reloadData + end + + show_username_and_password + end + + def numberOfRowsInTableView(sender) + accounts.size + end + + def tableView_objectValueForTableColumn_row(tableView, tableColumn, row) + account = accounts[row] + account ? account.username : "" + end + + def tableView_setObjectValue_forTableColumn_row(tableView, object, tableColumn, row) + end + + def tableViewSelectionDidChange(notification) + show_username_and_password + end + + def controlTextDidChange(notification) + selected_account = current_account + if selected_account + field = notification.object + if field == @username + selected_account.username = @username.stringValue + @userList.reloadData + elsif field == @password + selected_account.password = @password.stringValue + end + end + end + + private + def accounts + @preferences.accounts.reject { |a| a.deleted? } + end + + def current_account + accounts[@userList.selectedRow] + end + + def show_username_and_password + selected_account = current_account + if selected_account + @username.setTitleWithMnemonic(selected_account.username) + @password.setTitleWithMnemonic(selected_account.password) + end + end end GNPreferencesWindow.rb @@ -25,6 +25,7 @@ 1A709B060E98EC34009672CC /* error.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1A709B030E98EC34009672CC /* error.tiff */; }; 1A709B070E98EC34009672CC /* mail.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1A709B040E98EC34009672CC /* mail.tiff */; }; 1A8653880EC3C81D00384B3E /* GNPreferences.rb in Resources */ = {isa = PBXBuildFile; fileRef = 1A8653870EC3C81D00384B3E /* GNPreferences.rb */; }; + 1ABAB9A10F0F9EAA00A758AF /* GNAccount.rb in Resources */ = {isa = PBXBuildFile; fileRef = 1ABAB9A00F0F9EAA00A758AF /* GNAccount.rb */; }; 1AE07F560EB9EE5F0096B4AE /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 1AE07F550EB9EE5F0096B4AE /* CHANGELOG */; }; 4DDCA7060ACC9A6100E082CE /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; 4DDCA7070ACC9A6100E082CE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; @@ -68,6 +69,7 @@ 1A709B030E98EC34009672CC /* error.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = error.tiff; sourceTree = "<group>"; }; 1A709B040E98EC34009672CC /* mail.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = mail.tiff; sourceTree = "<group>"; }; 1A8653870EC3C81D00384B3E /* GNPreferences.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = GNPreferences.rb; sourceTree = "<group>"; }; + 1ABAB9A00F0F9EAA00A758AF /* GNAccount.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = GNAccount.rb; sourceTree = "<group>"; }; 1AE07F550EB9EE5F0096B4AE /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; }; @@ -137,6 +139,7 @@ 1A33B0ED0E98C070002F815F /* GNStartItems.rb */, 1A58F8B20EB88D28004D74BB /* Growl.rb */, 1A8653870EC3C81D00384B3E /* GNPreferences.rb */, + 1ABAB9A00F0F9EAA00A758AF /* GNAccount.rb */, ); name = Models; sourceTree = "<group>"; @@ -276,6 +279,7 @@ 1A58F8B50EB88D60004D74BB /* GNGrowlController.rb in Resources */, 1AE07F560EB9EE5F0096B4AE /* CHANGELOG in Resources */, 1A8653880EC3C81D00384B3E /* GNPreferences.rb in Resources */, + 1ABAB9A10F0F9EAA00A758AF /* GNAccount.rb in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; Gmail Notifr.xcodeproj/project.pbxproj 654fe2b8a68e411d7c522da937a74d0382898291 ashchan ashchan@gmail.com http://github.com/ashchan/gmail-notifr/commit/bb8a049e828188be3f05185423fa18ac2dfbd33f bb8a049e828188be3f05185423fa18ac2dfbd33f 2009-01-03T08:27:20-08:00 2009-01-03T08:27:20-08:00 preferences refactoring for multiple accounts support 58024ae1de121841c9fc238cf56b4ee024eb66db ashchan ashchan@gmail.com