1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-27 15:50:10 +01:00

Define and use the UIHandle and TrackPanelCell protocols, but...

...no actions reimplemented to them yet.

Later commits will move special cases one at a time from TrackPanel, preserving
all click and drag capabilities at each step.  With a few exceptions, but those
lost abilities are restored in yet later commits.  (Ctrl+Click on the Label
track being one.)
This commit is contained in:
Paul Licameli
2015-07-06 23:12:16 -04:00
committed by Paul Licameli
parent 07b53b4e83
commit 14d45eda33
48 changed files with 2144 additions and 161 deletions

View File

@@ -184,6 +184,7 @@
<ClCompile Include="..\..\..\src\PlatformCompatibility.cpp" />
<ClCompile Include="..\..\..\src\PluginManager.cpp" />
<ClCompile Include="..\..\..\src\Prefs.cpp" />
<ClCompile Include="..\..\..\src\prefs\BatchPrefs.cpp" />
<ClCompile Include="..\..\..\src\prefs\SpectrogramSettings.cpp" />
<ClCompile Include="..\..\..\src\prefs\WaveformPrefs.cpp" />
<ClCompile Include="..\..\..\src\prefs\WaveformSettings.cpp" />
@@ -223,9 +224,26 @@
<ClCompile Include="..\..\..\src\TrackArtist.cpp" />
<ClCompile Include="..\..\..\src\TrackPanel.cpp" />
<ClCompile Include="..\..\..\src\TrackPanelAx.cpp" />
<ClCompile Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackUI.cpp" />
<ClCompile Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackVRulerControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackUI.cpp" />
<ClCompile Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackVRulerControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackUI.cpp" />
<ClCompile Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackVRulerControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\timetrack\ui\TimeTrackControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\timetrack\ui\TimeTrackUI.cpp" />
<ClCompile Include="..\..\..\src\tracks\timetrack\ui\TimeTrackVRulerControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\CommonTrackPanelCell.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\EditCursorOverlay.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\PlayIndicatorOverlay.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\Scrubbing.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\TrackControls.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\TrackUI.cpp" />
<ClCompile Include="..\..\..\src\tracks\ui\TrackVRulerControls.cpp" />
<ClCompile Include="..\..\..\src\UIHandle.cpp" />
<ClCompile Include="..\..\..\src\UndoManager.cpp" />
<ClCompile Include="..\..\..\src\UserException.cpp" />
<ClCompile Include="..\..\..\src\ViewInfo.cpp" />
@@ -301,7 +319,6 @@
<ClCompile Include="..\..\..\src\import\ImportPCM.cpp" />
<ClCompile Include="..\..\..\src\import\ImportRaw.cpp" />
<ClCompile Include="..\..\..\src\import\RawAudioGuess.cpp" />
<ClCompile Include="..\..\..\src\prefs\BatchPrefs.cpp" />
<ClCompile Include="..\..\..\src\prefs\DevicePrefs.cpp" />
<ClCompile Include="..\..\..\src\prefs\DirectoriesPrefs.cpp" />
<ClCompile Include="..\..\..\src\prefs\EffectsPrefs.cpp" />
@@ -442,6 +459,7 @@
<ClInclude Include="..\..\..\src\effects\Phaser.h" />
<ClInclude Include="..\..\..\src\effects\VST\VSTControlMSW.h" />
<ClInclude Include="..\..\..\src\FileException.h" />
<ClInclude Include="..\..\..\src\HitTestResult.h" />
<ClInclude Include="..\..\..\src\import\FormatClassifier.h" />
<ClInclude Include="..\..\..\src\import\ImportForwards.h" />
<ClInclude Include="..\..\..\src\import\ImportGStreamer.h" />
@@ -456,6 +474,7 @@
<ClInclude Include="..\..\..\src\prefs\WaveformPrefs.h" />
<ClInclude Include="..\..\..\src\prefs\WaveformSettings.h" />
<ClInclude Include="..\..\..\src\RealFFTf48x.h" />
<ClInclude Include="..\..\..\src\RefreshCode.h" />
<ClInclude Include="..\..\..\src\RevisionIdent.h" />
<ClInclude Include="..\..\..\src\SelectedRegion.h" />
<ClInclude Include="..\..\..\src\SelectionState.h" />
@@ -466,11 +485,24 @@
<ClInclude Include="..\..\..\src\TrackPanelCell.h" />
<ClInclude Include="..\..\..\src\TrackPanelCellIterator.h" />
<ClInclude Include="..\..\..\src\TrackPanelListener.h" />
<ClInclude Include="..\..\..\src\TrackPanelMouseEvent.h" />
<ClInclude Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackControls.h" />
<ClInclude Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackVRulerControls.h" />
<ClInclude Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackControls.h" />
<ClInclude Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackVRulerControls.h" />
<ClInclude Include="..\..\..\src\tracks\ui\CommonTrackPanelCell.h" />
<ClInclude Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackControls.h" />
<ClInclude Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackVRulerControls.h" />
<ClInclude Include="..\..\..\src\tracks\timetrack\ui\TimeTrackControls.h" />
<ClInclude Include="..\..\..\src\tracks\ui\EditCursorOverlay.h" />
<ClInclude Include="..\..\..\src\tracks\ui\PlayIndicatorOverlay.h" />
<ClInclude Include="..\..\..\src\tracks\ui\Scrubbing.h" />
<ClInclude Include="..\..\..\src\TranslatableStringArray.h" />
<ClInclude Include="..\..\..\src\UserException.h" />
<ClInclude Include="..\..\..\src\tracks\ui\TrackControls.h" />
<ClInclude Include="..\..\..\src\tracks\timetrack\ui\TimeTrackVRulerControls.h" />
<ClInclude Include="..\..\..\src\tracks\ui\TrackVRulerControls.h" />
<ClInclude Include="..\..\..\src\UIHandle.h" />
<ClInclude Include="..\..\..\src\WaveTrackLocation.h" />
<ClInclude Include="..\..\..\src\widgets\BackedPanel.h" />
<ClInclude Include="..\..\..\src\widgets\HelpSystem.h" />

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="src">
@@ -75,6 +75,33 @@
<Filter Include="src\tracks\ui">
<UniqueIdentifier>{aa9627ea-e614-4704-bf68-4a347023569f}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\labeltrack">
<UniqueIdentifier>{fdc20d46-ec27-45d8-afaa-1636f016a9cb}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\timetrack">
<UniqueIdentifier>{f99cdeb8-6f20-43aa-bb7f-7ca9ec2fd7bf}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\labeltrack\ui">
<UniqueIdentifier>{6d5ec816-850c-4709-baf6-0cbb50f98e15}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\timetrack\ui">
<UniqueIdentifier>{0480a7aa-2605-4b17-984e-5a7c9412986d}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\playabletrack">
<UniqueIdentifier>{6e1dc240-b278-4242-852d-54ddc88d283e}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\playabletrack\wavetrack">
<UniqueIdentifier>{b589487a-f2cf-45a8-8241-61a49767dd82}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\playabletrack\wavetrack\ui">
<UniqueIdentifier>{695fd2f1-de41-4703-aee8-cf5901fe089e}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\playabletrack\notetrack">
<UniqueIdentifier>{6a2fa93f-907f-4790-bf18-5bbc6b8e85a7}</UniqueIdentifier>
</Filter>
<Filter Include="src\tracks\playabletrack\notetrack\ui">
<UniqueIdentifier>{355a925b-a166-4405-aff8-894bfa027ad3}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\AboutDialog.cpp">
@@ -485,9 +512,6 @@
<ClCompile Include="..\..\..\src\import\RawAudioGuess.cpp">
<Filter>src\import</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\prefs\BatchPrefs.cpp">
<Filter>src\prefs</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\prefs\DevicePrefs.cpp">
<Filter>src\prefs</Filter>
</ClCompile>
@@ -908,6 +932,60 @@
<ClCompile Include="..\..\..\src\SelectionState.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackUI.cpp">
<Filter>src\tracks\labeltrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\timetrack\ui\TimeTrackUI.cpp">
<Filter>src\tracks\timetrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\ui\TrackUI.cpp">
<Filter>src\tracks\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\UIHandle.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\prefs\BatchPrefs.cpp">
<Filter>src\prefs</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\ui\TrackControls.cpp">
<Filter>src\tracks\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\timetrack\ui\TimeTrackControls.cpp">
<Filter>src\tracks\timetrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackControls.cpp">
<Filter>src\tracks\labeltrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackVRulerControls.cpp">
<Filter>src\tracks\labeltrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\timetrack\ui\TimeTrackVRulerControls.cpp">
<Filter>src\tracks\timetrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\ui\TrackVRulerControls.cpp">
<Filter>src\tracks\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\ui\CommonTrackPanelCell.cpp">
<Filter>src\tracks\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackControls.cpp">
<Filter>src\tracks\playabletrack\notetrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackUI.cpp">
<Filter>src\tracks\playabletrack\notetrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackVRulerControls.cpp">
<Filter>src\tracks\playabletrack\notetrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackControls.cpp">
<Filter>src\tracks\playabletrack\wavetrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackUI.cpp">
<Filter>src\tracks\playabletrack\wavetrack\ui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackVRulerControls.cpp">
<Filter>src\tracks\playabletrack\wavetrack\ui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\AboutDialog.h">
@@ -1798,6 +1876,42 @@
<ClInclude Include="..\..\..\src\commands\CommandFunctors.h">
<Filter>src\commands</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\UIHandle.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\HitTestResult.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\TrackPanelCell.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\RefreshCode.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\ui\TrackControls.h">
<Filter>src\tracks\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\timetrack\ui\TimeTrackControls.h">
<Filter>src\tracks\timetrack\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackControls.h">
<Filter>src\tracks\labeltrack\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackVRulerControls.h">
<Filter>src\tracks\labeltrack\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\timetrack\ui\TimeTrackVRulerControls.h">
<Filter>src\tracks\timetrack\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\ui\TrackVRulerControls.h">
<Filter>src\tracks\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\TrackPanelMouseEvent.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\ui\CommonTrackPanelCell.h">
<Filter>src\tracks\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\widgets\BackedPanel.h">
<Filter>src\widgets</Filter>
</ClInclude>
@@ -1840,6 +1954,18 @@
<ClInclude Include="..\..\..\src\SelectionState.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackControls.h">
<Filter>src\tracks\playabletrack\notetrack\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackVRulerControls.h">
<Filter>src\tracks\playabletrack\notetrack\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackControls.h">
<Filter>src\tracks\playabletrack\wavetrack\ui</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tracks\playabletrack\wavetrack\ui\WaveTrackVRulerControls.h">
<Filter>src\tracks\playabletrack\wavetrack\ui</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\audacity.ico">
@@ -2063,4 +2189,4 @@
<Filter>plug-ins</Filter>
</copy>
</ItemGroup>
</Project>
</Project>