diff --git a/Art/display.artx/Preview/preview.png b/Art/display.artx/Preview/preview.png new file mode 100644 index 0000000..0969b08 Binary files /dev/null and b/Art/display.artx/Preview/preview.png differ diff --git a/Art/display.artx/QuickLook/Preview.pdf b/Art/display.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..497538f Binary files /dev/null and b/Art/display.artx/QuickLook/Preview.pdf differ diff --git a/Art/display.artx/doc.thread b/Art/display.artx/doc.thread new file mode 100644 index 0000000..d9a0085 Binary files /dev/null and b/Art/display.artx/doc.thread differ diff --git a/Art/fwd.artx/Preview/preview.png b/Art/fwd.artx/Preview/preview.png new file mode 100644 index 0000000..d58e775 Binary files /dev/null and b/Art/fwd.artx/Preview/preview.png differ diff --git a/Art/fwd.artx/QuickLook/Preview.pdf b/Art/fwd.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..05531a2 Binary files /dev/null and b/Art/fwd.artx/QuickLook/Preview.pdf differ diff --git a/Art/fwd.artx/doc.thread b/Art/fwd.artx/doc.thread new file mode 100644 index 0000000..240b580 Binary files /dev/null and b/Art/fwd.artx/doc.thread differ diff --git a/Art/next.artx/Preview/preview.png b/Art/next.artx/Preview/preview.png new file mode 100644 index 0000000..880473f Binary files /dev/null and b/Art/next.artx/Preview/preview.png differ diff --git a/Art/next.artx/QuickLook/Preview.pdf b/Art/next.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..5f79ec6 Binary files /dev/null and b/Art/next.artx/QuickLook/Preview.pdf differ diff --git a/Art/next.artx/doc.thread b/Art/next.artx/doc.thread new file mode 100644 index 0000000..04341e2 Binary files /dev/null and b/Art/next.artx/doc.thread differ diff --git a/Art/pause.artx/Preview/preview.png b/Art/pause.artx/Preview/preview.png new file mode 100644 index 0000000..abe652a Binary files /dev/null and b/Art/pause.artx/Preview/preview.png differ diff --git a/Art/pause.artx/QuickLook/Preview.pdf b/Art/pause.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..16c99cb Binary files /dev/null and b/Art/pause.artx/QuickLook/Preview.pdf differ diff --git a/Art/pause.artx/doc.thread b/Art/pause.artx/doc.thread new file mode 100644 index 0000000..401541a Binary files /dev/null and b/Art/pause.artx/doc.thread differ diff --git a/Art/play.artx/Preview/preview.png b/Art/play.artx/Preview/preview.png new file mode 100644 index 0000000..f124ad6 Binary files /dev/null and b/Art/play.artx/Preview/preview.png differ diff --git a/Art/play.artx/QuickLook/Preview.pdf b/Art/play.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..a7d5253 Binary files /dev/null and b/Art/play.artx/QuickLook/Preview.pdf differ diff --git a/Art/play.artx/doc.thread b/Art/play.artx/doc.thread new file mode 100644 index 0000000..dd1efbf Binary files /dev/null and b/Art/play.artx/doc.thread differ diff --git a/Art/prev.artx/Preview/preview.png b/Art/prev.artx/Preview/preview.png new file mode 100644 index 0000000..d406683 Binary files /dev/null and b/Art/prev.artx/Preview/preview.png differ diff --git a/Art/prev.artx/QuickLook/Preview.pdf b/Art/prev.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..45430e0 Binary files /dev/null and b/Art/prev.artx/QuickLook/Preview.pdf differ diff --git a/Art/prev.artx/doc.thread b/Art/prev.artx/doc.thread new file mode 100644 index 0000000..f216505 Binary files /dev/null and b/Art/prev.artx/doc.thread differ diff --git a/Art/zoomin.artx/Preview/preview.png b/Art/zoomin.artx/Preview/preview.png new file mode 100644 index 0000000..d1a6dde Binary files /dev/null and b/Art/zoomin.artx/Preview/preview.png differ diff --git a/Art/zoomin.artx/QuickLook/Preview.pdf b/Art/zoomin.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..66626a0 Binary files /dev/null and b/Art/zoomin.artx/QuickLook/Preview.pdf differ diff --git a/Art/zoomin.artx/doc.thread b/Art/zoomin.artx/doc.thread new file mode 100644 index 0000000..29064c3 Binary files /dev/null and b/Art/zoomin.artx/doc.thread differ diff --git a/Art/zoomout.artx/Preview/preview.png b/Art/zoomout.artx/Preview/preview.png new file mode 100644 index 0000000..e92c0f5 Binary files /dev/null and b/Art/zoomout.artx/Preview/preview.png differ diff --git a/Art/zoomout.artx/QuickLook/Preview.pdf b/Art/zoomout.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..9962f6e Binary files /dev/null and b/Art/zoomout.artx/QuickLook/Preview.pdf differ diff --git a/Art/zoomout.artx/doc.thread b/Art/zoomout.artx/doc.thread new file mode 100644 index 0000000..9b0e803 Binary files /dev/null and b/Art/zoomout.artx/doc.thread differ diff --git a/English.lproj/VLDocument.xib b/English.lproj/VLDocument.xib index 5f65a1f..0d2bad3 100644 --- a/English.lproj/VLDocument.xib +++ b/English.lproj/VLDocument.xib @@ -14,7 +14,9 @@ NSStepper NSMenuItem NSMenu + NSToolbarItem NSButton + NSToolbarFlexibleSpaceItem NSCustomObject NSTableView NSCustomView @@ -28,9 +30,11 @@ NSButtonCell NSTableColumn NSBox - NSView NSPopUpButtonCell + NSView + NSToolbarSpaceItem NSScrollView + NSToolbar NSUserDefaultsController NSProgressIndicator NSScroller @@ -55,7 +59,389 @@ 1886912512 Window NSWindow - View + + + E740CC27-9C7E-4EAB-BF3D-81063362B3D3 + + + YES + YES + YES + NO + 1 + 1 + + + + 090F43F9-8231-43FE-922E-78ACFD149536 + + Preview + Preview + + + + NSImage + vlsong + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 15BF1B1C-EB04-4D37-B74C-B24F5776A0AF + + + Progress + + + + 1292 + + {{19, 14}, {16, 16}} + + + + _NS:3954 + 28938 + 100 + + + + + {16, 16} + {16, 16} + YES + NO + -1 + YES + 0 + + + + 30E4DC32-DB89-4CFC-9F5D-D2D86BC93115 + + Play + Play + + + + NSImage + play + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 4D42D89B-0099-40D5-916B-59940F715C41 + + Settings + Settings + + + + NSImage + display + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 737868E5-40A9-4B03-B2FD-E67F9EE16B2B + + In + Zoom In + + + + NSImage + zoomin + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 77A31E50-1A2C-448A-A34C-424E366D478D + + Console + Console + + + + NSImage + console + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 889E794D-914E-4969-8960-2CCF7C710455 + + Out + Zoom Out + + + + NSImage + zoomout + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + D63103EB-B919-45DD-827C-807BA0DB9509 + + >> + >> + + + + 268 + {{0, 14}, {32, 32}} + + + + _NS:1491 + 1 + YES + + 67239424 + 134217728 + + + LucidaGrande + 13 + 1044 + + _NS:1491 + + -2042347265 + 134 + + NSImage + fwd + + + + 400 + 75 + + + + + + {32, 32} + {32, 32} + YES + YES + 1 + YES + 0 + + + + F5E49E9C-6F16-4D08-9781-4AF5849DD18F + + << + << + + + + 268 + {{0, 14}, {32, 32}} + + + + _NS:1491 + -1 + YES + + 67239424 + 134217728 + + + _NS:1491 + + -2042347265 + 134 + + NSImage + bck + + + + 400 + 75 + + + + + + {32, 32} + {32, 32} + YES + YES + -1 + YES + 0 + + + NSToolbarFlexibleSpaceItem + + Flexible Space + + + + + + {1, 5} + {20000, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + + + + NSToolbarPrintItem + Print + Print + Print + + + NSImage + NSToolbarPrint + + + printDocument: + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + NSToolbarSpaceItem + + Space + + + + + + {32, 5} + {32, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {890, 350} @@ -76,15 +462,12 @@ {{656, 42}, {82, 26}} + YES -2076049856 16779264 - - LucidaGrande - 13 - 1044 - + 109199615 1 @@ -108,14 +491,8 @@ 1048576 2147483647 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - + + _popUpItemAction: @@ -131,8 +508,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1 @@ -145,8 +522,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -156,8 +533,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -255 @@ -168,8 +545,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -511 @@ -180,8 +557,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -767 @@ -192,8 +569,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -1023 @@ -204,8 +581,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -1279 @@ -216,8 +593,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -1535 @@ -229,8 +606,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 257 @@ -241,8 +618,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 513 @@ -253,8 +630,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 769 @@ -265,8 +642,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1025 @@ -277,8 +654,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1281 @@ -289,8 +666,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1537 @@ -303,8 +680,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -314,8 +691,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 255 @@ -328,8 +705,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -339,8 +716,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -1 @@ -351,8 +728,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -257 @@ -363,8 +740,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -513 @@ -375,8 +752,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -769 @@ -387,8 +764,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -1025 @@ -399,8 +776,8 @@ 1048576 2147483647 - - + + _popUpItemAction: -1281 @@ -413,8 +790,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -424,8 +801,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 511 @@ -436,8 +813,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 767 @@ -448,8 +825,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1023 @@ -461,8 +838,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: 1279 @@ -473,8 +850,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1535 @@ -485,8 +862,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1791 @@ -506,6 +883,7 @@ {{740, 42}, {91, 26}} + YES -2076049856 @@ -528,8 +906,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: 1028 @@ -547,8 +925,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1544 @@ -559,8 +937,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 772 @@ -571,8 +949,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 3080 @@ -583,8 +961,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 1284 @@ -603,6 +981,7 @@ {{833, 42}, {130, 26}} + YES -2076049856 @@ -625,8 +1004,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: 12 @@ -643,8 +1022,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 2 @@ -655,8 +1034,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 3 @@ -667,8 +1046,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 4 @@ -679,8 +1058,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 6 @@ -691,8 +1070,8 @@ 1048576 2147483647 - - + + _popUpItemAction: 8 @@ -713,6 +1092,7 @@ {{92, 45}, {350, 22}} + YES -1804468671 @@ -747,6 +1127,7 @@ {{13, 47}, {54, 17}} + YES 67239424 @@ -777,6 +1158,7 @@ {{13, 22}, {114, 17}} + YES 67239424 @@ -794,6 +1176,7 @@ {{92, 20}, {142, 22}} + YES -1804468671 @@ -812,6 +1195,7 @@ {{246, 22}, {57, 17}} + YES 67239424 @@ -829,6 +1213,7 @@ {{300, 20}, {142, 22}} + YES -1804468671 @@ -847,6 +1232,7 @@ {{447, 47}, {57, 17}} + YES 67239424 @@ -864,6 +1250,7 @@ {{501, 45}, {33, 22}} + YES -1804468671 @@ -882,6 +1269,7 @@ {{539, 42}, {19, 27}} + YES 917024 @@ -901,6 +1289,7 @@ {{447, 22}, {57, 17}} + YES 67239424 @@ -918,6 +1307,7 @@ {{498, 18}, {130, 26}} + YES -2076049856 @@ -940,8 +1330,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: 1 @@ -961,8 +1351,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -972,8 +1362,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -983,8 +1373,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -1000,11 +1390,13 @@ {989, 80} + {{-3, 319}, {989, 80}} + {0, 0} 67239424 @@ -1041,6 +1433,7 @@ {988, 328} + VLSheetView NSView @@ -1059,6 +1452,7 @@ {{955, 1}, {15, 337}} + _doScroller: 1 @@ -1070,6 +1464,7 @@ {{1, 329}, {963, 15}} + YES 1 @@ -1100,6 +1495,7 @@ {{10, 6}, {271, 22}} + YES -1804468671 @@ -1118,6 +1514,7 @@ {{289, 4}, {19, 23}} + YES 67239424 @@ -1144,6 +1541,7 @@ {{311, 4}, {19, 23}} + YES 67239424 @@ -1164,11 +1562,13 @@ {336, 37} + {{627, 330}, {336, 37}} + {0, 0} 67239424 @@ -1191,348 +1591,14 @@ {971, 397} + - {{0, 0}, {1280, 778}} - {890, 372} + {{0, 0}, {1440, 878}} + {890, 428} {10000000000000, 10000000000000} 128 YES - - 15 - 2 - {{308, 149}, {480, 360}} - 1886912512 - - Window - - - NSWindow - - - View - - - {213, 107} - - - 256 - - - - 256 - {{25, 254}, {75, 78}} - - - - YES - - 67239424 - 134217728 - Preview - - LucidaGrande - 10 - 16 - - - -2037628673 - 2 - - NSImage - music - - Preview - - 400 - 75 - - - - - 256 - {{110, 276}, {58, 56}} - - - - YES - - 67239424 - 134217728 - Show Log - - - -2037628673 - 2 - - NSImage - console - - Show Log - - 400 - 75 - - - - - 256 - {{267, 271}, {58, 56}} - - - - YES - - 67239424 - 134217728 - Play - - - -2037628673 - 130 - - NSImage - play - - Play - - 400 - 75 - - - - - 256 - {{149, 197}, {58, 56}} - - - - YES - - 67239424 - 134217728 - Zoom In - - - -2037628673 - 2 - - NSImage - zoomin - - Zoom In - - 400 - 75 - - - - - 256 - {{218, 197}, {58, 56}} - - - - YES - - 67239424 - 134217728 - Zoom Out - - - -2037628673 - 2 - - NSImage - zoomout - - Zoom Out - - 400 - 75 - - - - - 256 - {{318, 191}, {58, 56}} - - - - YES - - 67239424 - 134217728 - Stop - - - -2037628673 - 130 - - NSImage - stop - - Stop - - 400 - 75 - - - - - 1280 - - {{369, 292}, {16, 16}} - - - - 28938 - 100 - - - - 256 - {{18, 122}, {58, 65}} - - - - YES - - 67239424 - 134217728 - Display - - - -2037628673 - 2 - - NSImage - display - - Display - - 400 - 75 - - - - - 256 - {{218, 94}, {58, 56}} - - - - 1 - YES - - 67239424 - 134217728 - Fwd - - - -2037628673 - 130 - - NSImage - fwd - - Fwd - - 400 - 75 - - - - - 256 - {{329, 94}, {58, 56}} - - - - -1 - YES - - 67239424 - 134217728 - Rew - - - -2037628673 - 130 - - NSImage - bck - - Rew - - 400 - 75 - - - - - 256 - {{218, 31}, {58, 56}} - - - - -2 - YES - - 67239424 - 134217728 - Start - - - -2037628673 - 130 - - NSImage - tobeg - - Start - - 400 - 75 - - - - - 256 - {{329, 31}, {58, 56}} - - - 2 - YES - - 67239424 - 134217728 - End - - - -2037628673 - 130 - - NSImage - toend - - End - - 400 - 75 - - - - {480, 360} - - - - - {{0, 0}, {1280, 778}} - {213, 129} - {10000000000000, 10000000000000} - YES - 7 2 @@ -1583,7 +1649,7 @@ 0 - + . @@ -1621,7 +1687,7 @@ NaN - + @@ -1743,7 +1809,7 @@ {338, 127} - {{0, 0}, {1280, 778}} + {{0, 0}, {1440, 878}} {213, 129} {10000000000000, 10000000000000} YES @@ -2328,7 +2394,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA {372, 142} - {{0, 0}, {1280, 778}} + {{0, 0}, {1440, 878}} {213, 129} {10000000000000, 10000000000000} YES @@ -2449,8 +2515,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA1048576 2147483647 1 - - + + _popUpItemAction: @@ -2467,8 +2533,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2478,8 +2544,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2489,8 +2555,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2500,8 +2566,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2558,8 +2624,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA1048576 2147483647 1 - - + + _popUpItemAction: @@ -2576,8 +2642,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2587,8 +2653,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2598,8 +2664,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2609,8 +2675,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2684,8 +2750,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA1048576 2147483647 1 - - + + _popUpItemAction: @@ -2701,8 +2767,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2712,8 +2778,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2723,8 +2789,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2734,8 +2800,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2745,8 +2811,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2756,8 +2822,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2767,8 +2833,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -2778,8 +2844,8 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 1048576 2147483647 - - + + _popUpItemAction: @@ -3700,7 +3766,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA{537, 336} - {{0, 0}, {1280, 778}} + {{0, 0}, {1440, 878}} {213, 129} {10000000000000, 10000000000000} YES @@ -3822,38 +3888,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 141 - - - showLog: - - - - 151 - - - - showOutput: - - - - 153 - - - - outputToolItem - - - - 155 - - - - logToolItem - - - - 156 - window @@ -3910,14 +3944,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 170 - - - playToolItem - - - - 175 - value: document.songTempo @@ -3950,38 +3976,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 180 - - - zoomInToolItem - - - - 192 - - - - zoomOutToolItem - - - - 193 - - - - zoomIn: - - - - 194 - - - - zoomOut: - - - - 195 - value: document.repeatVolta @@ -4062,22 +4056,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 248 - - - stop: - - - - 252 - - - - stopToolItem - - - - 253 - selectGroove: @@ -4094,14 +4072,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 262 - - - progressToolItem - - - - 264 - selectGroove: @@ -4230,22 +4200,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 338 - - - displayToolItem - - - - 100346 - - - - editDisplayOptions: - - - - 100347 - fKeyMenu @@ -4318,78 +4272,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 100386 - - - fwdToolItem - - - - 100436 - - - - bckToolItem - - - - 100437 - - - - tobegToolItem - - - - 100438 - - - - toendToolItem - - - - 100439 - - - - playMusic: - - - - 100440 - - - - playMusic: - - - - 100441 - - - - playMusic: - - - - 100442 - - - - playMusic: - - - - 100443 - - - - playMusic: - - - - 100444 - value: document.lyricSize @@ -4486,12 +4368,92 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA 100485 + + + printDocument: + + + + 100503 + + + + showLog: + + + + 100504 + + + + zoomIn: + + + + 100505 + + + + zoomOut: + + + + 100506 + + + + showOutput: + + + + 100508 + + + + editDisplayOptions: + + + + 100510 + + + + progressIndicator + + + + 100513 + + + + playStop: + + + + 100514 + + + + playMusic: + + + + 100515 + + + + playMusic: + + + + 100516 + 0 - + @@ -4512,6 +4474,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA + Sheet Music Window @@ -4572,95 +4535,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - - 144 - - - - - - Toolbar Items - - - 145 - - - - - - - - - - - - - - - - - - - 146 - - - - - - - - 147 - - - - - - - - 171 - - - - - - - - 188 - - - - - - - - 189 - - - - - - - - 249 - - - - - - - - 263 - - - - - 339 - - - - - - 196 @@ -4954,41 +4828,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - - 100146 - - - - - 100147 - - - - - 100171 - - - - - 100188 - - - - - 100189 - - - - - 100249 - - - - - 100339 - - - 100198 @@ -6019,58 +5858,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - - 100428 - - - - - - - - 100429 - - - - - 100430 - - - - - - - - 100431 - - - - - 100432 - - - - - - - - 100433 - - - - - 100434 - - - - - - - - 100435 - - - 100452 @@ -6214,6 +6001,126 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA + + 100486 + + + + + + + + + + + + + + + + + + + 100489 + + + + + 100490 + + + + + 100491 + + + + + 100493 + + + + + 100494 + + + + + 100495 + + + + + 100496 + + + + + 100499 + + + + + + + + 100497 + + + + + + + + 100498 + + + + + 100500 + + + + + + Toolbar Item - >> + + + 100501 + + + + + + + + 100502 + + + + + 100492 + + + + + 100509 + + + + + 100512 + + + + + + + + 100511 + + + @@ -6227,21 +6134,16 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6255,7 +6157,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6266,7 +6167,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6301,46 +6201,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Stop Playback - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Stop Playback - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Stop Playback - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Stop Playback - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6398,68 +6258,40 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + VLToolbarButton + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + VLToolbarButton + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{56, 92}, {480, 360}} - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Typeset and Show Lead Sheet - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Show Console Log - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Play the Song - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Zoom In - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Zoom Out - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6496,15 +6328,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Stop Playback - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6513,7 +6336,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{245, 314}, {543, 189}} com.apple.InterfaceBuilder.CocoaPlugin @@ -6554,15 +6376,6 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Set Display and Print Options - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6600,7 +6413,7 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA - 100485 + 100516 @@ -6893,72 +6706,17 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAAVLSheetWindow NSWindowController - id - id - id - id - id - id - id - id - id - id - id - id - id + NSProgressIndicator + VLSheetView - - bckToolItem - id - - - displayToolItem - id - - - fwdToolItem - id - - - logToolItem - id - - - outputToolItem - id - - - playToolItem - id - - - progressToolItem - id + + progressIndicator + NSProgressIndicator sheetView - id - - - stopToolItem - id - - - tobegToolItem - id - - - toendToolItem - id - - - zoomInToolItem - id - - - zoomOutToolItem - id + VLSheetView @@ -6966,6 +6724,14 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA./Classes/VLSheetWindow.h + + VLToolbarButton + NSButton + + IBProjectSource + ./Classes/VLToolbarButton.h + + 0 @@ -6980,17 +6746,15 @@ AAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIENvbXB1dGVyLCBJbmMuLCAyMDA1AAAAAA{9, 8} {7, 2} {15, 15} - {128, 128} + {32, 32} + {512, 512} {48, 48} - {32.640000000000001, 47.519999999999996} - {128, 128} - {128, 128} - {128, 128} - {128, 128} - {128, 128} - {128, 128} - {32, 32} - {32, 32} + {512, 512} + {512, 512} + {512, 512} + {128, 128} + {512, 512} + {512, 512} diff --git a/English.lproj/VLPDFWindow.xib b/English.lproj/VLPDFWindow.xib index b244c11..e5d70b3 100644 --- a/English.lproj/VLPDFWindow.xib +++ b/English.lproj/VLPDFWindow.xib @@ -11,12 +11,14 @@ 1617 - NSCustomView - NSWindowTemplate NSView - NSButtonCell + NSWindowTemplate + NSToolbarItem + NSToolbarSpaceItem + NSCustomView + NSToolbar + NSToolbarFlexibleSpaceItem NSCustomObject - NSButton com.apple.InterfaceBuilder.CocoaPlugin @@ -41,13 +43,211 @@ NSWindow - - View + + + 56D7246E-8274-496F-A057-3D71A2E6C460 + + + YES + YES + YES + NO + 1 + 1 + + + + 04B5A1CB-0E26-4490-8A48-EE1373EA7D10 + + In + Zoom In + + + + NSImage + zoomin + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 14127016-2429-42EC-A13C-A5CC54E1E862 + + Prev + Prev + + + + NSImage + prev + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + A8A600C7-B3FB-40A2-B2F4-F434D6C8C474 + + Out + Zoom Out + + + + NSImage + zoomout + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + ECFCD666-BB8C-4A33-916E-1E8C707ED66A + + Next + Next + + + + NSImage + next + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + NSToolbarFlexibleSpaceItem + + Flexible Space + + + + + + {1, 5} + {20000, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + + + + NSToolbarPrintItem + Print + Print + Print + + + NSImage + NSToolbarPrint + + + printDocument: + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + NSToolbarSpaceItem + + Space + + + + + + {32, 5} + {32, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + + + + + + + + + + + + + + + + + {200, 300} - + 256 @@ -55,142 +255,19 @@ 274 {650, 720} + + VLPDFView PDFView - {{1, 9}, {650, 720}} + {650, 720} + + + - {{0, 0}, {1280, 778}} - {200, 322} - {10000000000000, 10000000000000} - YES - - - 15 - 2 - {{82, 350}, {480, 360}} - 1886912512 - - Window - - - NSWindow - - - View - - - {213, 107} - - - 256 - - - - 256 - {{23, 286}, {58, 56}} - - YES - - 67239424 - 134217728 - Previous - - LucidaGrande - 10 - 16 - - - -2037628673 - 2 - - NSImage - prevpage - - Previous - - 400 - 75 - - - - - 256 - {{85, 286}, {58, 56}} - - YES - - 67239424 - 134217728 - Next - - - -2037628673 - 2 - - NSImage - nextpage - - Next - - 400 - 75 - - - - - 256 - {{147, 286}, {58, 56}} - - YES - - 67239424 - 134217728 - Zoom In - - - -2037628673 - 2 - - NSImage - zoomin - - Zoom In - - 400 - 75 - - - - - 256 - {{216, 286}, {58, 56}} - - YES - - 67239424 - 134217728 - Zoom Out - - - -2037628673 - 2 - - NSImage - zoomout - - Zoom Out - - 400 - 75 - - - - {{1, 9}, {480, 360}} - - {{0, 0}, {1280, 778}} - {213, 129} + {{0, 0}, {1440, 878}} + {200, 378} {10000000000000, 10000000000000} YES @@ -205,38 +282,6 @@ 10 - - - prevPageItem - - - - 31 - - - - zoomInItem - - - - 33 - - - - zoomOutItem - - - - 34 - - - - nextPageItem - - - - 42 - pdfView @@ -249,40 +294,48 @@ goToPreviousPage: - + - 49 + 100027 goToNextPage: - + - 50 + 100028 zoomIn: - + - 51 + 100029 zoomOut: - + - 52 + 100030 + + + + printDocument: + + + + 100031 0 - + @@ -303,6 +356,7 @@ + Window @@ -320,132 +374,75 @@ - - 11 - - - - - - Toolbar Items - - - 12 - - - - - - - - - - - 13 - - - - - - - - 14 - - - - - - - - 15 - - - - - - - - 16 - - - - - - - - 100013 - - - - - 100014 - - - - - 100015 - - - - - 100016 - - - -3 Application + + 100017 + + + + + + + + + + + + + + 100020 + + + + + 100021 + + + + + 100022 + + + + + 100023 + + + + + 100024 + + + + + 100025 + + + + + 100026 + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Previous Page - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Next Page - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Zoom In - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Zoom Out - - - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -454,7 +451,7 @@ - 100016 + 100031 @@ -512,6 +509,47 @@ ./Classes/IKImageView.h + + NSDocument + + id + id + id + id + id + id + + + + printDocument: + id + + + revertDocumentToSaved: + id + + + runPageLayout: + id + + + saveDocument: + id + + + saveDocumentAs: + id + + + saveDocumentTo: + id + + + + IBProjectSource + ./Classes/NSDocument.h + + VLPDFView PDFView @@ -568,10 +606,13 @@ YES 3 - {32, 32} - {32, 32} - {32, 32} - {32, 32} + {9, 8} + {7, 2} + {32, 32} + {512, 512} + {512, 512} + {512, 512} + {512, 512} diff --git a/Resources/bck.icns b/Resources/bck.icns index 5068b7d..d5b3f20 100644 Binary files a/Resources/bck.icns and b/Resources/bck.icns differ diff --git a/Resources/display.icns b/Resources/display.icns new file mode 100644 index 0000000..b058b4e Binary files /dev/null and b/Resources/display.icns differ diff --git a/Resources/display.tiff b/Resources/display.tiff deleted file mode 100644 index c0dfd22..0000000 Binary files a/Resources/display.tiff and /dev/null differ diff --git a/Resources/fwd.icns b/Resources/fwd.icns index da2f3d1..48d35a4 100644 Binary files a/Resources/fwd.icns and b/Resources/fwd.icns differ diff --git a/Resources/music.tiff b/Resources/music.tiff deleted file mode 100644 index ad38d20..0000000 Binary files a/Resources/music.tiff and /dev/null differ diff --git a/Resources/next.icns b/Resources/next.icns new file mode 100644 index 0000000..c5adf56 Binary files /dev/null and b/Resources/next.icns differ diff --git a/Resources/nextpage.tiff b/Resources/nextpage.tiff deleted file mode 100644 index 6110c4f..0000000 Binary files a/Resources/nextpage.tiff and /dev/null differ diff --git a/Resources/play.icns b/Resources/play.icns index c5cb79b..766f302 100644 Binary files a/Resources/play.icns and b/Resources/play.icns differ diff --git a/Resources/prev.icns b/Resources/prev.icns new file mode 100644 index 0000000..6e64284 Binary files /dev/null and b/Resources/prev.icns differ diff --git a/Resources/prevpage.tiff b/Resources/prevpage.tiff deleted file mode 100644 index e34543b..0000000 Binary files a/Resources/prevpage.tiff and /dev/null differ diff --git a/Resources/stop.icns b/Resources/stop.icns index 41c308e..97ff158 100644 Binary files a/Resources/stop.icns and b/Resources/stop.icns differ diff --git a/Resources/tobeg.icns b/Resources/tobeg.icns deleted file mode 100644 index d78231c..0000000 Binary files a/Resources/tobeg.icns and /dev/null differ diff --git a/Resources/toend.icns b/Resources/toend.icns deleted file mode 100644 index 227a8e5..0000000 Binary files a/Resources/toend.icns and /dev/null differ diff --git a/Resources/vlsong.icns b/Resources/vlsong.icns index 0887810..b2d5329 100644 Binary files a/Resources/vlsong.icns and b/Resources/vlsong.icns differ diff --git a/Resources/zoomin.icns b/Resources/zoomin.icns new file mode 100644 index 0000000..cbcdc0d Binary files /dev/null and b/Resources/zoomin.icns differ diff --git a/Resources/zoomin.tiff b/Resources/zoomin.tiff deleted file mode 100644 index 9029b20..0000000 Binary files a/Resources/zoomin.tiff and /dev/null differ diff --git a/Resources/zoomout.icns b/Resources/zoomout.icns new file mode 100644 index 0000000..df4b509 Binary files /dev/null and b/Resources/zoomout.icns differ diff --git a/Resources/zoomout.tiff b/Resources/zoomout.tiff deleted file mode 100644 index 0dbe1a6..0000000 Binary files a/Resources/zoomout.tiff and /dev/null differ diff --git a/Sources/VLDocument.mm b/Sources/VLDocument.mm index f439865..85d9847 100644 --- a/Sources/VLDocument.mm +++ b/Sources/VLDocument.mm @@ -579,10 +579,20 @@ { if (VLSoundOut::Instance()->Playing()) { [self stop:sender]; - [sender setTitle:@"Play"]; + if ([sender isKindOfClass:[NSMenuItem class]]) { + [sender setTitle:@"Play"]; + } else { + [sender setLabel:@"Play"]; + [sender setImage:[NSImage imageNamed:@"play.icns"]]; + } } else { [self play:sender]; - [sender setTitle:@"Stop"]; + if ([sender isKindOfClass:[NSMenuItem class]]) { + [sender setTitle:@"Stop"]; + } else { + [sender setLabel:@"Stop"]; + [sender setImage:[NSImage imageNamed:@"stop.icns"]]; + } } } diff --git a/Sources/VLPDFWindow.h b/Sources/VLPDFWindow.h index 02c988d..e8969bf 100644 --- a/Sources/VLPDFWindow.h +++ b/Sources/VLPDFWindow.h @@ -5,17 +5,14 @@ // // (MN) Matthias Neeracher // -// Copyright © 2005-2007 Matthias Neeracher +// Copyright © 2005-2011 Matthias Neeracher // #import +#import @interface VLPDFWindow : NSWindowController { - IBOutlet id pdfView; - IBOutlet id prevPageItem; - IBOutlet id nextPageItem; - IBOutlet id zoomInItem; - IBOutlet id zoomOutItem; + IBOutlet PDFView * pdfView; } - (void)reloadPDF; diff --git a/Sources/VLPDFWindow.mm b/Sources/VLPDFWindow.mm index 61c4698..547d64b 100644 --- a/Sources/VLPDFWindow.mm +++ b/Sources/VLPDFWindow.mm @@ -5,7 +5,7 @@ // // (MN) Matthias Neeracher // -// Copyright © 2005-2007 Matthias Neeracher +// Copyright © 2005-2011 Matthias Neeracher // #import "VLPDFWindow.h" @@ -14,12 +14,6 @@ @implementation VLPDFWindow -static NSString* sOutputToolbarIdentifier = @"Lilypond Output Toolbar Identifier"; -static NSString* sPrevPageToolbarItemIdentifier = @"Prev Page Toolbar Item Identifier"; -static NSString* sNextPageToolbarItemIdentifier = @"Next Page Toolbar Item Identifier"; -static NSString* sZoomInToolbarItemIdentifier = @"Zoom In Toolbar Item Identifier"; -static NSString* sZoomOutToolbarItemIdentifier = @"Zoom Out Toolbar Item Identifier"; - - (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName { return [displayName stringByAppendingString: @" - Output"]; @@ -83,96 +77,6 @@ static NSString* sZoomOutToolbarItemIdentifier = @"Zoom Out Toolbar Item Identif - (void)windowDidLoad { - // Create a new toolbar instance, and attach it to our document window - NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier: sOutputToolbarIdentifier] autorelease]; - - // Set up toolbar properties: Allow customization, give a default display mode, and remember state in user defaults - [toolbar setAllowsUserCustomization: YES]; - [toolbar setAutosavesConfiguration: YES]; - - // We are the delegate - [toolbar setDelegate: self]; - - // Attach the toolbar to the document window - [[self window] setToolbar: toolbar]; -} - - -- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted { - // Required delegate method: Given an item identifier, this method returns an item - // The toolbar will use this method to obtain toolbar items that can be displayed in the customization sheet, or in the toolbar itself - NSToolbarItem * toolbarItem = nil; - id prototype = nil; - - if ([itemIdent isEqual: sPrevPageToolbarItemIdentifier]) - prototype = prevPageItem; - else if ([itemIdent isEqual: sNextPageToolbarItemIdentifier]) - prototype = nextPageItem; - else if ([itemIdent isEqual: sZoomInToolbarItemIdentifier]) - prototype = zoomInItem; - else if ([itemIdent isEqual: sZoomOutToolbarItemIdentifier]) - prototype = zoomOutItem; - - if (prototype) { - toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease]; - - // Set the text label to be displayed in the toolbar and customization palette - [toolbarItem setLabel: [prototype title]]; - [toolbarItem setPaletteLabel: [prototype alternateTitle]]; - - // Set up a reasonable tooltip, and image Note, these aren't localized, but you will likely want to localize many of the item's properties - [toolbarItem setToolTip: [prototype toolTip]]; - [toolbarItem setImage: [prototype image]]; - - // Tell the item what message to send when it is clicked - [toolbarItem setTarget: [prototype target]]; - [toolbarItem setAction: [prototype action]]; - } else { - // itemIdent refered to a toolbar item that is not provide or supported by us or cocoa - // Returning nil will inform the toolbar this kind of item is not supported - toolbarItem = nil; - } - return toolbarItem; -} - -- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar { - // Required delegate method: Returns the ordered list of items to be shown in the toolbar by default - // If during the toolbar's initialization, no overriding values are found in the user defaults, or if the - // user chooses to revert to the default items this set will be used - return [NSArray arrayWithObjects: NSToolbarPrintItemIdentifier, NSToolbarSeparatorItemIdentifier, - sPrevPageToolbarItemIdentifier, sNextPageToolbarItemIdentifier, NSToolbarSeparatorItemIdentifier, - sZoomInToolbarItemIdentifier, sZoomOutToolbarItemIdentifier, nil]; -} - -- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar { - // Required delegate method: Returns the list of all allowed items by identifier. By default, the toolbar - // does not assume any items are allowed, even the separator. So, every allowed item must be explicitly listed - // The set of allowed items is used to construct the customization palette - return [NSArray arrayWithObjects: sPrevPageToolbarItemIdentifier, sNextPageToolbarItemIdentifier, - sZoomInToolbarItemIdentifier, sZoomOutToolbarItemIdentifier, - NSToolbarPrintItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, - NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, NSToolbarSeparatorItemIdentifier, nil]; -} - -- (void) toolbarWillAddItem: (NSNotification *) notif { - // Optional delegate method: Before an new item is added to the toolbar, this notification is posted. - // This is the best place to notice a new item is going into the toolbar. For instance, if you need to - // cache a reference to the toolbar item or need to set up some initial state, this is the best place - // to do it. The notification object is the toolbar to which the item is being added. The item being - // added is found by referencing the @"item" key in the userInfo -} - -- (void) toolbarDidRemoveItem: (NSNotification *) notif { - // Optional delegate method: After an item is removed from a toolbar, this notification is sent. This allows - // the chance to tear down information related to the item that may have been cached. The notification object - // is the toolbar from which the item is being removed. The item being added is found by referencing the @"item" - // key in the userInfo -} - -- (BOOL) validateToolbarItem: (NSToolbarItem *) toolbarItem { - // Optional method: This message is sent to us since we are the target of some toolbar item actions - // (for example: of the save items action) - return YES; } @end diff --git a/Sources/VLSheetWindow.h b/Sources/VLSheetWindow.h index 9620980..0d50d82 100644 --- a/Sources/VLSheetWindow.h +++ b/Sources/VLSheetWindow.h @@ -5,7 +5,7 @@ // // (MN) Matthias Neeracher // -// Copyright © 2005-2008 Matthias Neeracher +// Copyright © 2005-2011 Matthias Neeracher // #import @@ -24,23 +24,13 @@ @end +@class VLSheetView; + @interface VLSheetWindow : NSWindowController { - VLEditable * editTarget; - - IBOutlet id outputToolItem; - IBOutlet id logToolItem; - IBOutlet id playToolItem; - IBOutlet id stopToolItem; - IBOutlet id fwdToolItem; - IBOutlet id bckToolItem; - IBOutlet id tobegToolItem; - IBOutlet id toendToolItem; - IBOutlet id zoomInToolItem; - IBOutlet id zoomOutToolItem; - IBOutlet id progressToolItem; - IBOutlet id displayToolItem; - - IBOutlet id sheetView; + IBOutlet VLSheetView * sheetView; + IBOutlet NSProgressIndicator * progressIndicator; + + VLEditable * editTarget; int editNumTopLedgers; int editNumBotLedgers; diff --git a/Sources/VLSheetWindow.mm b/Sources/VLSheetWindow.mm index 1f648cb..42d6b4b 100644 --- a/Sources/VLSheetWindow.mm +++ b/Sources/VLSheetWindow.mm @@ -5,7 +5,7 @@ // // (MN) Matthias Neeracher // -// Copyright © 2005-2008 Matthias Neeracher +// Copyright © 2005-2011 Matthias Neeracher // #import "VLSheetWindow.h" @@ -44,20 +44,6 @@ @implementation VLSheetWindow -static NSString* sInputToolbarIdentifier = @"Vocalese Sheet Window Toolbar Identifier"; -static NSString* sOutputToolbarItemIdentifier = @"Output Toolbar Item Identifier"; -static NSString* sLogToolbarItemIdentifier = @"Log Toolbar Item Identifier"; -static NSString* sPlayToolbarItemIdentifier = @"Play Toolbar Item Identifier"; -static NSString* sStopToolbarItemIdentifier = @"Stop Toolbar Item Identifier"; -static NSString* sFwdToolbarItemIdentifier = @"Fwd Toolbar Item Identifier"; -static NSString* sBckToolbarItemIdentifier = @"Rew Toolbar Item Identifier"; -static NSString* sToBegToolbarItemIdentifier = @"Begin Toolbar Item Identifier"; -static NSString* sToEndToolbarItemIdentifier = @"End Toolbar Item Identifier"; -static NSString* sZoomInToolbarItemIdentifier = @"Zoom In Toolbar Item Identifier"; -static NSString* sZoomOutToolbarItemIdentifier = @"Zoom Out Toolbar Item Identifier"; -static NSString* sProgressToolbarItemIdentifier = @"Progress Toolbar Item Identifier"; -static NSString* sDisplayToolbarItemIdentifier = @"Display Toolbar Item Identifier"; - - (id)initWithWindow:(NSWindow *)window { if (self = [super initWithWindow:window]) { @@ -78,111 +64,16 @@ static NSString* sDisplayToolbarItemIdentifier = @"Display Toolbar Item Identifi - (void)windowDidLoad { - NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier: sInputToolbarIdentifier] autorelease]; - - [toolbar setAllowsUserCustomization: YES]; - [toolbar setAutosavesConfiguration: YES]; - [toolbar setDelegate: self]; - - [[self window] setToolbar: toolbar]; -} - - -- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted { - NSToolbarItem * toolbarItem = nil; - id prototype = nil; - - if ([itemIdent isEqual: sOutputToolbarItemIdentifier]) - prototype = outputToolItem; - else if ([itemIdent isEqual: sLogToolbarItemIdentifier]) - prototype = logToolItem; - else if ([itemIdent isEqual: sPlayToolbarItemIdentifier]) - prototype = playToolItem; - else if ([itemIdent isEqual: sStopToolbarItemIdentifier]) - prototype = stopToolItem; - else if ([itemIdent isEqual: sFwdToolbarItemIdentifier]) - prototype = fwdToolItem; - else if ([itemIdent isEqual: sBckToolbarItemIdentifier]) - prototype = bckToolItem; - else if ([itemIdent isEqual: sToBegToolbarItemIdentifier]) - prototype = tobegToolItem; - else if ([itemIdent isEqual: sToEndToolbarItemIdentifier]) - prototype = toendToolItem; - else if ([itemIdent isEqual: sZoomInToolbarItemIdentifier]) - prototype = zoomInToolItem; - else if ([itemIdent isEqual: sZoomOutToolbarItemIdentifier]) - prototype = zoomOutToolItem; - else if ([itemIdent isEqual: sDisplayToolbarItemIdentifier]) - prototype = displayToolItem; - - if (prototype) { - toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease]; - - [toolbarItem setLabel: [prototype title]]; - [toolbarItem setPaletteLabel: [prototype alternateTitle]]; - [toolbarItem setToolTip: [prototype toolTip]]; - [toolbarItem setImage: [prototype image]]; - [toolbarItem setTarget: [prototype target]]; - [toolbarItem setAction: [prototype action]]; - [toolbarItem setTag: [prototype tag]]; - } else if ([itemIdent isEqual: sProgressToolbarItemIdentifier]) { - toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease]; - - [toolbarItem setView: progressToolItem]; - } else { - toolbarItem = nil; - } - return toolbarItem; -} - -- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar { - return [NSArray arrayWithObjects: - sOutputToolbarItemIdentifier, - NSToolbarSeparatorItemIdentifier, - sToBegToolbarItemIdentifier, - sBckToolbarItemIdentifier, - sPlayToolbarItemIdentifier, - sStopToolbarItemIdentifier, - sFwdToolbarItemIdentifier, - sToEndToolbarItemIdentifier, - NSToolbarSeparatorItemIdentifier, - sZoomInToolbarItemIdentifier, - sZoomOutToolbarItemIdentifier, - NSToolbarFlexibleSpaceItemIdentifier, - sDisplayToolbarItemIdentifier, - sLogToolbarItemIdentifier, - sProgressToolbarItemIdentifier, - nil]; -} - -- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar { - return [NSArray arrayWithObjects: - sToBegToolbarItemIdentifier, - sBckToolbarItemIdentifier, - sPlayToolbarItemIdentifier, - sStopToolbarItemIdentifier, - sFwdToolbarItemIdentifier, - sToEndToolbarItemIdentifier, - sZoomInToolbarItemIdentifier, - sZoomOutToolbarItemIdentifier, - sOutputToolbarItemIdentifier, - sLogToolbarItemIdentifier, - sDisplayToolbarItemIdentifier, - sProgressToolbarItemIdentifier, - NSToolbarCustomizeToolbarItemIdentifier, - NSToolbarFlexibleSpaceItemIdentifier, - NSToolbarSpaceItemIdentifier, - NSToolbarSeparatorItemIdentifier, nil]; } - (void) startAnimation { - [progressToolItem startAnimation:self]; + [progressIndicator startAnimation:self]; } - (void) stopAnimation { - [progressToolItem stopAnimation:self]; + [progressIndicator stopAnimation:self]; } - (IBAction) zoomIn: (id) sender diff --git a/Sources/VLToolbarButton.h b/Sources/VLToolbarButton.h new file mode 100644 index 0000000..00919ee --- /dev/null +++ b/Sources/VLToolbarButton.h @@ -0,0 +1,13 @@ +// +// VLToolbarButton.h +// VocalEasel +// +// Created by Matthias Neeracher on 8/23/11. +// Copyright 2011 Matthias Neeracher. All rights reserved. +// + +#import + +@interface VLToolbarButton : NSButton + +@end diff --git a/Sources/VLToolbarButton.mm b/Sources/VLToolbarButton.mm new file mode 100644 index 0000000..9bec189 --- /dev/null +++ b/Sources/VLToolbarButton.mm @@ -0,0 +1,21 @@ +// +// VLToolbarButton.mm +// VocalEasel +// +// Created by Matthias Neeracher on 8/23/11. +// Copyright 2011 Matthias Neeracher. All rights reserved. +// + +#import "VLToolbarButton.h" + +@implementation VLToolbarButton + +- (void)awakeFromNib +{ + NSButtonCell * cell = [self cell]; + [cell setHighlightsBy:NSPushInCellMask]; + [cell setShowsStateBy:NSContentsCellMask]; + [cell setBackgroundStyle:NSBackgroundStyleRaised]; +} + +@end diff --git a/VocalEasel.xcodeproj/project.pbxproj b/VocalEasel.xcodeproj/project.pbxproj index 44a0a37..d46a3b3 100644 --- a/VocalEasel.xcodeproj/project.pbxproj +++ b/VocalEasel.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 952CBB9F095FD1D900434E43 /* TVLSoundOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 952CBB9E095FD1D900434E43 /* TVLSoundOut.cpp */; }; 952CBBB6095FD37300434E43 /* VLModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 955E58E4095658AB0045FDA5 /* VLModel.cpp */; }; 952DCD78096BBB11001C2316 /* VLSheetViewChords.mm in Sources */ = {isa = PBXBuildFile; fileRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; }; - 9530A7020BD9E16700635FEC /* display.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 9530A7010BD9E16700635FEC /* display.tiff */; }; 9531F3510DE2B4CD004F78C2 /* VLAIFFDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9531F34E0DE2B4CD004F78C2 /* VLAIFFDocument.mm */; }; 9531F3520DE2B4CD004F78C2 /* VLMP3Document.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9531F3500DE2B4CD004F78C2 /* VLMP3Document.mm */; }; 9531F3670DE2B872004F78C2 /* lameWrapper in Copy Tools */ = {isa = PBXBuildFile; fileRef = 9531F3660DE2B872004F78C2 /* lameWrapper */; }; @@ -47,6 +46,12 @@ 953F4B511409C42100C627F9 /* TVLPitchGrid.h in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B501409C42100C627F9 /* TVLPitchGrid.h */; }; 953F4B531409C42100C627F9 /* TVLPitchGrid.mm in Sources */ = {isa = PBXBuildFile; fileRef = 953F4B521409C42100C627F9 /* TVLPitchGrid.mm */; }; 953F4B591409C54600C627F9 /* VLPitchGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953F4B3C1409B01200C627F9 /* VLPitchGrid.cpp */; }; + 953F4B60140AFA4B00C627F9 /* VLToolbarButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 953F4B5F140AFA4A00C627F9 /* VLToolbarButton.mm */; }; + 953F4B68140AFCE500C627F9 /* zoomin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B66140AFCE500C627F9 /* zoomin.icns */; }; + 953F4B69140AFCE500C627F9 /* zoomout.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B67140AFCE500C627F9 /* zoomout.icns */; }; + 953F4B6B140AFF2A00C627F9 /* display.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B6A140AFF2A00C627F9 /* display.icns */; }; + 953F4B6E140B040100C627F9 /* next.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B6C140B040000C627F9 /* next.icns */; }; + 953F4B6F140B040100C627F9 /* prev.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B6D140B040000C627F9 /* prev.icns */; }; 9545C5C30C092F4600251547 /* VLMMAWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9545C5C10C092F4600251547 /* VLMMAWriter.cpp */; }; 95498DBD0AE3812F006B5F81 /* VLSoundSched.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95498DBC0AE3812F006B5F81 /* VLSoundSched.mm */; }; 954BBD860AEDDE5300BBFD5F /* VLAppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 954BBD850AEDDE5300BBFD5F /* VLAppController.mm */; }; @@ -71,8 +76,6 @@ 959A3A140DE64BA300EF207B /* stop.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A120DE64BA300EF207B /* stop.icns */; }; 959A3A260DE78BCD00EF207B /* bck.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A220DE78BCD00EF207B /* bck.icns */; }; 959A3A270DE78BCD00EF207B /* fwd.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A230DE78BCD00EF207B /* fwd.icns */; }; - 959A3A280DE78BCD00EF207B /* tobeg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A240DE78BCD00EF207B /* tobeg.icns */; }; - 959A3A290DE78BCD00EF207B /* toend.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A250DE78BCD00EF207B /* toend.icns */; }; 959A3A6E0DE8CB5B00EF207B /* VLMIDIWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 959A3A6C0DE8CB5B00EF207B /* VLMIDIWriter.cpp */; }; 959B77C20DE3139F004432E0 /* installLame.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 958139C20DE2FBE4003C00B4 /* installLame.scpt */; }; 95A1C3860AF2ACE20076597D /* VLSheetWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95A1C3850AF2ACE20076597D /* VLSheetWindow.mm */; }; @@ -117,11 +120,6 @@ 95FC668F0AF0A08C003D9C11 /* VLLogWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95FC668E0AF0A08C003D9C11 /* VLLogWindow.mm */; }; 95FC66A60AF0A24C003D9C11 /* VLPDFWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95FC66A50AF0A24C003D9C11 /* VLPDFWindow.mm */; }; 95FC66C30AF0A4D4003D9C11 /* console.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66BC0AF0A4D4003D9C11 /* console.icns */; }; - 95FC66C40AF0A4D4003D9C11 /* music.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66BD0AF0A4D4003D9C11 /* music.tiff */; }; - 95FC66C50AF0A4D5003D9C11 /* nextpage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66BE0AF0A4D4003D9C11 /* nextpage.tiff */; }; - 95FC66C60AF0A4D5003D9C11 /* prevpage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66BF0AF0A4D4003D9C11 /* prevpage.tiff */; }; - 95FC66C80AF0A4D5003D9C11 /* zoomin.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66C10AF0A4D4003D9C11 /* zoomin.tiff */; }; - 95FC66C90AF0A4D5003D9C11 /* zoomout.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66C20AF0A4D4003D9C11 /* zoomout.tiff */; }; 95FC66CE0AF0A591003D9C11 /* VLPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95FC66CC0AF0A591003D9C11 /* VLPDFView.mm */; }; /* End PBXBuildFile section */ @@ -209,7 +207,6 @@ 952CBB9E095FD1D900434E43 /* TVLSoundOut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = TVLSoundOut.cpp; path = Tests/TVLSoundOut.cpp; sourceTree = ""; }; 952DCD76096BBB11001C2316 /* VLSheetViewChords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLSheetViewChords.h; path = Sources/VLSheetViewChords.h; sourceTree = ""; }; 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLSheetViewChords.mm; path = Sources/VLSheetViewChords.mm; sourceTree = ""; }; - 9530A7010BD9E16700635FEC /* display.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = display.tiff; path = Resources/display.tiff; sourceTree = ""; }; 9531F34D0DE2B4CD004F78C2 /* VLAIFFDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLAIFFDocument.h; path = Sources/VLAIFFDocument.h; sourceTree = ""; }; 9531F34E0DE2B4CD004F78C2 /* VLAIFFDocument.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLAIFFDocument.mm; path = Sources/VLAIFFDocument.mm; sourceTree = ""; }; 9531F34F0DE2B4CD004F78C2 /* VLMP3Document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLMP3Document.h; path = Sources/VLMP3Document.h; sourceTree = ""; }; @@ -228,6 +225,13 @@ 953F4B501409C42100C627F9 /* TVLPitchGrid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TVLPitchGrid.h; path = Tests/TVLPitchGrid/TVLPitchGrid.h; sourceTree = SOURCE_ROOT; }; 953F4B521409C42100C627F9 /* TVLPitchGrid.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = TVLPitchGrid.mm; path = Tests/TVLPitchGrid/TVLPitchGrid.mm; sourceTree = SOURCE_ROOT; }; 953F4B541409C42100C627F9 /* TVLPitchGrid-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "TVLPitchGrid-Prefix.pch"; path = "Tests/TVLPitchGrid/TVLPitchGrid-Prefix.pch"; sourceTree = SOURCE_ROOT; }; + 953F4B5E140AFA4900C627F9 /* VLToolbarButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLToolbarButton.h; path = Sources/VLToolbarButton.h; sourceTree = ""; }; + 953F4B5F140AFA4A00C627F9 /* VLToolbarButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLToolbarButton.mm; path = Sources/VLToolbarButton.mm; sourceTree = ""; }; + 953F4B66140AFCE500C627F9 /* zoomin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = zoomin.icns; path = Resources/zoomin.icns; sourceTree = ""; }; + 953F4B67140AFCE500C627F9 /* zoomout.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = zoomout.icns; path = Resources/zoomout.icns; sourceTree = ""; }; + 953F4B6A140AFF2A00C627F9 /* display.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = display.icns; path = Resources/display.icns; sourceTree = ""; }; + 953F4B6C140B040000C627F9 /* next.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = next.icns; path = Resources/next.icns; sourceTree = ""; }; + 953F4B6D140B040000C627F9 /* prev.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = prev.icns; path = Resources/prev.icns; sourceTree = ""; }; 9545C5C10C092F4600251547 /* VLMMAWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = VLMMAWriter.cpp; path = Sources/VLMMAWriter.cpp; sourceTree = ""; }; 9545C5C20C092F4600251547 /* VLMMAWriter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLMMAWriter.h; path = Sources/VLMMAWriter.h; sourceTree = ""; }; 95498DBB0AE3812F006B5F81 /* VLSoundSched.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLSoundSched.h; path = Sources/VLSoundSched.h; sourceTree = ""; }; @@ -265,8 +269,6 @@ 959A3A120DE64BA300EF207B /* stop.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = stop.icns; path = Resources/stop.icns; sourceTree = ""; }; 959A3A220DE78BCD00EF207B /* bck.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = bck.icns; path = Resources/bck.icns; sourceTree = ""; }; 959A3A230DE78BCD00EF207B /* fwd.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = fwd.icns; path = Resources/fwd.icns; sourceTree = ""; }; - 959A3A240DE78BCD00EF207B /* tobeg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = tobeg.icns; path = Resources/tobeg.icns; sourceTree = ""; }; - 959A3A250DE78BCD00EF207B /* toend.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = toend.icns; path = Resources/toend.icns; sourceTree = ""; }; 959A3A6C0DE8CB5B00EF207B /* VLMIDIWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VLMIDIWriter.cpp; path = Sources/VLMIDIWriter.cpp; sourceTree = ""; }; 959A3A6D0DE8CB5B00EF207B /* VLMIDIWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLMIDIWriter.h; path = Sources/VLMIDIWriter.h; sourceTree = ""; }; 95A1C3840AF2ACE20076597D /* VLSheetWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLSheetWindow.h; path = Sources/VLSheetWindow.h; sourceTree = ""; }; @@ -323,11 +325,6 @@ 95FC66A40AF0A24C003D9C11 /* VLPDFWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLPDFWindow.h; path = Sources/VLPDFWindow.h; sourceTree = ""; }; 95FC66A50AF0A24C003D9C11 /* VLPDFWindow.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = VLPDFWindow.mm; path = Sources/VLPDFWindow.mm; sourceTree = ""; }; 95FC66BC0AF0A4D4003D9C11 /* console.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = console.icns; path = Resources/console.icns; sourceTree = ""; }; - 95FC66BD0AF0A4D4003D9C11 /* music.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = music.tiff; path = Resources/music.tiff; sourceTree = ""; }; - 95FC66BE0AF0A4D4003D9C11 /* nextpage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = nextpage.tiff; path = Resources/nextpage.tiff; sourceTree = ""; }; - 95FC66BF0AF0A4D4003D9C11 /* prevpage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = prevpage.tiff; path = Resources/prevpage.tiff; sourceTree = ""; }; - 95FC66C10AF0A4D4003D9C11 /* zoomin.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = zoomin.tiff; path = Resources/zoomin.tiff; sourceTree = ""; }; - 95FC66C20AF0A4D4003D9C11 /* zoomout.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = zoomout.tiff; path = Resources/zoomout.tiff; sourceTree = ""; }; 95FC66CC0AF0A591003D9C11 /* VLPDFView.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = VLPDFView.mm; path = Sources/VLPDFView.mm; sourceTree = ""; }; 95FC66CD0AF0A591003D9C11 /* VLPDFView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLPDFView.h; path = Sources/VLPDFView.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -449,32 +446,11 @@ 2A37F4B8FDCFA73011CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 959A3A220DE78BCD00EF207B /* bck.icns */, - 959A3A230DE78BCD00EF207B /* fwd.icns */, - 959A3A240DE78BCD00EF207B /* tobeg.icns */, - 959A3A250DE78BCD00EF207B /* toend.icns */, + 953F4B70140B041800C627F9 /* Icons */, 9524DAF70BE569C50002AC03 /* Help */, - 95003B3F0D4B9A5D00C9849C /* MainMenu.xib */, - 95003B410D4B9A5D00C9849C /* VLDocument.xib */, - 95003B430D4B9A5D00C9849C /* VLGroove.xib */, - 95003B450D4B9A5D00C9849C /* VLLogWindow.xib */, - 95003B470D4B9A5D00C9849C /* VLMirrorWindow.xib */, - 95003B490D4B9A5D00C9849C /* VLPDFWindow.xib */, - 95049CF20BDC32CD0015EE6E /* installLilypond.scpt */, - 958139C20DE2FBE4003C00B4 /* installLame.scpt */, - 95049D010BDC43510015EE6E /* installPython.scpt */, - 95FC66BC0AF0A4D4003D9C11 /* console.icns */, - 9530A7010BD9E16700635FEC /* display.tiff */, - 959A3A110DE64BA300EF207B /* play.icns */, - 959A3A120DE64BA300EF207B /* stop.icns */, - 95FC66BD0AF0A4D4003D9C11 /* music.tiff */, - 95FC66BE0AF0A4D4003D9C11 /* nextpage.tiff */, - 95FC66BF0AF0A4D4003D9C11 /* prevpage.tiff */, - 95FC66C10AF0A4D4003D9C11 /* zoomin.tiff */, - 95FC66C20AF0A4D4003D9C11 /* zoomout.tiff */, + 953F4B72140B044800C627F9 /* Windows */, + 953F4B71140B043500C627F9 /* Scripts */, 95E04DCA0AEB4D9B006F30A0 /* Templates */, - 9593E4E60AE0ED1F00035816 /* vlsong.icns */, - 9593E4E70AE0ED1F00035816 /* vlapp.icns */, 95B3E1980960E58B000E9C0D /* Music */, 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */, 8D15AC360486D014006FF6A4 /* Info.plist */, @@ -527,6 +503,48 @@ name = "Supporting Files"; sourceTree = ""; }; + 953F4B70140B041800C627F9 /* Icons */ = { + isa = PBXGroup; + children = ( + 953F4B6C140B040000C627F9 /* next.icns */, + 953F4B6D140B040000C627F9 /* prev.icns */, + 953F4B6A140AFF2A00C627F9 /* display.icns */, + 953F4B66140AFCE500C627F9 /* zoomin.icns */, + 953F4B67140AFCE500C627F9 /* zoomout.icns */, + 959A3A220DE78BCD00EF207B /* bck.icns */, + 959A3A230DE78BCD00EF207B /* fwd.icns */, + 95FC66BC0AF0A4D4003D9C11 /* console.icns */, + 959A3A110DE64BA300EF207B /* play.icns */, + 959A3A120DE64BA300EF207B /* stop.icns */, + 9593E4E60AE0ED1F00035816 /* vlsong.icns */, + 9593E4E70AE0ED1F00035816 /* vlapp.icns */, + ); + name = Icons; + sourceTree = ""; + }; + 953F4B71140B043500C627F9 /* Scripts */ = { + isa = PBXGroup; + children = ( + 95049CF20BDC32CD0015EE6E /* installLilypond.scpt */, + 958139C20DE2FBE4003C00B4 /* installLame.scpt */, + 95049D010BDC43510015EE6E /* installPython.scpt */, + ); + name = Scripts; + sourceTree = ""; + }; + 953F4B72140B044800C627F9 /* Windows */ = { + isa = PBXGroup; + children = ( + 95003B3F0D4B9A5D00C9849C /* MainMenu.xib */, + 95003B410D4B9A5D00C9849C /* VLDocument.xib */, + 95003B430D4B9A5D00C9849C /* VLGroove.xib */, + 95003B450D4B9A5D00C9849C /* VLLogWindow.xib */, + 95003B470D4B9A5D00C9849C /* VLMirrorWindow.xib */, + 95003B490D4B9A5D00C9849C /* VLPDFWindow.xib */, + ); + name = Windows; + sourceTree = ""; + }; 9546A1090B08B47A0028503B /* CoreAudio SDK Sources */ = { isa = PBXGroup; children = ( @@ -664,6 +682,8 @@ 95E299BE0B2006F5001977D2 /* VLSheetViewLyrics.mm */, 954DD4B70B444B220056C504 /* VLSheetViewSelection.h */, 954DD4E50B44E67F0056C504 /* VLSheetViewSelection.mm */, + 953F4B5E140AFA4900C627F9 /* VLToolbarButton.h */, + 953F4B5F140AFA4A00C627F9 /* VLToolbarButton.mm */, ); name = Views; sourceTree = ""; @@ -891,12 +911,6 @@ 9593E4E90AE0ED1F00035816 /* vlapp.icns in Resources */, 95E04DCE0AEB4D9B006F30A0 /* Templates in Resources */, 95FC66C30AF0A4D4003D9C11 /* console.icns in Resources */, - 95FC66C40AF0A4D4003D9C11 /* music.tiff in Resources */, - 95FC66C50AF0A4D5003D9C11 /* nextpage.tiff in Resources */, - 95FC66C60AF0A4D5003D9C11 /* prevpage.tiff in Resources */, - 95FC66C80AF0A4D5003D9C11 /* zoomin.tiff in Resources */, - 95FC66C90AF0A4D5003D9C11 /* zoomout.tiff in Resources */, - 9530A7020BD9E16700635FEC /* display.tiff in Resources */, 9524DAFB0BE569C50002AC03 /* Help in Resources */, 95003B4B0D4B9A5D00C9849C /* MainMenu.xib in Resources */, 95003B4C0D4B9A5D00C9849C /* VLDocument.xib in Resources */, @@ -908,8 +922,11 @@ 959A3A140DE64BA300EF207B /* stop.icns in Resources */, 959A3A260DE78BCD00EF207B /* bck.icns in Resources */, 959A3A270DE78BCD00EF207B /* fwd.icns in Resources */, - 959A3A280DE78BCD00EF207B /* tobeg.icns in Resources */, - 959A3A290DE78BCD00EF207B /* toend.icns in Resources */, + 953F4B68140AFCE500C627F9 /* zoomin.icns in Resources */, + 953F4B69140AFCE500C627F9 /* zoomout.icns in Resources */, + 953F4B6B140AFF2A00C627F9 /* display.icns in Resources */, + 953F4B6E140B040100C627F9 /* next.icns in Resources */, + 953F4B6F140B040100C627F9 /* prev.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1018,6 +1035,7 @@ 959A3A6E0DE8CB5B00EF207B /* VLMIDIWriter.cpp in Sources */, 95CFA83814091B7800D0DB0D /* VLPitchName.cpp in Sources */, 953F4B3D1409B01200C627F9 /* VLPitchGrid.cpp in Sources */, + 953F4B60140AFA4B00C627F9 /* VLToolbarButton.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };