diff --git a/Artwork/.DS_Store b/Artwork/.DS_Store index 7ef3a2c..dc226fa 100644 Binary files a/Artwork/.DS_Store and b/Artwork/.DS_Store differ diff --git a/Artwork/Annotation.artx/Preview/preview.png b/Artwork/Annotation.artx/Preview/preview.png new file mode 100644 index 0000000..1ee2ad3 Binary files /dev/null and b/Artwork/Annotation.artx/Preview/preview.png differ diff --git a/Artwork/Annotation.artx/QuickLook/Preview.pdf b/Artwork/Annotation.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..848fd2b Binary files /dev/null and b/Artwork/Annotation.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/Annotation.artx/doc.thread b/Artwork/Annotation.artx/doc.thread new file mode 100644 index 0000000..79be6f8 Binary files /dev/null and b/Artwork/Annotation.artx/doc.thread differ diff --git a/Artwork/AppIcon.artx/Preview/preview.png b/Artwork/AppIcon.artx/Preview/preview.png index 144bc9b..2bf72db 100644 Binary files a/Artwork/AppIcon.artx/Preview/preview.png and b/Artwork/AppIcon.artx/Preview/preview.png differ diff --git a/Artwork/AppIcon.artx/QuickLook/Preview.pdf b/Artwork/AppIcon.artx/QuickLook/Preview.pdf index 76560af..b73f715 100644 Binary files a/Artwork/AppIcon.artx/QuickLook/Preview.pdf and b/Artwork/AppIcon.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/AppIcon.artx/doc.thread b/Artwork/AppIcon.artx/doc.thread index c64718f..1a80b12 100644 Binary files a/Artwork/AppIcon.artx/doc.thread and b/Artwork/AppIcon.artx/doc.thread differ diff --git a/Artwork/Customize.artx/Preview/preview.png b/Artwork/Customize.artx/Preview/preview.png new file mode 100644 index 0000000..b7dd9b9 Binary files /dev/null and b/Artwork/Customize.artx/Preview/preview.png differ diff --git a/Artwork/Customize.artx/QuickLook/Preview.pdf b/Artwork/Customize.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..e38a2ce Binary files /dev/null and b/Artwork/Customize.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/Customize.artx/Source Images/ToolbarCustomizeIcon.icns b/Artwork/Customize.artx/Source Images/ToolbarCustomizeIcon.icns new file mode 100644 index 0000000..ed8746d Binary files /dev/null and b/Artwork/Customize.artx/Source Images/ToolbarCustomizeIcon.icns differ diff --git a/Artwork/Customize.artx/doc.thread b/Artwork/Customize.artx/doc.thread new file mode 100644 index 0000000..0397718 Binary files /dev/null and b/Artwork/Customize.artx/doc.thread differ diff --git a/Artwork/Delete.artx/Preview/preview.png b/Artwork/Delete.artx/Preview/preview.png new file mode 100644 index 0000000..ddbd6ab Binary files /dev/null and b/Artwork/Delete.artx/Preview/preview.png differ diff --git a/Artwork/Delete.artx/QuickLook/Preview.pdf b/Artwork/Delete.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..8053705 Binary files /dev/null and b/Artwork/Delete.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/Delete.artx/doc.thread b/Artwork/Delete.artx/doc.thread new file mode 100644 index 0000000..a49a962 Binary files /dev/null and b/Artwork/Delete.artx/doc.thread differ diff --git a/Artwork/Ffd.artx/Preview/preview.png b/Artwork/Ffd.artx/Preview/preview.png new file mode 100644 index 0000000..ecf602e Binary files /dev/null and b/Artwork/Ffd.artx/Preview/preview.png differ diff --git a/Artwork/Ffd.artx/QuickLook/Preview.pdf b/Artwork/Ffd.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..fdc9e39 Binary files /dev/null and b/Artwork/Ffd.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/Ffd.artx/doc.thread b/Artwork/Ffd.artx/doc.thread new file mode 100644 index 0000000..430a540 Binary files /dev/null and b/Artwork/Ffd.artx/doc.thread differ diff --git a/Artwork/Pause.artx/Preview/preview.png b/Artwork/Pause.artx/Preview/preview.png new file mode 100644 index 0000000..ec34d4c Binary files /dev/null and b/Artwork/Pause.artx/Preview/preview.png differ diff --git a/Artwork/Pause.artx/QuickLook/Preview.pdf b/Artwork/Pause.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..47003bf Binary files /dev/null and b/Artwork/Pause.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/Pause.artx/doc.thread b/Artwork/Pause.artx/doc.thread new file mode 100644 index 0000000..0b9672b Binary files /dev/null and b/Artwork/Pause.artx/doc.thread differ diff --git a/Artwork/Play.artx/Preview/preview.png b/Artwork/Play.artx/Preview/preview.png new file mode 100644 index 0000000..48a694a Binary files /dev/null and b/Artwork/Play.artx/Preview/preview.png differ diff --git a/Artwork/Play.artx/QuickLook/Preview.pdf b/Artwork/Play.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..922c336 Binary files /dev/null and b/Artwork/Play.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/Play.artx/doc.thread b/Artwork/Play.artx/doc.thread new file mode 100644 index 0000000..bcf8766 Binary files /dev/null and b/Artwork/Play.artx/doc.thread differ diff --git a/Artwork/Print.artx/Preview/preview.png b/Artwork/Print.artx/Preview/preview.png new file mode 100644 index 0000000..7d2d366 Binary files /dev/null and b/Artwork/Print.artx/Preview/preview.png differ diff --git a/Artwork/Print.artx/QuickLook/Preview.pdf b/Artwork/Print.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..586fe02 Binary files /dev/null and b/Artwork/Print.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/Print.artx/Source Images/Printer.icns b/Artwork/Print.artx/Source Images/Printer.icns new file mode 100644 index 0000000..f664e57 Binary files /dev/null and b/Artwork/Print.artx/Source Images/Printer.icns differ diff --git a/Artwork/Print.artx/doc.thread b/Artwork/Print.artx/doc.thread new file mode 100644 index 0000000..43dd6d3 Binary files /dev/null and b/Artwork/Print.artx/doc.thread differ diff --git a/Artwork/Rev.artx/Preview/preview.png b/Artwork/Rev.artx/Preview/preview.png new file mode 100644 index 0000000..ff839ad Binary files /dev/null and b/Artwork/Rev.artx/Preview/preview.png differ diff --git a/Artwork/Rev.artx/QuickLook/Preview.pdf b/Artwork/Rev.artx/QuickLook/Preview.pdf new file mode 100644 index 0000000..783494e Binary files /dev/null and b/Artwork/Rev.artx/QuickLook/Preview.pdf differ diff --git a/Artwork/Rev.artx/doc.thread b/Artwork/Rev.artx/doc.thread new file mode 100644 index 0000000..8221409 Binary files /dev/null and b/Artwork/Rev.artx/doc.thread differ diff --git a/Medianno.xcodeproj/project.pbxproj b/Medianno.xcodeproj/project.pbxproj index ea7b36c..e1b9f6c 100644 --- a/Medianno.xcodeproj/project.pbxproj +++ b/Medianno.xcodeproj/project.pbxproj @@ -34,6 +34,14 @@ 95CB6975140012FE005A0346 /* MATag.xib in Resources */ = {isa = PBXBuildFile; fileRef = 95CB6973140012FE005A0346 /* MATag.xib */; }; 95CB697814001F26005A0346 /* MAColorForTag.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95CB697714001F26005A0346 /* MAColorForTag.mm */; }; 95D8038B14012D7A000C0779 /* MADragging.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95D8038A14012D7A000C0779 /* MADragging.mm */; }; + 95D803A5140344CF000C0779 /* fwd.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803A1140344CF000C0779 /* fwd.icns */; }; + 95D803A6140344CF000C0779 /* pause.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803A2140344CF000C0779 /* pause.icns */; }; + 95D803A7140344CF000C0779 /* play.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803A3140344CF000C0779 /* play.icns */; }; + 95D803A8140344CF000C0779 /* rev.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803A4140344CF000C0779 /* rev.icns */; }; + 95D803AB14034E5F000C0779 /* anno.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AA14034E5F000C0779 /* anno.icns */; }; + 95D803AD1403505F000C0779 /* del.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AC1403505F000C0779 /* del.icns */; }; + 95D803B0140355E6000C0779 /* custom.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AE140355E6000C0779 /* custom.icns */; }; + 95D803B1140355E6000C0779 /* print.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95D803AF140355E6000C0779 /* print.icns */; }; 95E2027D13FE9BF500369B31 /* MAMovieWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 95E2027C13FE9BF500369B31 /* MAMovieWindow.m */; }; 95E2028113FE9C6C00369B31 /* MAMovie.xib in Resources */ = {isa = PBXBuildFile; fileRef = 95E2027F13FE9C6C00369B31 /* MAMovie.xib */; }; 95E8C26713FD72D2004E9839 /* MAColorForURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95E8C26613FD72D2004E9839 /* MAColorForURL.mm */; }; @@ -83,6 +91,14 @@ 95CB697714001F26005A0346 /* MAColorForTag.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MAColorForTag.mm; sourceTree = ""; }; 95D8038914012D7A000C0779 /* MADragging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MADragging.h; sourceTree = ""; }; 95D8038A14012D7A000C0779 /* MADragging.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MADragging.mm; sourceTree = ""; }; + 95D803A1140344CF000C0779 /* fwd.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = fwd.icns; path = Resources/fwd.icns; sourceTree = ""; }; + 95D803A2140344CF000C0779 /* pause.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = pause.icns; path = Resources/pause.icns; sourceTree = ""; }; + 95D803A3140344CF000C0779 /* play.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = play.icns; path = Resources/play.icns; sourceTree = ""; }; + 95D803A4140344CF000C0779 /* rev.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = rev.icns; path = Resources/rev.icns; sourceTree = ""; }; + 95D803AA14034E5F000C0779 /* anno.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = anno.icns; path = Resources/anno.icns; sourceTree = ""; }; + 95D803AC1403505F000C0779 /* del.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = del.icns; path = Resources/del.icns; sourceTree = ""; }; + 95D803AE140355E6000C0779 /* custom.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = custom.icns; path = Resources/custom.icns; sourceTree = ""; }; + 95D803AF140355E6000C0779 /* print.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = print.icns; path = Resources/print.icns; sourceTree = ""; }; 95E2027B13FE9BF500369B31 /* MAMovieWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAMovieWindow.h; sourceTree = ""; }; 95E2027C13FE9BF500369B31 /* MAMovieWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MAMovieWindow.m; sourceTree = ""; }; 95E2028013FE9C6C00369B31 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = Medianno/en.lproj/MAMovie.xib; sourceTree = ""; }; @@ -145,6 +161,14 @@ 950BB67113F1F26200D8E669 /* Supporting Files */ = { isa = PBXGroup; children = ( + 95D803AE140355E6000C0779 /* custom.icns */, + 95D803AF140355E6000C0779 /* print.icns */, + 95D803AC1403505F000C0779 /* del.icns */, + 95D803AA14034E5F000C0779 /* anno.icns */, + 95D803A1140344CF000C0779 /* fwd.icns */, + 95D803A2140344CF000C0779 /* pause.icns */, + 95D803A3140344CF000C0779 /* play.icns */, + 95D803A4140344CF000C0779 /* rev.icns */, 95BCFA1F13F76A04000F650F /* app.icns */, 95BCFA2013F76A04000F650F /* doc.icns */, 950BB67213F1F26200D8E669 /* Medianno-Info.plist */, @@ -276,6 +300,14 @@ 95BCFA2213F76A04000F650F /* doc.icns in Resources */, 95E2028113FE9C6C00369B31 /* MAMovie.xib in Resources */, 95CB6975140012FE005A0346 /* MATag.xib in Resources */, + 95D803A5140344CF000C0779 /* fwd.icns in Resources */, + 95D803A6140344CF000C0779 /* pause.icns in Resources */, + 95D803A7140344CF000C0779 /* play.icns in Resources */, + 95D803A8140344CF000C0779 /* rev.icns in Resources */, + 95D803AB14034E5F000C0779 /* anno.icns in Resources */, + 95D803AD1403505F000C0779 /* del.icns in Resources */, + 95D803B0140355E6000C0779 /* custom.icns in Resources */, + 95D803B1140355E6000C0779 /* print.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Medianno/MADocWindow.mm b/Medianno/MADocWindow.mm index cb4e3fe..76ec811 100644 --- a/Medianno/MADocWindow.mm +++ b/Medianno/MADocWindow.mm @@ -285,12 +285,21 @@ static const char * kMADocWindowObserver = "MADocWindowObserver"; if ([item action] == @selector(paste:)) return [self canPaste]; - NSMenuItem * menuItem = (NSMenuItem *)item; if ([item action] == @selector(toggleMediaPlay:)) { - if ([currentMovie rate] > 0.0f) - [menuItem setTitle:NSLocalizedString(@"Pause", @"Pause playback")]; + NSString * title; + if ([currentMovie rate] > 0.0f) + title = NSLocalizedString(@"Pause", @"Pause playback"); else - [menuItem setTitle:NSLocalizedString(@"Play", @"Start playback")]; + title = NSLocalizedString(@"Play", @"Start playback"); + if ([item isKindOfClass:[NSToolbarItem class]]) { + [item setLabel:title]; + if ([currentMovie rate] > 0.0f) + [item setImage:[NSImage imageNamed:@"pause.icns"]]; + else + [item setImage:[NSImage imageNamed:@"play.icns"]]; + } else { + [item setTitle:title]; + } } return [mediaController selectionIndex] != NSNotFound; } diff --git a/Medianno/Resources/anno.icns b/Medianno/Resources/anno.icns new file mode 100644 index 0000000..da8444a Binary files /dev/null and b/Medianno/Resources/anno.icns differ diff --git a/Medianno/Resources/custom.icns b/Medianno/Resources/custom.icns new file mode 100644 index 0000000..86ed28e Binary files /dev/null and b/Medianno/Resources/custom.icns differ diff --git a/Medianno/Resources/del.icns b/Medianno/Resources/del.icns new file mode 100644 index 0000000..d8cab2a Binary files /dev/null and b/Medianno/Resources/del.icns differ diff --git a/Medianno/Resources/fwd.icns b/Medianno/Resources/fwd.icns new file mode 100644 index 0000000..d67eef5 Binary files /dev/null and b/Medianno/Resources/fwd.icns differ diff --git a/Medianno/Resources/pause.icns b/Medianno/Resources/pause.icns new file mode 100644 index 0000000..56b4737 Binary files /dev/null and b/Medianno/Resources/pause.icns differ diff --git a/Medianno/Resources/play.icns b/Medianno/Resources/play.icns new file mode 100644 index 0000000..1151d15 Binary files /dev/null and b/Medianno/Resources/play.icns differ diff --git a/Medianno/Resources/print.icns b/Medianno/Resources/print.icns new file mode 100644 index 0000000..0cb4a66 Binary files /dev/null and b/Medianno/Resources/print.icns differ diff --git a/Medianno/Resources/rev.icns b/Medianno/Resources/rev.icns new file mode 100644 index 0000000..6b9c504 Binary files /dev/null and b/Medianno/Resources/rev.icns differ diff --git a/Medianno/en.lproj/MADocument.xib b/Medianno/en.lproj/MADocument.xib index 003d361..e4e6bb8 100644 --- a/Medianno/en.lproj/MADocument.xib +++ b/Medianno/en.lproj/MADocument.xib @@ -21,7 +21,9 @@ YES + NSToolbarItem NSButton + NSToolbarFlexibleSpaceItem NSCustomObject NSArrayController NSSplitView @@ -29,15 +31,20 @@ NSTableView NSTableCellView NSTextField + NSSearchField + NSSearchFieldCell + NSToolbarSeparatorItem NSWindowTemplate NSTextFieldCell NSButtonCell NSTableColumn NSBox NSView + NSToolbarSpaceItem NSTokenFieldCell NSScrollView QTMovieView + NSToolbar NSUserDefaultsController NSScroller NSTableHeaderView @@ -64,13 +71,418 @@ FirstResponder - 15 + 4111 2 {{200, 400}, {1280, 809}} 1886912512 Window MADocumentWindow - View + + + EA8EC1DA-CC5D-4AE8-8D57-425A1B52FC07 + + + YES + YES + YES + NO + 1 + 1 + + YES + + YES + 10408ABC-594E-48CD-9161-E21F2A53A796 + 18B482DB-2594-4103-B3B2-1AFF904C6AC8 + 18FD3E74-6E8C-445B-B04D-55EDA8F7ECE7 + 4F6A0E70-BC8D-4D4C-8BEF-E1534A157008 + 664414C9-912C-4CDB-AA38-3FE2DED268DC + 8C60B854-069F-498C-B9DA-51102A7886FD + D1B223FD-2B2A-471D-A6A4-0230D2846698 + F098D458-9396-4287-B8C8-F9F580B07CFA + NSToolbarFlexibleSpaceItem + NSToolbarSeparatorItem + NSToolbarSpaceItem + + + YES + + + 10408ABC-594E-48CD-9161-E21F2A53A796 + + Play + Play + + + + NSImage + play + + + + {0, 0} + {0, 0} + YES + YES + 102 + YES + 0 + + + + 18B482DB-2594-4103-B3B2-1AFF904C6AC8 + + << + << + + + + NSImage + rev + + + + {0, 0} + {0, 0} + YES + YES + 101 + YES + 0 + + + + 18FD3E74-6E8C-445B-B04D-55EDA8F7ECE7 + + Annotate + Annotate + + + + NSImage + anno + + + + {0, 0} + {0, 0} + YES + YES + 104 + YES + 0 + + + + 4F6A0E70-BC8D-4D4C-8BEF-E1534A157008 + + >> + >> + + + + NSImage + fwd + + + + {0, 0} + {0, 0} + YES + YES + 103 + YES + 0 + + + + 664414C9-912C-4CDB-AA38-3FE2DED268DC + + Delete + Delete + + + + NSImage + del + + + + {0, 0} + {0, 0} + YES + YES + 104 + YES + 0 + + + + 8C60B854-069F-498C-B9DA-51102A7886FD + + Print + Print + + + + NSImage + print + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + D1B223FD-2B2A-471D-A6A4-0230D2846698 + + Customize + Customize + + + + NSImage + custom + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + F098D458-9396-4287-B8C8-F9F580B07CFA + + Search + Search + + + + 268 + {{0, 14}, {96, 22}} + + + + _NS:123 + 100 + YES + + 343014976 + 268436544 + + + LucidaGrande + 13 + 1044 + + _NS:123 + + YES + 1 + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + 130560 + 0 + search + + _searchFieldSearch: + + 138690815 + 0 + + 400 + 75 + + + 130560 + 0 + clear + + YES + + YES + + YES + AXDescription + NSAccessibilityEncodedAttributesValueType + + + YES + cancel + + + + + + _searchFieldCancel: + + 138690815 + 0 + + 400 + 75 + + 255 + + + + + + {96, 22} + {200, 22} + YES + YES + 100 + YES + 0 + + + NSToolbarFlexibleSpaceItem + + Flexible Space + + + + + + {1, 5} + {20000, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + + + + NSToolbarSeparatorItem + + Separator + + + + + + {12, 5} + {12, 1000} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + + + + + NSToolbarSpaceItem + + Space + + + + + + {32, 5} + {32, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + YES + + + + + + + + + + + + + + YES + + + + + + + + + + + + + + {450, 400} @@ -141,21 +553,14 @@ 6 System headerTextColor - - 3 - MAA - + 337772096 2048 Text Cell - - LucidaGrande - 13 - 1044 - + 6 @@ -166,12 +571,7 @@ MC42NjY2NjY2NjY3AA - - 6 - System - controlTextColor - - + 3 YES @@ -217,10 +617,7 @@ 6 System headerColor - - 3 - MQA - + @@ -626,12 +1023,7 @@ 0 Box - - 6 - System - textBackgroundColor - - + 3 MCAwLjgwMDAwMDAxMTkAA @@ -657,8 +1049,8 @@ - {{0, 0}, {2560, 1418}} - {450, 422} + {{0, 0}, {1440, 878}} + {450, 478} {10000000000000, 10000000000000} 128 YES @@ -1348,6 +1740,54 @@ 100262 + + + mediaSkipBackward: + + + + 100274 + + + + toggleMediaPlay: + + + + 100275 + + + + mediaSkipForward: + + + + 100276 + + + + addAnnotation: + + + + 100282 + + + + delete: + + + + 100284 + + + + runToolbarCustomizationPalette: + + + + 100288 + @@ -1376,6 +1816,7 @@ YES + Window @@ -1736,6 +2177,98 @@ + + 100263 + + + YES + + + + + + + + + + + + + + + + 100267 + + + + + 100268 + + + + + 100269 + + + + + 100271 + + + + + 100272 + + + + + 100273 + + + + + 100278 + + + + + 100281 + + + YES + + + + + + 100279 + + + YES + + + + + + 100280 + + + + + 100283 + + + + + 100286 + + + + + 100287 + + + @@ -1800,6 +2333,20 @@ 100237.IBPluginDependency 100238.IBPluginDependency 100239.IBPluginDependency + 100263.IBPluginDependency + 100267.IBPluginDependency + 100268.IBPluginDependency + 100269.IBPluginDependency + 100271.IBPluginDependency + 100272.IBPluginDependency + 100273.IBPluginDependency + 100278.IBPluginDependency + 100279.IBPluginDependency + 100280.IBPluginDependency + 100281.IBPluginDependency + 100283.IBPluginDependency + 100286.IBPluginDependency + 100287.IBPluginDependency 5.IBNSWindowAutoPositionCentersHorizontal 5.IBNSWindowAutoPositionCentersVertical 5.IBPluginDependency @@ -1875,6 +2422,20 @@ 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 @@ -1894,7 +2455,7 @@ - 100262 + 100288 @@ -1908,11 +2469,15 @@ YES addAnnotation: addMediaFiles: + copy: + cut: + delete: exportMedia: exportText: importText: mediaSkipBackward: mediaSkipForward: + paste: toggleMediaPlay: @@ -1925,6 +2490,10 @@ id id id + id + id + id + id @@ -1933,11 +2502,15 @@ YES addAnnotation: addMediaFiles: + copy: + cut: + delete: exportMedia: exportText: importText: mediaSkipBackward: mediaSkipForward: + paste: toggleMediaPlay: @@ -1950,6 +2523,18 @@ addMediaFiles: id + + copy: + id + + + cut: + id + + + delete: + id + exportMedia: id @@ -1970,6 +2555,10 @@ mediaSkipForward: id + + paste: + id + toggleMediaPlay: id @@ -1984,7 +2573,6 @@ annotationTable mediaController mediaTable - moviePanel movieView textExportAccessoryView @@ -1994,7 +2582,6 @@ NSTableView NSArrayController NSTableView - MAMovieWindow QTMovieView NSView @@ -2007,7 +2594,6 @@ annotationTable mediaController mediaTable - moviePanel movieView textExportAccessoryView @@ -2029,10 +2615,6 @@ mediaTable NSTableView - - moviePanel - MAMovieWindow - movieView QTMovieView @@ -2057,33 +2639,89 @@ - MAMovieWindow + MATagWindow NSWindowController - toggleWindow: - id + YES + + YES + copy: + cut: + delete: + toggleWindow: + + + YES + id + id + id + id + - toggleWindow: - - toggleWindow: - id + YES + + YES + copy: + cut: + delete: + toggleWindow: + + + YES + + copy: + id + + + cut: + id + + + delete: + id + + + toggleWindow: + id + - panelMovieView - QTMovieView + YES + + YES + tagController + tagTable + + + YES + NSArrayController + NSTableView + - panelMovieView - - panelMovieView - QTMovieView + YES + + YES + tagController + tagTable + + + YES + + tagController + NSArrayController + + + tagTable + NSTableView + IBProjectSource - ./Classes/MAMovieWindow.h + ./Classes/MATagWindow.h @@ -2105,8 +2743,33 @@ YES 3 - NSSwitch - {15, 15} + YES + + YES + NSMenuCheckmark + NSMenuMixedState + NSSwitch + anno + custom + del + fwd + play + print + rev + + + YES + {9, 8} + {7, 2} + {15, 15} + {512, 512} + {512, 512} + {512, 512} + {512, 512} + {512, 512} + {512, 512} + {512, 512} + diff --git a/Medianno/en.lproj/MATag.xib b/Medianno/en.lproj/MATag.xib index 3662a44..281c7cb 100644 --- a/Medianno/en.lproj/MATag.xib +++ b/Medianno/en.lproj/MATag.xib @@ -12,16 +12,23 @@ YES - NSView - NSTableView - NSScrollView - NSWindowTemplate - NSArrayController - NSTextFieldCell - NSTableHeaderView - NSTableColumn + NSToolbar NSScroller + NSArrayController + NSTableHeaderView + NSToolbarFlexibleSpaceItem + NSScrollView + NSTextFieldCell + NSToolbarSpaceItem + NSTableView + NSSearchField + NSToolbarSeparatorItem + NSSearchFieldCell NSCustomObject + NSView + NSWindowTemplate + NSTableColumn + NSToolbarItem YES @@ -49,10 +56,311 @@ 31 2 {{1636, 136}, {800, 450}} - -1538259968 + -1538260992 Window NSPanel - + + + B3C93854-D972-4743-8886-DAEEED327B9C + + + YES + YES + YES + NO + 1 + 1 + + YES + + YES + 3C1C32D3-EB99-412B-A6FE-3FAC40C629A3 + 47827471-E838-4124-A1BA-98FF25A818A1 + 64072EEF-055D-461B-919D-E5E0C86244B7 + BEE4B38A-FD9C-4FF2-8CBA-EEE703136B13 + NSToolbarFlexibleSpaceItem + NSToolbarSeparatorItem + NSToolbarSpaceItem + + + YES + + + 3C1C32D3-EB99-412B-A6FE-3FAC40C629A3 + + Print + Print + + + + NSImage + print + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + 47827471-E838-4124-A1BA-98FF25A818A1 + + Delete + Delete + + + + NSImage + del + + + + {0, 0} + {0, 0} + YES + YES + 101 + YES + 0 + + + + 64072EEF-055D-461B-919D-E5E0C86244B7 + + Customize + Customize + + + + NSImage + custom + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + BEE4B38A-FD9C-4FF2-8CBA-EEE703136B13 + + Search + Search + + + + 268 + {{0, 14}, {96, 22}} + + + + _NS:123 + 100 + YES + + 343014976 + 268436544 + + + LucidaGrande + 13 + 1044 + + _NS:123 + + YES + 1 + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + 130560 + 0 + search + + _searchFieldSearch: + + 138690815 + 0 + + 400 + 75 + + + 130560 + 0 + clear + + YES + + YES + + YES + AXDescription + NSAccessibilityEncodedAttributesValueType + + + YES + cancel + + + + + + _searchFieldCancel: + + 138690815 + 0 + + 400 + 75 + + 255 + + + + + + {96, 22} + {200, 22} + YES + YES + 100 + YES + 0 + + + NSToolbarFlexibleSpaceItem + + Flexible Space + + + + + + {1, 5} + {20000, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + + + + NSToolbarSeparatorItem + + Separator + + + + + + {12, 5} + {12, 1000} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + + + + + NSToolbarSpaceItem + + Space + + + + + + {32, 5} + {32, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + YES + + + + + + + + + + YES + + + + + + {250, 100} @@ -118,21 +426,14 @@ 6 System headerTextColor - - 3 - MAA - + 337772096 2048 Text Cell - - LucidaGrande - 13 - 1044 - + 6 @@ -143,12 +444,7 @@ MC42NjY2NjY2NjY3AA - - 6 - System - controlTextColor - - + 3 YES @@ -184,10 +480,7 @@ 3 2 - - 3 - MQA - + 6 System @@ -281,8 +574,8 @@ _NS:2837 - {{0, 0}, {2560, 1418}} - {250, 116} + {{0, 0}, {1440, 878}} + {250, 172} {10000000000000, 10000000000000} YES @@ -450,6 +743,22 @@ 42 + + + delete: + + + + 58 + + + + runToolbarCustomizationPalette: + + + + 62 + @@ -484,6 +793,7 @@ YES + @@ -567,6 +877,74 @@ + + 43 + + + YES + + + + + + + + + + + + 47 + + + + + 48 + + + + + 51 + + + YES + + + + + + 49 + + + YES + + + + + + 50 + + + + + 52 + + + + + 57 + + + + + 60 + + + + + 61 + + + @@ -587,7 +965,17 @@ 3.IBPluginDependency 3.NSWindowTemplate.visibleAtLaunch 4.IBPluginDependency + 43.IBPluginDependency + 47.IBPluginDependency + 48.IBPluginDependency + 49.IBPluginDependency 5.IBPluginDependency + 50.IBPluginDependency + 51.IBPluginDependency + 52.IBPluginDependency + 57.IBPluginDependency + 60.IBPluginDependency + 61.IBPluginDependency 7.IBPluginDependency 8.IBPluginDependency 9.IBPluginDependency @@ -612,6 +1000,16 @@ 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 @@ -626,11 +1024,181 @@ - 42 + 62 YES + + MADocWindow + NSWindowController + + YES + + YES + addAnnotation: + addMediaFiles: + copy: + cut: + delete: + exportMedia: + exportText: + importText: + mediaSkipBackward: + mediaSkipForward: + paste: + toggleMediaPlay: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + addAnnotation: + addMediaFiles: + copy: + cut: + delete: + exportMedia: + exportText: + importText: + mediaSkipBackward: + mediaSkipForward: + paste: + toggleMediaPlay: + + + YES + + addAnnotation: + id + + + addMediaFiles: + id + + + copy: + id + + + cut: + id + + + delete: + id + + + exportMedia: + id + + + exportText: + id + + + importText: + id + + + mediaSkipBackward: + id + + + mediaSkipForward: + id + + + paste: + id + + + toggleMediaPlay: + id + + + + + YES + + YES + annotationController + annotationTable + mediaController + mediaTable + movieView + textExportAccessoryView + + + YES + NSArrayController + NSTableView + NSArrayController + NSTableView + QTMovieView + NSView + + + + YES + + YES + annotationController + annotationTable + mediaController + mediaTable + movieView + textExportAccessoryView + + + YES + + annotationController + NSArrayController + + + annotationTable + NSTableView + + + mediaController + NSArrayController + + + mediaTable + NSTableView + + + movieView + QTMovieView + + + textExportAccessoryView + NSView + + + + + IBProjectSource + ./Classes/MADocWindow.h + + MATagWindow NSWindowController @@ -727,5 +1295,24 @@ YES 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + custom + del + print + + + YES + {9, 8} + {7, 2} + {512, 512} + {512, 512} + {512, 512} + +