diff --git a/Sources/VLSheetView.h b/Sources/VLSheetView.h index 1f4f170..29639d6 100644 --- a/Sources/VLSheetView.h +++ b/Sources/VLSheetView.h @@ -81,6 +81,8 @@ enum VLRecalc { - (float) noteYInMeasure:(int)measure withPitch:(int)pitch; - (float) noteXInMeasure:(int)measure at:(VLFraction)at; +- (void) scrollMeasureToVisible:(int)measure; + - (void) mouseMoved:(NSEvent *)event; - (void) mouseDown:(NSEvent *)event; - (void) mouseEntered:(NSEvent *)event; diff --git a/Sources/VLSheetView.mm b/Sources/VLSheetView.mm index 9c1017e..d141af0 100644 --- a/Sources/VLSheetView.mm +++ b/Sources/VLSheetView.mm @@ -162,12 +162,20 @@ static float sFlatPos[] = { const VLProperties & prop = [self song]->fProperties.front(); const float mx = fClefKeyW+(measure%fMeasPerSystem)*fMeasureW; - at /= prop.fTime / (4 * prop.fDivisions); + at *= 4 * prop.fDivisions; int div = at.fNum / at.fDenom; return mx + (div + (div / fDivPerGroup) + 1)*kNoteW; } +- (void) scrollMeasureToVisible:(int)measure +{ + NSRect r = NSMakeRect(fClefKeyW+(measure%fMeasPerSystem)*fMeasureW, + [self systemY:measure/fMeasPerSystem]-kSystemY, + fMeasureW, kSystemH); + [self scrollRectToVisible:r]; +} + - (void) recalculateDimensions { NSScrollView * scroll = [self enclosingScrollView]; @@ -512,6 +520,7 @@ static int sSemiToPitch[] = { [[self window] performSelectorOnMainThread:@selector(makeFirstResponder:) withObject:(editable ? fFieldEditor : self) waitUntilDone:NO]; + [self setNeedsDisplay: YES]; } @end diff --git a/Sources/VLSheetViewChords.mm b/Sources/VLSheetViewChords.mm index 55c7ee8..a97226e 100644 --- a/Sources/VLSheetViewChords.mm +++ b/Sources/VLSheetViewChords.mm @@ -143,6 +143,7 @@ std::string NormalizeName(NSString* rawName) if (fAt >= prop.fTime) { fAt = VLFraction(0,4); fMeasure = (fMeasure+1) % fSong->CountMeasures(); + [fView scrollMeasureToVisible:fMeasure]; } } @@ -153,6 +154,7 @@ std::string NormalizeName(NSString* rawName) fAt = prop.fTime - VLFraction(1,4); fMeasure = (fMeasure+fSong->CountMeasures()-1) % fSong->CountMeasures(); + [fView scrollMeasureToVisible:fMeasure]; } else fAt = fAt-VLFraction(1,4); } @@ -252,10 +254,11 @@ std::string NormalizeName(NSString* rawName) - (void) highlightChordInMeasure:(int)measure at:(VLFraction)at { - const float kSystemY = [self systemY:measure / fMeasPerSystem]; - NSRect r = - NSMakeRect([self noteXInMeasure:measure at:at], - kSystemY+kChordY, 3.0f*kNoteW, 20.0f); + const VLProperties & prop = [self song]->fProperties.front(); + const float kSystemY = [self systemY:measure / fMeasPerSystem]; + NSRect r = + NSMakeRect([self noteXInMeasure:measure at:at]-kNoteW*0.5f, + kSystemY+kChordY, prop.fDivisions*kNoteW, kChordH); [[NSColor colorWithCalibratedWhite:0.8f alpha:1.0f] setFill]; NSRectFillUsingOperation(r, NSCompositePlusDarker); } diff --git a/Vocalese.xcodeproj/neeri.mode1v3 b/Vocalese.xcodeproj/neeri.mode1v3 index 0b9dcb6..686132f 100644 --- a/Vocalese.xcodeproj/neeri.mode1v3 +++ b/Vocalese.xcodeproj/neeri.mode1v3 @@ -200,571 +200,7 @@ Content PBXProjectModuleGUID - 95D44D270AD8C1E800384FE5 - PBXProjectModuleLabel - main.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 95D44D280AD8C1E800384FE5 - PBXProjectModuleLabel - main.m - _historyCapacity - 0 - bookmark - 95D44D600AD8C85600384FE5 - history - - 95D44D230AD8C1BE00384FE5 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 84 85 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D44D390AD8C25200384FE5 - PBXProjectModuleLabel - VLSoundOut.h - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 95D44D3A0AD8C25200384FE5 - PBXProjectModuleLabel - VLSoundOut.h - _historyCapacity - 0 - bookmark - 95D44D610AD8C85600384FE5 - history - - 95D44D370AD8C24800384FE5 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 61 106 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E7B5510AD2D12A00753F9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E7B54E0AD2D12A00753F9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 171 132 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E7B5280AD2CE8800753F9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 171 132 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E7B51C0AD2CDC800753F9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 171 132 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E7B5000AD2CBD800753F9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E725270AD2587900407A9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E725560AD25CA500407A9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E725400AD25B5700407A9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95DFE83A0AD105A300375606 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F82E0AB694EC00EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F7FE0AB68C8C00EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 242 153 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F8130AB6908400EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 186 75 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F8850AB69B6700EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 168 116 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F8660AB6970400EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F8310AB694EC00EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95B042FA0ACE431A00236B52 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 242 153 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95B042F70ACE431A00236B52 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95B042FB0ACE431A00236B52 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 242 153 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95B042FC0ACE431A00236B52 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 9514A0450AD78D5F00B21A41 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D44D2A0AD8C1E800384FE5 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 222 82 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D44D2B0AD8C1E800384FE5 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 222 82 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D44D2C0AD8C1E800384FE5 + 95D44D3D0AD8C25200384FE5 PBXProjectModuleLabel <No Editor> PBXSplitModuleInNavigatorKey @@ -808,7 +244,7 @@ Content PBXProjectModuleGUID - 95D44D3D0AD8C25200384FE5 + 95D44D2C0AD8C1E800384FE5 PBXProjectModuleLabel <No Editor> PBXSplitModuleInNavigatorKey @@ -826,6 +262,596 @@ 38 127 763 593 0 0 1024 746 + + Content + + PBXProjectModuleGUID + 95D44D2B0AD8C1E800384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 222 82 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D2A0AD8C1E800384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 222 82 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 9514A0450AD78D5F00B21A41 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95B042FC0ACE431A00236B52 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95B042FB0ACE431A00236B52 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 242 153 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95B042F70ACE431A00236B52 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95B042FA0ACE431A00236B52 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 242 153 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F8310AB694EC00EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F8660AB6970400EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F8850AB69B6700EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 168 116 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F8130AB6908400EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 186 75 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F7FE0AB68C8C00EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 242 153 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F82E0AB694EC00EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95DFE83A0AD105A300375606 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E725400AD25B5700407A9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E725560AD25CA500407A9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E725270AD2587900407A9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E7B5000AD2CBD800753F9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E7B51C0AD2CDC800753F9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 171 132 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E7B5280AD2CE8800753F9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 171 132 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E7B54E0AD2D12A00753F9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 171 132 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E7B5510AD2D12A00753F9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D390AD8C25200384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 61 106 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D270AD8C1E800384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 84 85 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 953EABCC0ADA2CCE008C3391 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 953EABDB0ADA2E1A008C3391 + PBXProjectModuleLabel + VLSheetView.mm + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 953EABDC0ADA2E1A008C3391 + PBXProjectModuleLabel + VLSheetView.mm + _historyCapacity + 0 + bookmark + 953EABF40ADA3187008C3391 + history + + 953EABE50ADA2E68008C3391 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 42 150 763 593 0 0 1024 746 + + PerspectiveWidths @@ -908,7 +934,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 3 + 9 1 0 @@ -1014,9 +1040,9 @@ TableOfContents - 95D44D250AD8C1E800384FE5 + 953EABB60ADA26CA008C3391 1CE0B1FE06471DED0097A5F4 - 95D44D260AD8C1E800384FE5 + 953EABB70ADA26CA008C3391 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -1150,41 +1176,42 @@ 5 WindowOrderList - 95D44D450AD8C34600384FE5 - 95D44D460AD8C34600384FE5 - 95D44D470AD8C34600384FE5 - 95D44D3D0AD8C25200384FE5 - 95D44D2D0AD8C1E800384FE5 - 95D44D2C0AD8C1E800384FE5 - 95D44D2B0AD8C1E800384FE5 - 95D44D2A0AD8C1E800384FE5 - 1CD10A99069EF8BA00B06720 - 9514A0450AD78D5F00B21A41 - 95B042FC0ACE431A00236B52 - 95B042FB0ACE431A00236B52 - 95B042F70ACE431A00236B52 - 95B042FA0ACE431A00236B52 - 95D1F8310AB694EC00EE6AC8 - 95D1F8660AB6970400EE6AC8 - 95D1F8850AB69B6700EE6AC8 - 95D1F8130AB6908400EE6AC8 - 95D1F7FE0AB68C8C00EE6AC8 - 95D1F82E0AB694EC00EE6AC8 - 95DFE83A0AD105A300375606 - 95E725400AD25B5700407A9B - 95E725560AD25CA500407A9B - 95E725270AD2587900407A9B - 95E7B5000AD2CBD800753F9B - 95E7B51C0AD2CDC800753F9B - 95E7B5280AD2CE8800753F9B - 95E7B54E0AD2D12A00753F9B - 95E7B5510AD2D12A00753F9B - 95D44D5B0AD8C75700384FE5 + 953EABDB0ADA2E1A008C3391 + 953EABCC0ADA2CCE008C3391 + 953EABC50ADA2C83008C3391 + 953EABC60ADA2C83008C3391 + 953EABC70ADA2C83008C3391 95D7BFC80AA6C1A500D5E02C - 95D44D390AD8C25200384FE5 - 95D44D270AD8C1E800384FE5 - /Development/Vocalese/Vocalese.xcodeproj 95D7BFC00AA6C1A500D5E02C + 95D44D270AD8C1E800384FE5 + 95D44D390AD8C25200384FE5 + 95E7B5510AD2D12A00753F9B + 95E7B54E0AD2D12A00753F9B + 95E7B5280AD2CE8800753F9B + 95E7B51C0AD2CDC800753F9B + 95E7B5000AD2CBD800753F9B + 95E725270AD2587900407A9B + 95E725560AD25CA500407A9B + 95E725400AD25B5700407A9B + 95DFE83A0AD105A300375606 + 95D1F82E0AB694EC00EE6AC8 + 95D1F7FE0AB68C8C00EE6AC8 + 95D1F8130AB6908400EE6AC8 + 95D1F8850AB69B6700EE6AC8 + 95D1F8660AB6970400EE6AC8 + 95D1F8310AB694EC00EE6AC8 + 95B042FA0ACE431A00236B52 + 95B042F70ACE431A00236B52 + 95B042FB0ACE431A00236B52 + 95B042FC0ACE431A00236B52 + 9514A0450AD78D5F00B21A41 + 95D44D2A0AD8C1E800384FE5 + 95D44D2B0AD8C1E800384FE5 + 95D44D2C0AD8C1E800384FE5 + 95D44D2D0AD8C1E800384FE5 + 95D44D3D0AD8C25200384FE5 + /Development/Vocalese/Vocalese.xcodeproj + 1CD10A99069EF8BA00B06720 WindowString 167 325 690 397 0 0 1024 746 @@ -1210,7 +1237,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - VLSoundSched.mm + VLSheetViewChords.mm StatusBarVisibility @@ -1266,7 +1293,7 @@ TableOfContents 95D7BFC00AA6C1A500D5E02C - 95D44D2E0AD8C1E800384FE5 + 953EABB80ADA26CA008C3391 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -1360,10 +1387,10 @@ Frame {{412, 0}, {516, 239}} RubberWindowFrame - 94 141 928 490 0 0 1024 746 + 82 129 928 490 0 0 1024 746 RubberWindowFrame - 94 141 928 490 0 0 1024 746 + 82 129 928 490 0 0 1024 746 Module PBXDebugSessionModule @@ -1386,18 +1413,18 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 95D44D2F0AD8C1E800384FE5 + 953EABB90ADA26CA008C3391 1C162984064C10D400B95A72 - 95D44D300AD8C1E800384FE5 - 95D44D310AD8C1E800384FE5 - 95D44D320AD8C1E800384FE5 - 95D44D330AD8C1E800384FE5 - 95D44D340AD8C1E800384FE5 + 953EABBA0ADA26CA008C3391 + 953EABBB0ADA26CA008C3391 + 953EABBC0ADA26CA008C3391 + 953EABBD0ADA26CA008C3391 + 953EABBE0ADA26CA008C3391 ToolbarConfiguration xcode.toolbar.config.debugV3 WindowString - 94 141 928 490 0 0 1024 746 + 82 129 928 490 0 0 1024 746 WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible @@ -1509,8 +1536,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -1546,7 +1571,7 @@ TableOfContents 95D7BFC80AA6C1A500D5E02C - 95D44D350AD8C1E800384FE5 + 953EABC40ADA2C83008C3391 1C78EAAC065D492600B07095 WindowString @@ -1554,7 +1579,7 @@ WindowToolGUID 95D7BFC80AA6C1A500D5E02C WindowToolIsVisible - + Identifier diff --git a/Vocalese.xcodeproj/neeri.pbxuser b/Vocalese.xcodeproj/neeri.pbxuser index 9a4a12f..07bd7b5 100644 --- a/Vocalese.xcodeproj/neeri.pbxuser +++ b/Vocalese.xcodeproj/neeri.pbxuser @@ -85,29 +85,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 181966504; - PBXWorkspaceStateSaveDate = 181966504; + PBXPerProjectTemplateStateSaveDate = 182068920; + PBXWorkspaceStateSaveDate = 182068920; }; perUserProjectItems = { - 9514A0410AD78D3E00B21A41 = 9514A0410AD78D3E00B21A41 /* PBXBookmark */; - 9514A05D0AD78F3700B21A41 = 9514A05D0AD78F3700B21A41 /* PBXTextBookmark */; - 95D44D230AD8C1BE00384FE5 /* PBXBookmark */ = 95D44D230AD8C1BE00384FE5 /* PBXBookmark */; - 95D44D290AD8C1E800384FE5 /* PBXTextBookmark */ = 95D44D290AD8C1E800384FE5 /* PBXTextBookmark */; - 95D44D370AD8C24800384FE5 /* PBXBookmark */ = 95D44D370AD8C24800384FE5 /* PBXBookmark */; - 95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */ = 95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */; - 95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */ = 95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */; - 95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */ = 95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */; - 95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */ = 95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */; - 95D44D430AD8C34600384FE5 /* PBXTextBookmark */ = 95D44D430AD8C34600384FE5 /* PBXTextBookmark */; - 95D44D440AD8C34600384FE5 /* PBXTextBookmark */ = 95D44D440AD8C34600384FE5 /* PBXTextBookmark */; - 95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */ = 95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */; - 95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */ = 95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */; - 95D44D520AD8C60C00384FE5 /* PBXTextBookmark */ = 95D44D520AD8C60C00384FE5 /* PBXTextBookmark */; - 95D44D530AD8C60C00384FE5 /* PBXTextBookmark */ = 95D44D530AD8C60C00384FE5 /* PBXTextBookmark */; - 95D44D590AD8C75700384FE5 /* PBXTextBookmark */ = 95D44D590AD8C75700384FE5 /* PBXTextBookmark */; - 95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */ = 95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */; - 95D44D600AD8C85600384FE5 /* PBXTextBookmark */ = 95D44D600AD8C85600384FE5 /* PBXTextBookmark */; - 95D44D610AD8C85600384FE5 /* PBXTextBookmark */ = 95D44D610AD8C85600384FE5 /* PBXTextBookmark */; + 953EABE50ADA2E68008C3391 /* PBXTextBookmark */ = 953EABE50ADA2E68008C3391 /* PBXTextBookmark */; + 953EABF40ADA3187008C3391 /* PBXTextBookmark */ = 953EABF40ADA3187008C3391 /* PBXTextBookmark */; }; sourceControlManager = 954D7413095406B2007D9571 /* Source Control */; userBuildSettings = { @@ -134,6 +117,7 @@ sepNavIntBoundsRect = "{{0, 0}, {704, 520}}"; sepNavSelRange = "{248, 0}"; sepNavVisRect = "{{0, 0}, {704, 520}}"; + sepNavWindowFrame = "{{84, 29}, {763, 649}}"; }; }; 2A37F4BAFDCFA73011CA2CEA /* English */ = { @@ -150,20 +134,6 @@ 954D740509540691007D9571 /* Vocalese */, ); }; - 9514A0410AD78D3E00B21A41 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - }; - 9514A05D0AD78F3700B21A41 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 334"; - rLen = 0; - rLoc = 8167; - rType = 0; - vrLen = 969; - vrLoc = 7454; - }; 952CBB97095FD19D00434E43 /* TVLSoundOut */ = { activeExec = 0; executables = ( @@ -228,12 +198,32 @@ }; 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {703, 3374}}"; - sepNavSelRange = "{6151, 0}"; - sepNavVisRect = "{{0, 3113}, {703, 261}}"; + sepNavIntBoundsRect = "{{0, 0}, {703, 2142}}"; + sepNavSelRange = "{6059, 0}"; + sepNavVisRect = "{{0, 1881}, {703, 261}}"; sepNavWindowFrame = "{{164, 35}, {763, 649}}"; }; }; + 953EABE50ADA2E68008C3391 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; + name = "VLSheetView.mm: 160"; + rLen = 55; + rLoc = 3092; + rType = 0; + vrLen = 931; + vrLoc = 2721; + }; + 953EABF40ADA3187008C3391 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; + name = "VLSheetView.mm: 160"; + rLen = 55; + rLoc = 3092; + rType = 0; + vrLen = 949; + vrLoc = 2721; + }; 954D740509540691007D9571 /* Vocalese */ = { isa = PBXExecutable; activeArgIndex = 2147483647; @@ -441,10 +431,10 @@ }; 95BDA15809540BF1009F9D65 /* VLSheetView.mm */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {704, 5250}}"; - sepNavSelRange = "{8167, 0}"; - sepNavVisRect = "{{0, 2336}, {704, 520}}"; - sepNavWindowFrame = "{{15, 92}, {763, 649}}"; + sepNavIntBoundsRect = "{{0, 0}, {704, 6790}}"; + sepNavSelRange = "{3092, 55}"; + sepNavVisRect = "{{0, 1973}, {704, 520}}"; + sepNavWindowFrame = "{{42, 94}, {763, 649}}"; }; }; 95D44D1D0AD8BFEF00384FE5 /* VLSoundSched.h */ = { @@ -458,167 +448,9 @@ 95D44D1E0AD8BFEF00384FE5 /* VLSoundSched.mm */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {867, 504}}"; - sepNavSelRange = "{710, 0}"; - sepNavVisRect = "{{0, 326}, {867, 178}}"; + sepNavSelRange = "{725, 0}"; + sepNavVisRect = "{{0, 256}, {867, 178}}"; sepNavWindowFrame = "{{38, 71}, {763, 649}}"; }; }; - 95D44D230AD8C1BE00384FE5 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - }; - 95D44D290AD8C1E800384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 248; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 95D44D370AD8C24800384FE5 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; - }; - 95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; - name = "VLSoundOut.h: 23"; - rLen = 0; - rLoc = 345; - rType = 0; - vrLen = 664; - vrLoc = 0; - }; - 95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 248; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; - name = "VLSoundOut.h: 23"; - rLen = 0; - rLoc = 345; - rType = 0; - vrLen = 664; - vrLoc = 0; - }; - 95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 248; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 95D44D430AD8C34600384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; - name = "VLSoundOut.h: 42"; - rLen = 0; - rLoc = 706; - rType = 0; - vrLen = 666; - vrLoc = 0; - }; - 95D44D440AD8C34600384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 248; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; - name = "VLSoundOut.h: 42"; - rLen = 0; - rLoc = 706; - rType = 0; - vrLen = 662; - vrLoc = 0; - }; - 95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 248; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 95D44D520AD8C60C00384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; - name = "VLSoundOut.h: 42"; - rLen = 0; - rLoc = 706; - rType = 0; - vrLen = 662; - vrLoc = 0; - }; - 95D44D530AD8C60C00384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 248; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 95D44D590AD8C75700384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; - name = "VLSoundOut.h: 42"; - rLen = 0; - rLoc = 706; - rType = 0; - vrLen = 662; - vrLoc = 0; - }; - 95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 248; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 95D44D600AD8C85600384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 248; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 95D44D610AD8C85600384FE5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; - name = "VLSoundOut.h: 42"; - rLen = 0; - rLoc = 706; - rType = 0; - vrLen = 666; - vrLoc = 0; - }; }