Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

Hide spectral selection bar by default. Tidy up folders within MSVC project.

Browse Source
This commit is contained in:
james.k.crook@gmail.com 2014-11-08 15:47:08 +00:00
parent 67d2b274e2
commit 96531ef766
4 changed files with 1356 additions and 1337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/toolbars/ToolManager.cpp
View File

@ -605,19 +605,25 @@ void ToolManager::ReadConfig()
// Change to the bar subkey // Change to the bar subkey
gPrefs->SetPath( bar->GetSection() ); gPrefs->SetPath( bar->GetSection() );
bool bShownByDefault = true;
int defaultDock = (ndx == SelectionBarID int defaultDock = TopDockID;
#ifdef EXPERIMENTAL_SPECTRAL_EDITING
|| ndx == SpectralSelectionBarID if( ndx == SelectionBarID )
#endif defaultDock = BotDockID;
)
? BotDockID : TopDockID;
if( ndx == MeterBarID ) if( ndx == MeterBarID )
defaultDock = 0; bShownByDefault = false;
#ifdef EXPERIMENTAL_SPECTRAL_EDITING
if( ndx == SpectralSelectionBarID ){
defaultDock = BotDockID;
bShownByDefault = false; // Only show if asked for.
}
#endif
// Read in all the settings // Read in all the settings
gPrefs->Read( wxT("Dock"), &dock, defaultDock ); gPrefs->Read( wxT("Dock"), &dock, defaultDock );
gPrefs->Read( wxT("Order"), &ord, NoBarID ); gPrefs->Read( wxT("Order"), &ord, NoBarID );
gPrefs->Read( wxT("Show"), &show[ ndx ], defaultDock != 0); gPrefs->Read( wxT("Show"), &show[ ndx ], bShownByDefault);
gPrefs->Read( wxT("X"), &x, -1 ); gPrefs->Read( wxT("X"), &x, -1 );
gPrefs->Read( wxT("Y"), &y, -1 ); gPrefs->Read( wxT("Y"), &y, -1 );
@ -625,6 +631,7 @@ void ToolManager::ReadConfig()
gPrefs->Read( wxT("H"), &height[ ndx ], -1 ); gPrefs->Read( wxT("H"), &height[ ndx ], -1 );
bar->SetVisible( show[ ndx ] ); bar->SetVisible( show[ ndx ] );
// Docked or floating? // Docked or floating?
if( dock ) if( dock )
{ {

2639
win/Projects/Audacity/Audacity.vcxproj
View File

File diff suppressed because it is too large Load Diff

21
win/Projects/Audacity/Audacity.vcxproj.filters
View File

@ -606,9 +606,6 @@
<ClCompile Include="..\..\..\src\widgets\Ruler.cpp"> <ClCompile Include="..\..\..\src\widgets\Ruler.cpp">
<Filter>src/widgets</Filter> <Filter>src/widgets</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\src\widgets\TimeTextCtrl.cpp">
<Filter>src/widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\widgets\valnum.cpp"> <ClCompile Include="..\..\..\src\widgets\valnum.cpp">
<Filter>src/widgets</Filter> <Filter>src/widgets</Filter>
</ClCompile> </ClCompile>
@ -828,6 +825,12 @@
<ClCompile Include="..\..\..\src\effects\EffectRack.cpp"> <ClCompile Include="..\..\..\src\effects\EffectRack.cpp">
<Filter>src/effects</Filter> <Filter>src/effects</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\src\toolbars\SpectralSelectionBar.cpp">
<Filter>src/toolbars</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\widgets\NumericTextCtrl.cpp">
<Filter>src/widgets</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\src\AboutDialog.h"> <ClInclude Include="..\..\..\src\AboutDialog.h">
@ -1388,9 +1391,6 @@
<ClInclude Include="..\..\..\src\widgets\Ruler.h"> <ClInclude Include="..\..\..\src\widgets\Ruler.h">
<Filter>src/widgets</Filter> <Filter>src/widgets</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\src\widgets\TimeTextCtrl.h">
<Filter>src/widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\widgets\valnum.h"> <ClInclude Include="..\..\..\src\widgets\valnum.h">
<Filter>src/widgets</Filter> <Filter>src/widgets</Filter>
</ClInclude> </ClInclude>
@ -1643,6 +1643,15 @@
<ClInclude Include="..\..\..\src\effects\EffectRack.h"> <ClInclude Include="..\..\..\src\effects\EffectRack.h">
<Filter>src/effects</Filter> <Filter>src/effects</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\src\toolbars\SpectralSelectionBar.h">
<Filter>src/toolbars</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\toolbars\SpectralSelectionBarListener.h">
<Filter>src/toolbars</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\widgets\NumericTextCtrl.h">
<Filter>src/widgets</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="..\..\audacity.ico"> <Image Include="..\..\audacity.ico">

8
win/Projects/mod-script-pipe/mod-script-pipe.vcxproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
@ -17,13 +17,13 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
@ -81,7 +81,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>wxmsw28ud_core.lib;wxbase28ud.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>wxmsw30ud_core.lib;wxbase30ud.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)modules\$(ProjectName).dll</OutputFile> <OutputFile>$(OutDir)modules\$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(WXWIN)\lib\vc_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>