Changeset 68787 for branches/gsoc10-gui
- Timestamp:
- Jun 13, 2010, 5:04:01 PM (14 years ago)
- Location:
- branches/gsoc10-gui/Pallet
- Files:
-
- 4 edited
-
English.lproj/MainMenu.xib (modified) (77 diffs)
-
MPActionsController.h (modified) (2 diffs)
-
MPActionsController.m (modified) (4 diffs)
-
PortsTableController.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/gsoc10-gui/Pallet/English.lproj/MainMenu.xib
r68443 r68787 13 13 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 14 14 <bool key="EncodedWithXMLCoder">YES</bool> 15 <integer value="840"/> 16 <integer value="430"/> 17 <integer value="435"/> 15 <integer value="850"/> 18 16 </object> 19 17 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 1375 1373 <object class="NSMutableArray" key="NSSubviews"> 1376 1374 <bool key="EncodedWithXMLCoder">YES</bool> 1377 <object class="NSRuleEditorViewSliceRow" id=" 363486199">1375 <object class="NSRuleEditorViewSliceRow" id="156337374"> 1378 1376 <reference key="NSNextResponder" ref="887125716"/> 1379 1377 <int key="NSvFlags">290</int> 1380 1378 <object class="NSMutableArray" key="NSSubviews"> 1381 1379 <bool key="EncodedWithXMLCoder">YES</bool> 1382 <object class="NSButton" id=" 227789221">1383 <reference key="NSNextResponder" ref=" 363486199"/>1380 <object class="NSButton" id="624981652"> 1381 <reference key="NSNextResponder" ref="156337374"/> 1384 1382 <int key="NSvFlags">257</int> 1385 1383 <string key="NSFrame">{{741, 4}, {18, 18}}</string> 1386 <reference key="NSSuperview" ref="363486199"/> 1387 <reference key="NSNextKeyView" ref="1018513936"/> 1384 <reference key="NSSuperview" ref="156337374"/> 1385 <reference key="NSWindow"/> 1386 <reference key="NSNextKeyView" ref="936953994"/> 1388 1387 <int key="NSTag">-1</int> 1389 1388 <bool key="NSEnabled">YES</bool> … … 1413 1412 </object> 1414 1413 </object> 1415 <reference key="NSControlView" ref=" 227789221"/>1414 <reference key="NSControlView" ref="624981652"/> 1416 1415 <string key="NSAction">_addOption:</string> 1417 <reference key="NSTarget" ref=" 363486199"/>1416 <reference key="NSTarget" ref="156337374"/> 1418 1417 <int key="NSButtonFlags">-2038284033</int> 1419 1418 <int key="NSButtonFlags2">36</int> … … 1428 1427 </object> 1429 1428 </object> 1430 <object class="NSButton" id=" 49769852">1431 <reference key="NSNextResponder" ref=" 363486199"/>1429 <object class="NSButton" id="891926121"> 1430 <reference key="NSNextResponder" ref="156337374"/> 1432 1431 <int key="NSvFlags">257</int> 1433 1432 <string key="NSFrame">{{721, 4}, {18, 18}}</string> 1434 <reference key="NSSuperview" ref="363486199"/> 1435 <reference key="NSNextKeyView" ref="227789221"/> 1433 <reference key="NSSuperview" ref="156337374"/> 1434 <reference key="NSWindow"/> 1435 <reference key="NSNextKeyView" ref="624981652"/> 1436 1436 <int key="NSTag">-1</int> 1437 1437 <bool key="NSEnabled">YES</bool> … … 1457 1457 </object> 1458 1458 </object> 1459 <reference key="NSControlView" ref=" 49769852"/>1459 <reference key="NSControlView" ref="891926121"/> 1460 1460 <string key="NSAction">_deleteOption:</string> 1461 <reference key="NSTarget" ref=" 363486199"/>1461 <reference key="NSTarget" ref="156337374"/> 1462 1462 <int key="NSButtonFlags">-2038284033</int> 1463 1463 <int key="NSButtonFlags2">36</int> … … 1469 1469 </object> 1470 1470 <object class="NSPopUpButton" id="111744215"> 1471 <reference key="NSNextResponder" ref=" 363486199"/>1471 <reference key="NSNextResponder" ref="156337374"/> 1472 1472 <int key="NSvFlags">256</int> 1473 1473 <string key="NSFrame">{{7, 3}, {58, 19}}</string> 1474 <reference key="NSSuperview" ref="363486199"/> 1474 <reference key="NSSuperview" ref="156337374"/> 1475 <reference key="NSWindow"/> 1475 1476 <reference key="NSNextKeyView" ref="471209054"/> 1476 1477 <int key="NSTag">-1</int> … … 1536 1537 </object> 1537 1538 <object class="NSPopUpButton" id="471209054"> 1538 <reference key="NSNextResponder" ref=" 363486199"/>1539 <reference key="NSNextResponder" ref="156337374"/> 1539 1540 <int key="NSvFlags">256</int> 1540 1541 <string key="NSFrame">{{71, 3}, {167, 19}}</string> 1541 <reference key="NSSuperview" ref="363486199"/> 1542 <reference key="NSNextKeyView" ref="49769852"/> 1542 <reference key="NSSuperview" ref="156337374"/> 1543 <reference key="NSWindow"/> 1544 <reference key="NSNextKeyView" ref="891926121"/> 1543 1545 <int key="NSTag">-1</int> 1544 1546 <bool key="NSEnabled">YES</bool> … … 1583 1585 <string key="NSFrameSize">{769, 25}</string> 1584 1586 <reference key="NSSuperview" ref="887125716"/> 1587 <reference key="NSWindow"/> 1585 1588 <reference key="NSNextKeyView" ref="111744215"/> 1586 1589 <int key="NSRuleRowIndex">0</int> … … 1598 1601 <object class="NSMutableArray" key="NSRuleOptionItems"> 1599 1602 <bool key="EncodedWithXMLCoder">YES</bool> 1600 <object class="NSMutableDictionary" id=" 1068089292">1603 <object class="NSMutableDictionary" id="211869200"> 1601 1604 <bool key="EncodedWithXMLCoder">YES</bool> 1602 1605 <object class="NSArray" key="dict.sortedKeys"> … … 1624 1627 </object> 1625 1628 </object> 1626 <object class="NSMutableDictionary" id=" 672539328">1629 <object class="NSMutableDictionary" id="38677048"> 1627 1630 <bool key="EncodedWithXMLCoder">YES</bool> 1628 1631 <object class="NSArray" key="dict.sortedKeys"> … … 1641 1644 <string key="NSRuleOptionInitialFrames.0">{{7, 3}, {58, 19}}</string> 1642 1645 <string key="NSRuleOptionInitialFrames.1">{{71, 3}, {167, 19}}</string> 1643 <reference key="NSRuleOptionAddButton" ref=" 227789221"/>1644 <reference key="NSRuleOptionSubtractButton" ref=" 49769852"/>1646 <reference key="NSRuleOptionAddButton" ref="624981652"/> 1647 <reference key="NSRuleOptionSubtractButton" ref="891926121"/> 1645 1648 <int key="NSRuleOptionRowType">0</int> 1646 1649 <int key="NSRuleOptionPlusButtonRowType">0</int> 1647 1650 <bool key="NSRuleOptionEditable">YES</bool> 1648 1651 </object> 1649 <object class="NSRuleEditorViewSliceRow" id=" 1018513936">1652 <object class="NSRuleEditorViewSliceRow" id="936953994"> 1650 1653 <reference key="NSNextResponder" ref="887125716"/> 1651 1654 <int key="NSvFlags">290</int> 1652 1655 <object class="NSMutableArray" key="NSSubviews"> 1653 1656 <bool key="EncodedWithXMLCoder">YES</bool> 1654 <object class="NSButton" id=" 37475490">1655 <reference key="NSNextResponder" ref=" 1018513936"/>1657 <object class="NSButton" id="270724053"> 1658 <reference key="NSNextResponder" ref="936953994"/> 1656 1659 <int key="NSvFlags">257</int> 1657 1660 <string key="NSFrame">{{741, 4}, {18, 18}}</string> 1658 <reference key="NSSuperview" ref="1018513936"/> 1659 <reference key="NSNextKeyView" ref="215802558"/> 1661 <reference key="NSSuperview" ref="936953994"/> 1662 <reference key="NSWindow"/> 1663 <reference key="NSNextKeyView" ref="56028161"/> 1660 1664 <int key="NSTag">-1</int> 1661 1665 <bool key="NSEnabled">YES</bool> … … 1681 1685 </object> 1682 1686 </object> 1683 <reference key="NSControlView" ref=" 37475490"/>1687 <reference key="NSControlView" ref="270724053"/> 1684 1688 <string key="NSAction">_addOption:</string> 1685 <reference key="NSTarget" ref=" 1018513936"/>1689 <reference key="NSTarget" ref="936953994"/> 1686 1690 <int key="NSButtonFlags">-2038284033</int> 1687 1691 <int key="NSButtonFlags2">36</int> … … 1692 1696 </object> 1693 1697 </object> 1694 <object class="NSButton" id=" 874687029">1695 <reference key="NSNextResponder" ref=" 1018513936"/>1698 <object class="NSButton" id="443228088"> 1699 <reference key="NSNextResponder" ref="936953994"/> 1696 1700 <int key="NSvFlags">257</int> 1697 1701 <string key="NSFrame">{{721, 4}, {18, 18}}</string> 1698 <reference key="NSSuperview" ref="1018513936"/> 1699 <reference key="NSNextKeyView" ref="37475490"/> 1702 <reference key="NSSuperview" ref="936953994"/> 1703 <reference key="NSWindow"/> 1704 <reference key="NSNextKeyView" ref="270724053"/> 1700 1705 <int key="NSTag">-1</int> 1701 1706 <bool key="NSEnabled">YES</bool> … … 1721 1726 </object> 1722 1727 </object> 1723 <reference key="NSControlView" ref=" 874687029"/>1728 <reference key="NSControlView" ref="443228088"/> 1724 1729 <string key="NSAction">_deleteOption:</string> 1725 <reference key="NSTarget" ref=" 1018513936"/>1730 <reference key="NSTarget" ref="936953994"/> 1726 1731 <int key="NSButtonFlags">-2038284033</int> 1727 1732 <int key="NSButtonFlags2">36</int> … … 1733 1738 </object> 1734 1739 <object class="NSPopUpButton" id="677349919"> 1735 <reference key="NSNextResponder" ref=" 1018513936"/>1740 <reference key="NSNextResponder" ref="936953994"/> 1736 1741 <int key="NSvFlags">256</int> 1737 1742 <string key="NSFrame">{{37, 3}, {76, 19}}</string> 1738 <reference key="NSSuperview" ref="1018513936"/> 1743 <reference key="NSSuperview" ref="936953994"/> 1744 <reference key="NSWindow"/> 1739 1745 <reference key="NSNextKeyView" ref="855084085"/> 1740 1746 <int key="NSTag">-1</int> … … 1816 1822 </object> 1817 1823 <object class="NSPopUpButton" id="855084085"> 1818 <reference key="NSNextResponder" ref=" 1018513936"/>1824 <reference key="NSNextResponder" ref="936953994"/> 1819 1825 <int key="NSvFlags">256</int> 1820 1826 <string key="NSFrame">{{119, 3}, {95, 19}}</string> 1821 <reference key="NSSuperview" ref="1018513936"/> 1827 <reference key="NSSuperview" ref="936953994"/> 1828 <reference key="NSWindow"/> 1822 1829 <reference key="NSNextKeyView" ref="309287992"/> 1823 1830 <int key="NSTag">-1</int> … … 1911 1918 </object> 1912 1919 <object class="NSTextField" id="309287992"> 1913 <reference key="NSNextResponder" ref=" 1018513936"/>1920 <reference key="NSNextResponder" ref="936953994"/> 1914 1921 <int key="NSvFlags">256</int> 1915 1922 <string key="NSFrame">{{220, 4}, {61, 18}}</string> 1916 <reference key="NSSuperview" ref="1018513936"/> 1917 <reference key="NSNextKeyView" ref="874687029"/> 1923 <reference key="NSSuperview" ref="936953994"/> 1924 <reference key="NSWindow"/> 1925 <reference key="NSNextKeyView" ref="443228088"/> 1918 1926 <bool key="NSEnabled">YES</bool> 1919 1927 <object class="NSTextFieldCell" key="NSCell"> … … 1931 1939 <string key="NSFrame">{{0, 25}, {769, 25}}</string> 1932 1940 <reference key="NSSuperview" ref="887125716"/> 1941 <reference key="NSWindow"/> 1933 1942 <reference key="NSNextKeyView" ref="677349919"/> 1934 1943 <int key="NSRuleRowIndex">1</int> … … 1948 1957 <object class="NSMutableArray" key="NSRuleOptionItems"> 1949 1958 <bool key="EncodedWithXMLCoder">YES</bool> 1950 <object class="NSMutableDictionary" id=" 880775721">1959 <object class="NSMutableDictionary" id="173485813"> 1951 1960 <bool key="EncodedWithXMLCoder">YES</bool> 1952 1961 <object class="NSArray" key="dict.sortedKeys"> … … 1975 1984 </object> 1976 1985 </object> 1977 <object class="NSMutableDictionary" id=" 17599908">1986 <object class="NSMutableDictionary" id="375500148"> 1978 1987 <bool key="EncodedWithXMLCoder">YES</bool> 1979 1988 <object class="NSArray" key="dict.sortedKeys"> … … 1988 1997 </object> 1989 1998 </object> 1990 <object class="NSMutableDictionary" id=" 729925139">1999 <object class="NSMutableDictionary" id="293689974"> 1991 2000 <bool key="EncodedWithXMLCoder">YES</bool> 1992 2001 <object class="NSArray" key="dict.sortedKeys"> … … 2006 2015 <string key="NSRuleOptionInitialFrames.1">{{119, 3}, {95, 19}}</string> 2007 2016 <string key="NSRuleOptionInitialFrames.2">{{220, 4}, {61, 18}}</string> 2008 <reference key="NSRuleOptionAddButton" ref=" 37475490"/>2009 <reference key="NSRuleOptionSubtractButton" ref=" 874687029"/>2017 <reference key="NSRuleOptionAddButton" ref="270724053"/> 2018 <reference key="NSRuleOptionSubtractButton" ref="443228088"/> 2010 2019 <int key="NSRuleOptionRowType">0</int> 2011 2020 <int key="NSRuleOptionPlusButtonRowType">0</int> 2012 2021 <bool key="NSRuleOptionEditable">YES</bool> 2013 2022 </object> 2014 <object class="NSRuleEditorViewSliceRow" id=" 215802558">2023 <object class="NSRuleEditorViewSliceRow" id="56028161"> 2015 2024 <reference key="NSNextResponder" ref="887125716"/> 2016 2025 <int key="NSvFlags">290</int> 2017 2026 <object class="NSMutableArray" key="NSSubviews"> 2018 2027 <bool key="EncodedWithXMLCoder">YES</bool> 2019 <object class="NSButton" id=" 916286195">2020 <reference key="NSNextResponder" ref=" 215802558"/>2028 <object class="NSButton" id="853253325"> 2029 <reference key="NSNextResponder" ref="56028161"/> 2021 2030 <int key="NSvFlags">257</int> 2022 2031 <string key="NSFrame">{{741, 4}, {18, 18}}</string> 2023 <reference key="NSSuperview" ref="215802558"/> 2032 <reference key="NSSuperview" ref="56028161"/> 2033 <reference key="NSWindow"/> 2024 2034 <reference key="NSNextKeyView" ref="872100568"/> 2025 2035 <int key="NSTag">-1</int> … … 2046 2056 </object> 2047 2057 </object> 2048 <reference key="NSControlView" ref=" 916286195"/>2058 <reference key="NSControlView" ref="853253325"/> 2049 2059 <string key="NSAction">_addOption:</string> 2050 <reference key="NSTarget" ref=" 215802558"/>2060 <reference key="NSTarget" ref="56028161"/> 2051 2061 <int key="NSButtonFlags">-2038284033</int> 2052 2062 <int key="NSButtonFlags2">36</int> … … 2057 2067 </object> 2058 2068 </object> 2059 <object class="NSButton" id=" 502111979">2060 <reference key="NSNextResponder" ref=" 215802558"/>2069 <object class="NSButton" id="282999969"> 2070 <reference key="NSNextResponder" ref="56028161"/> 2061 2071 <int key="NSvFlags">257</int> 2062 2072 <string key="NSFrame">{{721, 4}, {18, 18}}</string> 2063 <reference key="NSSuperview" ref="215802558"/> 2064 <reference key="NSNextKeyView" ref="916286195"/> 2073 <reference key="NSSuperview" ref="56028161"/> 2074 <reference key="NSWindow"/> 2075 <reference key="NSNextKeyView" ref="853253325"/> 2065 2076 <int key="NSTag">-1</int> 2066 2077 <bool key="NSEnabled">YES</bool> … … 2086 2097 </object> 2087 2098 </object> 2088 <reference key="NSControlView" ref=" 502111979"/>2099 <reference key="NSControlView" ref="282999969"/> 2089 2100 <string key="NSAction">_deleteOption:</string> 2090 <reference key="NSTarget" ref=" 215802558"/>2101 <reference key="NSTarget" ref="56028161"/> 2091 2102 <int key="NSButtonFlags">-2038284033</int> 2092 2103 <int key="NSButtonFlags2">36</int> … … 2098 2109 </object> 2099 2110 <object class="NSPopUpButton" id="974900885"> 2100 <reference key="NSNextResponder" ref=" 215802558"/>2111 <reference key="NSNextResponder" ref="56028161"/> 2101 2112 <int key="NSvFlags">256</int> 2102 2113 <string key="NSFrame">{{37, 3}, {64, 19}}</string> 2103 <reference key="NSSuperview" ref="215802558"/> 2114 <reference key="NSSuperview" ref="56028161"/> 2115 <reference key="NSWindow"/> 2104 2116 <reference key="NSNextKeyView" ref="207821348"/> 2105 2117 <int key="NSTag">-1</int> … … 2156 2168 </object> 2157 2169 <object class="NSPopUpButton" id="207821348"> 2158 <reference key="NSNextResponder" ref=" 215802558"/>2170 <reference key="NSNextResponder" ref="56028161"/> 2159 2171 <int key="NSvFlags">256</int> 2160 2172 <string key="NSFrame">{{107, 3}, {46, 19}}</string> 2161 <reference key="NSSuperview" ref="215802558"/> 2173 <reference key="NSSuperview" ref="56028161"/> 2174 <reference key="NSWindow"/> 2162 2175 <reference key="NSNextKeyView" ref="11724982"/> 2163 2176 <int key="NSTag">-1</int> … … 2203 2216 </object> 2204 2217 <object class="NSPopUpButton" id="11724982"> 2205 <reference key="NSNextResponder" ref=" 215802558"/>2218 <reference key="NSNextResponder" ref="56028161"/> 2206 2219 <int key="NSvFlags">256</int> 2207 2220 <string key="NSFrame">{{159, 3}, {155, 19}}</string> 2208 <reference key="NSSuperview" ref="215802558"/> 2209 <reference key="NSNextKeyView" ref="502111979"/> 2221 <reference key="NSSuperview" ref="56028161"/> 2222 <reference key="NSWindow"/> 2223 <reference key="NSNextKeyView" ref="282999969"/> 2210 2224 <int key="NSTag">-1</int> 2211 2225 <bool key="NSEnabled">YES</bool> … … 2300 2314 <string key="NSFrame">{{0, 50}, {769, 25}}</string> 2301 2315 <reference key="NSSuperview" ref="887125716"/> 2316 <reference key="NSWindow"/> 2302 2317 <reference key="NSNextKeyView" ref="974900885"/> 2303 2318 <int key="NSRuleRowIndex">2</int> … … 2317 2332 <object class="NSMutableArray" key="NSRuleOptionItems"> 2318 2333 <bool key="EncodedWithXMLCoder">YES</bool> 2319 <object class="NSMutableDictionary" id=" 539965909">2334 <object class="NSMutableDictionary" id="998086679"> 2320 2335 <bool key="EncodedWithXMLCoder">YES</bool> 2321 2336 <object class="NSArray" key="dict.sortedKeys"> … … 2344 2359 </object> 2345 2360 </object> 2346 <object class="NSMutableDictionary" id="6 35329650">2361 <object class="NSMutableDictionary" id="699004508"> 2347 2362 <bool key="EncodedWithXMLCoder">YES</bool> 2348 2363 <object class="NSArray" key="dict.sortedKeys"> … … 2357 2372 </object> 2358 2373 </object> 2359 <object class="NSMutableDictionary" id=" 773622241">2374 <object class="NSMutableDictionary" id="30477181"> 2360 2375 <bool key="EncodedWithXMLCoder">YES</bool> 2361 2376 <object class="NSArray" key="dict.sortedKeys"> … … 2375 2390 <string key="NSRuleOptionInitialFrames.1">{{107, 3}, {46, 19}}</string> 2376 2391 <string key="NSRuleOptionInitialFrames.2">{{159, 3}, {155, 19}}</string> 2377 <reference key="NSRuleOptionAddButton" ref=" 916286195"/>2378 <reference key="NSRuleOptionSubtractButton" ref=" 502111979"/>2392 <reference key="NSRuleOptionAddButton" ref="853253325"/> 2393 <reference key="NSRuleOptionSubtractButton" ref="282999969"/> 2379 2394 <int key="NSRuleOptionRowType">0</int> 2380 2395 <int key="NSRuleOptionPlusButtonRowType">0</int> … … 2384 2399 <string key="NSFrame">{{1, 1}, {769, 73}}</string> 2385 2400 <reference key="NSSuperview" ref="872100568"/> 2386 <reference key="NSNextKeyView" ref="363486199"/> 2401 <reference key="NSWindow"/> 2402 <reference key="NSNextKeyView" ref="156337374"/> 2387 2403 </object> 2388 2404 </object> … … 2396 2412 <string key="NSFrameSize">{771, 75}</string> 2397 2413 <reference key="NSSuperview" ref="646625812"/> 2414 <reference key="NSWindow"/> 2398 2415 <reference key="NSNextKeyView" ref="887125716"/> 2399 2416 <bool key="NSEnabled">YES</bool> … … 2428 2445 <object class="NSMutableArray"> 2429 2446 <bool key="EncodedWithXMLCoder">YES</bool> 2430 <reference ref=" 1068089292"/>2431 <reference ref=" 672539328"/>2447 <reference ref="211869200"/> 2448 <reference ref="38677048"/> 2432 2449 </object> 2433 2450 <object class="NSMutableArray"> … … 2452 2469 <object class="NSMutableArray"> 2453 2470 <bool key="EncodedWithXMLCoder">YES</bool> 2454 <reference ref=" 880775721"/>2455 <reference ref=" 17599908"/>2456 <reference ref=" 729925139"/>2471 <reference ref="173485813"/> 2472 <reference ref="375500148"/> 2473 <reference ref="293689974"/> 2457 2474 </object> 2458 2475 <object class="NSMutableArray"> … … 2481 2498 <object class="NSMutableArray"> 2482 2499 <bool key="EncodedWithXMLCoder">YES</bool> 2483 <reference ref=" 539965909"/>2484 <reference ref="6 35329650"/>2485 <reference ref=" 773622241"/>2500 <reference ref="998086679"/> 2501 <reference ref="699004508"/> 2502 <reference ref="30477181"/> 2486 2503 </object> 2487 2504 <object class="NSMutableArray"> … … 2504 2521 <object class="NSMutableArray" key="NSRuleEditorSlices"> 2505 2522 <bool key="EncodedWithXMLCoder">YES</bool> 2506 <reference ref=" 363486199"/>2507 <reference ref=" 1018513936"/>2508 <reference ref=" 215802558"/>2523 <reference ref="156337374"/> 2524 <reference ref="936953994"/> 2525 <reference ref="56028161"/> 2509 2526 </object> 2510 2527 <object class="NSArray" key="NSPredicateTemplates"> … … 2519 2536 <string key="NSFrame">{{1, 1}, {771, 25}}</string> 2520 2537 <reference key="NSSuperview" ref="815512319"/> 2538 <reference key="NSWindow"/> 2521 2539 <reference key="NSNextKeyView" ref="872100568"/> 2522 2540 <reference key="NSDocView" ref="872100568"/> … … 2532 2550 <string key="NSFrame">{{-100, -100}, {15, 50}}</string> 2533 2551 <reference key="NSSuperview" ref="815512319"/> 2552 <reference key="NSWindow"/> 2534 2553 <bool key="NSEnabled">YES</bool> 2535 2554 <reference key="NSTarget" ref="815512319"/> … … 2543 2562 <string key="NSFrame">{{-100, -100}, {360, 15}}</string> 2544 2563 <reference key="NSSuperview" ref="815512319"/> 2564 <reference key="NSWindow"/> 2545 2565 <int key="NSsFlags">1</int> 2546 2566 <reference key="NSTarget" ref="815512319"/> … … 2550 2570 <string key="NSFrame">{{0, 397}, {773, 27}}</string> 2551 2571 <reference key="NSSuperview" ref="169664854"/> 2572 <reference key="NSWindow"/> 2552 2573 <reference key="NSNextKeyView" ref="646625812"/> 2553 2574 <int key="NSsFlags">66</int> … … 2571 2592 <string key="NSFrameSize">{756, 366}</string> 2572 2593 <reference key="NSSuperview" ref="221116208"/> 2594 <reference key="NSWindow"/> 2573 2595 <bool key="NSEnabled">YES</bool> 2574 2596 <object class="NSTableHeaderView" key="NSHeaderView" id="563815802"> … … 2577 2599 <string key="NSFrameSize">{756, 17}</string> 2578 2600 <reference key="NSSuperview" ref="260654782"/> 2601 <reference key="NSWindow"/> 2579 2602 <reference key="NSTableView" ref="199649408"/> 2580 2603 </object> … … 2584 2607 <string key="NSFrame">{{757, 0}, {16, 17}}</string> 2585 2608 <reference key="NSSuperview" ref="520202466"/> 2609 <reference key="NSWindow"/> 2586 2610 </object> 2587 2611 <object class="NSMutableArray" key="NSTableColumns"> … … 2738 2762 <string key="NSFrame">{{1, 17}, {756, 366}}</string> 2739 2763 <reference key="NSSuperview" ref="520202466"/> 2764 <reference key="NSWindow"/> 2740 2765 <reference key="NSNextKeyView" ref="199649408"/> 2741 2766 <reference key="NSDocView" ref="199649408"/> … … 2748 2773 <string key="NSFrame">{{757, 17}, {15, 366}}</string> 2749 2774 <reference key="NSSuperview" ref="520202466"/> 2775 <reference key="NSWindow"/> 2750 2776 <reference key="NSTarget" ref="520202466"/> 2751 2777 <string key="NSAction">_doScroller:</string> … … 2757 2783 <string key="NSFrame">{{1, 383}, {756, 15}}</string> 2758 2784 <reference key="NSSuperview" ref="520202466"/> 2785 <reference key="NSWindow"/> 2759 2786 <int key="NSsFlags">1</int> 2760 2787 <reference key="NSTarget" ref="520202466"/> … … 2771 2798 <string key="NSFrame">{{1, 0}, {756, 17}}</string> 2772 2799 <reference key="NSSuperview" ref="520202466"/> 2800 <reference key="NSWindow"/> 2773 2801 <reference key="NSNextKeyView" ref="563815802"/> 2774 2802 <reference key="NSDocView" ref="563815802"/> … … 2780 2808 <string key="NSFrameSize">{773, 399}</string> 2781 2809 <reference key="NSSuperview" ref="169664854"/> 2810 <reference key="NSWindow"/> 2782 2811 <reference key="NSNextKeyView" ref="221116208"/> 2783 2812 <int key="NSsFlags">50</int> … … 2795 2824 <string key="NSFrame">{{370, 183}, {32, 32}}</string> 2796 2825 <reference key="NSSuperview" ref="169664854"/> 2826 <reference key="NSWindow"/> 2797 2827 <int key="NSpiFlags">20490</int> 2798 2828 <double key="NSMinValue">16</double> … … 2802 2832 <string key="NSFrame">{{0, 28}, {773, 424}}</string> 2803 2833 <reference key="NSSuperview" ref="439893737"/> 2834 <reference key="NSWindow"/> 2804 2835 <string key="NSClassName">NSView</string> 2805 2836 </object> … … 2810 2841 <string key="NSFrame">{{6, 9}, {63, 12}}</string> 2811 2842 <reference key="NSSuperview" ref="439893737"/> 2843 <reference key="NSWindow"/> 2812 2844 <int key="NSpiFlags">24842</int> 2813 2845 <double key="NSMaxValue">100</double> … … 2818 2850 <string key="NSFrame">{{73, 7}, {231, 17}}</string> 2819 2851 <reference key="NSSuperview" ref="439893737"/> 2852 <reference key="NSWindow"/> 2820 2853 <bool key="NSEnabled">YES</bool> 2821 2854 <object class="NSTextFieldCell" key="NSCell" id="937120685"> … … 2837 2870 <string key="NSFrameSize">{773, 452}</string> 2838 2871 <reference key="NSSuperview"/> 2872 <reference key="NSWindow"/> 2839 2873 </object> 2840 2874 <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> … … 2870 2904 <string key="NSFrameSize">{246, 331}</string> 2871 2905 <reference key="NSSuperview" ref="340647127"/> 2906 <reference key="NSWindow"/> 2872 2907 <bool key="NSEnabled">YES</bool> 2873 2908 <object class="_NSCornerView" key="NSCornerView"> … … 2977 3012 <string key="NSFrame">{{1, 1}, {246, 331}}</string> 2978 3013 <reference key="NSSuperview" ref="199390391"/> 3014 <reference key="NSWindow"/> 2979 3015 <reference key="NSNextKeyView" ref="238622922"/> 2980 3016 <reference key="NSDocView" ref="238622922"/> … … 2987 3023 <string key="NSFrame">{{247, 1}, {15, 331}}</string> 2988 3024 <reference key="NSSuperview" ref="199390391"/> 3025 <reference key="NSWindow"/> 2989 3026 <reference key="NSTarget" ref="199390391"/> 2990 3027 <string key="NSAction">_doScroller:</string> … … 2996 3033 <string key="NSFrame">{{1, 332}, {246, 15}}</string> 2997 3034 <reference key="NSSuperview" ref="199390391"/> 3035 <reference key="NSWindow"/> 2998 3036 <int key="NSsFlags">1</int> 2999 3037 <reference key="NSTarget" ref="199390391"/> … … 3004 3042 <string key="NSFrame">{{6, 26}, {263, 348}}</string> 3005 3043 <reference key="NSSuperview" ref="187671130"/> 3044 <reference key="NSWindow"/> 3006 3045 <reference key="NSNextKeyView" ref="340647127"/> 3007 3046 <int key="NSsFlags">50</int> … … 3014 3053 <string key="NSFrameSize">{276, 378}</string> 3015 3054 <reference key="NSSuperview"/> 3055 <reference key="NSWindow"/> 3016 3056 </object> 3017 3057 <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> … … 3423 3463 <reference key="NSNextResponder" ref="874476791"/> 3424 3464 <int key="NSvFlags">256</int> 3425 <string key="NSFrameSize">{2 38, 418}</string>3465 <string key="NSFrameSize">{254, 418}</string> 3426 3466 <reference key="NSSuperview" ref="874476791"/> 3427 3467 <bool key="NSEnabled">YES</bool> … … 3429 3469 <reference key="NSNextResponder" ref="171583958"/> 3430 3470 <int key="NSvFlags">256</int> 3431 <string key="NSFrameSize">{2 38, 17}</string>3471 <string key="NSFrameSize">{254, 17}</string> 3432 3472 <reference key="NSSuperview" ref="171583958"/> 3433 3473 <reference key="NSTableView" ref="7154443"/> … … 3465 3505 <reference key="NSTextColor" ref="475656758"/> 3466 3506 </object> 3467 <int key="NSResizingMask"> 3</int>3507 <int key="NSResizingMask">1</int> 3468 3508 <bool key="NSIsResizeable">YES</bool> 3469 3509 <bool key="NSIsEditable">YES</bool> … … 3471 3511 </object> 3472 3512 <object class="NSTableColumn" id="315945499"> 3473 <double key="NSWidth">1 71</double>3513 <double key="NSWidth">120</double> 3474 3514 <double key="NSMinWidth">40</double> 3475 3515 <double key="NSMaxWidth">1000</double> … … 3491 3531 <reference key="NSTextColor" ref="475656758"/> 3492 3532 </object> 3533 <int key="NSResizingMask">1</int> 3534 <bool key="NSIsResizeable">YES</bool> 3535 <bool key="NSIsEditable">YES</bool> 3536 <reference key="NSTableView" ref="7154443"/> 3537 </object> 3538 <object class="NSTableColumn" id="112554963"> 3539 <double key="NSWidth">64</double> 3540 <double key="NSMinWidth">10</double> 3541 <double key="NSMaxWidth">3.4028234663852886e+38</double> 3542 <object class="NSTableHeaderCell" key="NSHeaderCell"> 3543 <int key="NSCellFlags">75628096</int> 3544 <int key="NSCellFlags2">2048</int> 3545 <string key="NSContents"/> 3546 <reference key="NSSupport" ref="26"/> 3547 <reference key="NSBackgroundColor" ref="934732725"/> 3548 <reference key="NSTextColor" ref="67059057"/> 3549 </object> 3550 <object class="NSTextFieldCell" key="NSDataCell" id="647470268"> 3551 <int key="NSCellFlags">337772096</int> 3552 <int key="NSCellFlags2">2048</int> 3553 <string key="NSContents">Text Cell</string> 3554 <reference key="NSSupport" ref="782475540"/> 3555 <reference key="NSControlView" ref="7154443"/> 3556 <reference key="NSBackgroundColor" ref="800202432"/> 3557 <reference key="NSTextColor" ref="475656758"/> 3558 </object> 3493 3559 <int key="NSResizingMask">3</int> 3494 3560 <bool key="NSIsResizeable">YES</bool> … … 3502 3568 <reference key="NSGridColor" ref="391761051"/> 3503 3569 <double key="NSRowHeight">17</double> 3504 <int key="NSTvFlags"> -700448768</int>3570 <int key="NSTvFlags">373293056</int> 3505 3571 <reference key="NSDelegate"/> 3506 3572 <reference key="NSDataSource"/> … … 3534 3600 <string key="NSFrame">{{-100, -100}, {224, 15}}</string> 3535 3601 <reference key="NSSuperview" ref="271863607"/> 3602 <bool key="NSEnabled">YES</bool> 3536 3603 <int key="NSsFlags">1</int> 3537 3604 <reference key="NSTarget" ref="271863607"/> … … 3558 3625 <reference key="NSSuperview" ref="610590059"/> 3559 3626 <reference key="NSNextKeyView" ref="874476791"/> 3560 <int key="NSsFlags"> 530</int>3627 <int key="NSsFlags">658</int> 3561 3628 <reference key="NSVScroller" ref="24793711"/> 3562 3629 <reference key="NSHScroller" ref="570962116"/> … … 4582 4649 <int key="connectionID">873</int> 4583 4650 </object> 4651 <object class="IBConnectionRecord"> 4652 <object class="IBBindingConnection" key="connection"> 4653 <string key="label">value: arrangedObjects.operation</string> 4654 <reference key="source" ref="1036951787"/> 4655 <reference key="destination" ref="194540380"/> 4656 <object class="NSNibBindingConnector" key="connector"> 4657 <reference key="NSSource" ref="1036951787"/> 4658 <reference key="NSDestination" ref="194540380"/> 4659 <string key="NSLabel">value: arrangedObjects.operation</string> 4660 <string key="NSBinding">value</string> 4661 <string key="NSKeyPath">arrangedObjects.operation</string> 4662 <int key="NSNibBindingConnectorVersion">2</int> 4663 </object> 4664 </object> 4665 <int key="connectionID">880</int> 4666 </object> 4667 <object class="IBConnectionRecord"> 4668 <object class="IBBindingConnection" key="connection"> 4669 <string key="label">value: arrangedObjects.port</string> 4670 <reference key="source" ref="315945499"/> 4671 <reference key="destination" ref="194540380"/> 4672 <object class="NSNibBindingConnector" key="connector"> 4673 <reference key="NSSource" ref="315945499"/> 4674 <reference key="NSDestination" ref="194540380"/> 4675 <string key="NSLabel">value: arrangedObjects.port</string> 4676 <string key="NSBinding">value</string> 4677 <string key="NSKeyPath">arrangedObjects.port</string> 4678 <int key="NSNibBindingConnectorVersion">2</int> 4679 </object> 4680 </object> 4681 <int key="connectionID">881</int> 4682 </object> 4584 4683 </object> 4585 4684 <object class="IBMutableOrderedSet" key="objectRecords"> … … 6074 6173 <reference ref="1036951787"/> 6075 6174 <reference ref="315945499"/> 6175 <reference ref="112554963"/> 6076 6176 </object> 6077 6177 <reference key="parent" ref="271863607"/> … … 6182 6282 <reference key="object" ref="412817228"/> 6183 6283 <reference key="parent" ref="452370589"/> 6284 </object> 6285 <object class="IBObjectRecord"> 6286 <int key="objectID">885</int> 6287 <reference key="object" ref="112554963"/> 6288 <object class="NSMutableArray" key="children"> 6289 <bool key="EncodedWithXMLCoder">YES</bool> 6290 <reference ref="647470268"/> 6291 </object> 6292 <reference key="parent" ref="7154443"/> 6293 </object> 6294 <object class="IBObjectRecord"> 6295 <int key="objectID">886</int> 6296 <reference key="object" ref="647470268"/> 6297 <reference key="parent" ref="112554963"/> 6184 6298 </object> 6185 6299 </object> … … 6663 6777 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6664 6778 <integer value="1"/> 6665 <string>{{ 343, 210}, {773, 452}}</string>6779 <string>{{543, 140}, {773, 452}}</string> 6666 6780 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6667 6781 <boolean value="NO"/> 6668 <string>{{ 343, 210}, {773, 452}}</string>6782 <string>{{543, 140}, {773, 452}}</string> 6669 6783 <integer value="1"/> 6670 6784 <string>{{33, 99}, {480, 360}}</string> … … 6706 6820 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6707 6821 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6708 <string>{{ 686, 79}, {276, 378}}</string>6709 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6710 <string>{{ 686, 79}, {276, 378}}</string>6822 <string>{{598, 192}, {276, 378}}</string> 6823 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6824 <string>{{598, 192}, {276, 378}}</string> 6711 6825 <boolean value="NO"/> 6712 6826 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> … … 6837 6951 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6838 6952 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6839 <string>{{ 354, 170}, {240, 468}}</string>6953 <string>{{727, 248}, {240, 468}}</string> 6840 6954 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6841 6955 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> … … 6872 6986 </object> 6873 6987 <nil key="sourceID"/> 6874 <int key="maxID">8 73</int>6988 <int key="maxID">886</int> 6875 6989 </object> 6876 6990 <object class="IBClassDescriber" key="IBDocument.Classes"> -
branches/gsoc10-gui/Pallet/MPActionsController.h
r68443 r68787 21 21 IBOutlet NSButton *startQueueButton; 22 22 IBOutlet NSArrayController *queue; 23 IBOutlet PortsTableController *queueController; 23 24 } 24 25 … … 32 33 - (IBAction)cancel:(id)sender; 33 34 35 - (void) queueOperation: (NSString*) operation andPort: (NSString*) port; 36 34 37 -(IBAction) startQueue:(id) sender; 35 38 -
branches/gsoc10-gui/Pallet/MPActionsController.m
r68443 r68787 24 24 NSArray *selectedPorts = [ports selectedObjects]; 25 25 for (id port in selectedPorts) { 26 [[MPActionLauncher sharedInstance] 27 performSelectorInBackground:@selector(installPort:) withObject:port]; 26 [self queueOperation:@"install" andPort:[port name]]; 27 NSLog(@"%@",[port name]); 28 //[[MPActionLauncher sharedInstance] 29 // performSelectorInBackground:@selector(installPort:) withObject:port]; 28 30 } 29 31 NSLog(@"Installation Completed"); … … 33 35 NSArray *selectedPorts = [ports selectedObjects]; 34 36 for (id port in selectedPorts) { 35 [[MPActionLauncher sharedInstance] 37 [self queueOperation:@"uninstall" andPort:[port name]]; 38 NSLog(@"%@",[port name]); 39 /* 40 [[MPActionLauncher sharedInstance] 36 41 performSelectorInBackground:@selector(uninstallPort:) withObject:port]; 42 */ 37 43 } 38 44 } … … 41 47 NSArray *selectedPorts = [ports selectedObjects]; 42 48 for (id port in selectedPorts) { 49 [self queueOperation:@"upgrade" andPort:[port name]]; 50 NSLog(@"%@",[port name]); 51 /* 43 52 [[MPActionLauncher sharedInstance] 44 53 performSelectorInBackground:@selector(upgradePort:) withObject:port]; 54 */ 45 55 } 46 56 } 47 57 48 58 - (IBAction)sync:(id)sender { 59 [self queueOperation:@"sync" andPort:@"sync"]; 60 /* 49 61 [[MPActionLauncher sharedInstance] 50 62 performSelectorInBackground:@selector(sync) withObject:nil]; 63 */ 51 64 } 52 65 53 66 - (IBAction)selfupdate:(id)sender { 67 [self queueOperation:@"selfupdate" andPort:@"selfupdate"]; 68 /* 54 69 [[MPActionLauncher sharedInstance] 55 70 performSelectorInBackground:@selector(selfupdate) withObject:nil]; 71 */ 56 72 } 57 73 … … 98 114 -(void) startQueue:(id) sender 99 115 { 100 NSLog(@"Starting Queue Operations"); 116 //[queue selectNext:nil]; 117 NSLog(@"Starting Queue"); 118 NSUInteger index; 119 index = [queue selectionIndex]; 120 NSLog(@"Index before: %u", index); 121 NSUInteger i; 122 [queue setSelectionIndex: 0]; 123 for(i=0; i<=index; i++) 124 { 125 //We select each object from the array 126 [queue setSelectionIndex:i]; 127 //We sleep the process for debugging puproses 128 sleep(3); 129 //We take the array of selected objects 130 NSArray *wtf = [queue selectedObjects]; 131 //We then take the dictionary 132 NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:[wtf objectAtIndex:0]]; 133 //And we print the operations 134 NSLog(@"Port %@ Operation %@",[dict objectForKey:@"port"], [dict objectForKey:@"operation"]); 135 136 } 137 [queue setSelectionIndex:index]; 138 //[queue remove:nil]; 139 140 141 //index = [queue selectionIndex]; 142 //NSLog(@"Index after: %u", index); 143 //NSLog(@"Starting Queue Operations"); 144 } 145 146 -(void) queueOperation:(NSString*)operation andPort:(NSString*)port 147 { 148 NSLog(@"Queueing our Operation"); 149 //NSMutableDictionary *tempDict=[[NSMutableDictionary alloc] initWithObjectsAndKeys:@"wtf", @"operation", @"le_port", @"port", nil]; 150 [queue addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:operation, @"operation", port, @"port",nil]]; 151 //[queue addObject: tempDict]; 152 //[queue retain]; 153 101 154 } 102 155 -
branches/gsoc10-gui/Pallet/PortsTableController.h
r68442 r68787 60 60 - (IBAction)hidePredicateEditor:(id)sender; 61 61 62 63 //Drawer methods 62 64 - (IBAction)open:(id)sender; 63 65 - (IBAction)close:(id)sender;
Note: See TracChangeset
for help on using the changeset viewer.