Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 14:02:57 +02:00
Code Issues Releases Wiki Activity

ShuttlegGUI: const wxArrayStringEx & arguments, not wxArrayString *...

Browse Source 
... for choice, combo, and listbox; reference allows passing temporaries,
eliminating need for some variables to hold the string arrays.
This commit is contained in:
Paul Licameli
2018-02-01 19:23:02 -05:00
parent dcd82b8ef5
commit dd86346156
57 changed files with 244 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/commands/DragCommand.cpp
View File

@@ -60,8 +60,6 @@ bool DragCommand::DefineParams( ShuttleParams & S ){
void DragCommand::PopulateOrExchange(ShuttleGui & S)
{
auto coords = LocalizedStrings( kCoordTypeStrings, nCoordTypes );
S.AddSpace(0, 5);
S.StartMultiColumn(3, wxALIGN_CENTER);
@@ -73,7 +71,8 @@ void DragCommand::PopulateOrExchange(ShuttleGui & S)
S.Optional( bHasFromY ).TieNumericTextBox( _("From Y:"), mFromY );
S.Optional( bHasToX ).TieNumericTextBox( _("To X:"), mToX );
S.Optional( bHasToY ).TieNumericTextBox( _("To Y:"), mToY );
S.Optional( bHasRelativeTo ).TieChoice( _("Relative To:"), mRelativeTo, &coords );
S.Optional( bHasRelativeTo ).TieChoice( _("Relative To:"), mRelativeTo,
LocalizedStrings( kCoordTypeStrings, nCoordTypes ) );
}
S.EndMultiColumn();
}

8
src/commands/GetInfoCommand.cpp
View File

@@ -96,14 +96,14 @@ bool GetInfoCommand::DefineParams( ShuttleParams & S ){
void GetInfoCommand::PopulateOrExchange(ShuttleGui & S)
{
auto types = LocalizedStrings( kTypes, nTypes );
auto formats = LocalizedStrings( kFormats, nFormats );
S.AddSpace(0, 5);
S.StartMultiColumn(2, wxALIGN_CENTER);
{
S.TieChoice( _("Type:"), mInfoType, &types);
S.TieChoice( _("Format:"), mFormat, &formats);
S.TieChoice( _("Type:"),
mInfoType, LocalizedStrings( kTypes, nTypes ));
S.TieChoice( _("Format:"),
mFormat, LocalizedStrings( kFormats, nFormats ));
}
S.EndMultiColumn();
}

3
src/commands/GetTrackInfoCommand.cpp
View File

@@ -48,12 +48,11 @@ bool GetTrackInfoCommand::DefineParams( ShuttleParams & S ){
void GetTrackInfoCommand::PopulateOrExchange(ShuttleGui & S)
{
auto types = LocalizedStrings( kTypes, nTypes );
S.AddSpace(0, 5);
S.StartMultiColumn(2, wxALIGN_CENTER);
{
S.TieChoice( _("Types:"), mInfoType, &types);
S.TieChoice( _("Types:"), mInfoType, LocalizedStrings( kTypes, nTypes ));
}
S.EndMultiColumn();
}

8
src/commands/ScreenshotCommand.cpp
View File

@@ -105,15 +105,15 @@ bool ScreenshotCommand::DefineParams( ShuttleParams & S ){
void ScreenshotCommand::PopulateOrExchange(ShuttleGui & S)
{
auto whats = LocalizedStrings(kCaptureWhatStrings, nCaptureWhats);
auto backs = LocalizedStrings(kBackgroundStrings, nBackgrounds);
S.AddSpace(0, 5);
S.StartMultiColumn(2, wxALIGN_CENTER);
{
S.TieTextBox( _("Path:"), mPath);
S.TieChoice( _("Capture What:"), mWhat, &whats);
S.TieChoice( _("Background:"), mBack, &backs);
S.TieChoice( _("Capture What:"),
mWhat, LocalizedStrings(kCaptureWhatStrings, nCaptureWhats));
S.TieChoice( _("Background:"),
mBack, LocalizedStrings(kBackgroundStrings, nBackgrounds));
S.TieCheckBox( _("Bring To Top:"), mbBringToTop);
}
S.EndMultiColumn();

9
src/commands/SelectCommand.cpp
View File

@@ -65,7 +65,6 @@ bool SelectTimeCommand::DefineParams( ShuttleParams & S ){
void SelectTimeCommand::PopulateOrExchange(ShuttleGui & S)
{
auto relativeSpec = LocalizedStrings( kRelativeTo, nRelativeTos );
S.AddSpace(0, 5);
S.StartMultiColumn(3, wxEXPAND);
@@ -74,8 +73,9 @@ void SelectTimeCommand::PopulateOrExchange(ShuttleGui & S)
S.Optional( bHasT0 ).TieTextBox(_("Start Time:"), mT0);
S.Optional( bHasT1 ).TieTextBox(_("End Time:"), mT1);
// Chooses what time is relative to.
S.Optional( bHasRelativeSpec ).TieChoice(
_("Relative To:"), mRelativeTo, &relativeSpec);
S.Optional( bHasRelativeSpec ).TieChoice(
_("Relative To:"),
mRelativeTo, LocalizedStrings( kRelativeTo, nRelativeTos ));
}
S.EndMultiColumn();
}
@@ -187,7 +187,6 @@ bool SelectTracksCommand::DefineParams( ShuttleParams & S ){
void SelectTracksCommand::PopulateOrExchange(ShuttleGui & S)
{
auto modes = LocalizedStrings( kModes, nModes );
S.AddSpace(0, 5);
S.StartMultiColumn(3, wxEXPAND);
@@ -200,7 +199,7 @@ void SelectTracksCommand::PopulateOrExchange(ShuttleGui & S)
S.StartMultiColumn(2, wxALIGN_CENTER);
{
// Always used, so no check box.
S.TieChoice( _("Mode:"), mMode, &modes);
S.TieChoice( _("Mode:"), mMode, LocalizedStrings( kModes, nModes ));
}
S.EndMultiColumn();
}

5
src/commands/SetClipCommand.cpp
View File

@@ -58,14 +58,13 @@ bool SetClipCommand::DefineParams( ShuttleParams & S ){
void SetClipCommand::PopulateOrExchange(ShuttleGui & S)
{
auto colours = LocalizedStrings( kColourStrings, nColours );
S.AddSpace(0, 5);
S.StartMultiColumn(3, wxALIGN_CENTER);
{
S.Optional( bHasContainsTime).TieNumericTextBox( _("At:"), mContainsTime );
S.Optional( bHasColour ).TieChoice( _("Colour:"), mColour, &colours );
S.Optional( bHasColour ).TieChoice( _("Colour:"), mColour,
LocalizedStrings( kColourStrings, nColours ) );
S.Optional( bHasT0 ).TieNumericTextBox( _("Start:"), mT0 );
}
S.EndMultiColumn();

17
src/commands/SetTrackInfoCommand.cpp
View File

@@ -306,20 +306,19 @@ bool SetTrackVisualsCommand::DefineParams( ShuttleParams & S ){
void SetTrackVisualsCommand::PopulateOrExchange(ShuttleGui & S)
{
auto colours = LocalizedStrings( kColourStrings, nColours );
auto displays = LocalizedStrings( kDisplayTypeStrings, nDisplayTypes );
auto scales = LocalizedStrings( kScaleTypeStrings, nScaleTypes );
auto vzooms = LocalizedStrings( kZoomTypeStrings, nZoomTypes );
SetTrackBase::PopulateOrExchange( S );
S.StartMultiColumn(3, wxEXPAND);
{
S.SetStretchyCol( 2 );
S.Optional( bHasHeight ).TieNumericTextBox( _("Height:"), mHeight );
S.Optional( bHasColour ).TieChoice( _("Colour:"), mColour, &colours );
S.Optional( bHasDisplayType ).TieChoice( _("Display:"), mDisplayType, &displays );
S.Optional( bHasScaleType ).TieChoice( _("Scale:"), mScaleType, &scales );
S.Optional( bHasVZoom ).TieChoice( _("VZoom:"), mVZoom, &vzooms );
S.Optional( bHasColour ).TieChoice( _("Colour:"), mColour,
LocalizedStrings( kColourStrings, nColours ) );
S.Optional( bHasDisplayType ).TieChoice( _("Display:"), mDisplayType,
LocalizedStrings( kDisplayTypeStrings, nDisplayTypes ) );
S.Optional( bHasScaleType ).TieChoice( _("Scale:"), mScaleType,
LocalizedStrings( kScaleTypeStrings, nScaleTypes ) );
S.Optional( bHasVZoom ).TieChoice( _("VZoom:"), mVZoom,
LocalizedStrings( kZoomTypeStrings, nZoomTypes ) );
S.Optional( bHasVZoomTop ).TieTextBox( _("VZoom Top:"), mVZoomTop );
S.Optional( bHasVZoomBottom ).TieTextBox( _("VZoom Bottom:"), mVZoomBottom );
}