1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 16:40:07 +02:00

Adjust some comments.

This commit is contained in:
v.audacity 2011-02-26 23:17:26 +00:00
parent 3dad57bc30
commit 0526b8c98a
9 changed files with 20 additions and 20 deletions

View File

@ -280,8 +280,8 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
S.StartNotebookPage( _("Audacity") ); S.StartNotebookPage( _("Audacity") );
S.StartVerticalLay(1); S.StartVerticalLay(1);
//vvv For now, change to AudacityLogoWithName via old-fashioned way, not Theme. //v For now, change to AudacityLogoWithName via old-fashioned way, not Theme.
logo = new wxBitmap((const char **) AudacityLogoWithName_xpm); //vvv logo = new wxBitmap((const char **) AudacityLogoWithName_xpm); //v
// JKC: Resize to 50% of size. Later we may use a smaller xpm as // JKC: Resize to 50% of size. Later we may use a smaller xpm as
// our source, but this allows us to tweak the size - if we want to. // our source, but this allows us to tweak the size - if we want to.
@ -294,9 +294,9 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
icon = icon =
new wxStaticBitmap(S.GetParent(), -1, new wxStaticBitmap(S.GetParent(), -1,
//*logo, //vvv //*logo, //v
//vvv theTheme.Bitmap(bmpAudacityLogo), wxPoint(93, 10), wxSize(215, 190)); //v theTheme.Bitmap(bmpAudacityLogo), wxPoint(93, 10), wxSize(215, 190));
//vvv theTheme.Bitmap(bmpAudacityLogoWithName), //v theTheme.Bitmap(bmpAudacityLogoWithName),
RescaledBitmap, RescaledBitmap,
wxDefaultPosition, wxDefaultPosition,
wxSize(int(LOGOWITHNAME_WIDTH*fScale), int(LOGOWITHNAME_HEIGHT*fScale))); wxSize(int(LOGOWITHNAME_WIDTH*fScale), int(LOGOWITHNAME_HEIGHT*fScale)));

View File

@ -36,7 +36,7 @@ class AboutDialog:public wxDialog {
wxBoxSizer *topsizer; wxBoxSizer *topsizer;
wxStaticBitmap *icon; wxStaticBitmap *icon;
wxBitmap *logo; //vvv wxBitmap *logo; //v
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

View File

@ -56,7 +56,7 @@ void HighlightTextCtrl::OnMouseEvent(wxMouseEvent& event)
AudacityProject* pProj = GetActiveProject(); AudacityProject* pProj = GetActiveProject();
pProj->SetSel0(pCurSyl->t); pProj->SetSel0(pCurSyl->t);
//vvv Should probably select to end as in AudacityProject::OnSelectCursorEnd, //v Should probably select to end as in AudacityProject::OnSelectCursorEnd,
// but better to generalize that in AudacityProject methods. // but better to generalize that in AudacityProject methods.
pProj->mViewInfo.sel1 = pCurSyl->t; pProj->mViewInfo.sel1 = pCurSyl->t;
} }

View File

@ -116,7 +116,7 @@ private:
int mWidth; // client width int mWidth; // client width
int mHeight; // client height int mHeight; // client height
int mKaraokeHeight; //vvv mHeight - mBrandingHeight (so just mHeight now that Branding is removed). int mKaraokeHeight; //v mHeight - mBrandingHeight (so just mHeight now that Branding is removed).
unsigned int mKaraokeFontSize; unsigned int mKaraokeFontSize;
LyricsStyle mLyricsStyle; // default kHighlightLyrics LyricsStyle mLyricsStyle; // default kHighlightLyrics

View File

@ -65,7 +65,7 @@ SplashDialog::SplashDialog(wxWindow * parent)
{ {
this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground )); this->SetBackgroundColour(theTheme.Colour( clrAboutBoxBackground ));
m_pIcon = NULL; m_pIcon = NULL;
m_pLogo = NULL; //vvv m_pLogo = NULL; //v
ShuttleGui S( this, eIsCreating ); ShuttleGui S( this, eIsCreating );
Populate( S ); Populate( S );
Fit(); Fit();
@ -82,8 +82,8 @@ void SplashDialog::Populate( ShuttleGui & S )
gPrefs->Read(wxT("/GUI/ShowSplashScreen"), &bShow, true ); gPrefs->Read(wxT("/GUI/ShowSplashScreen"), &bShow, true );
S.StartVerticalLay(1); S.StartVerticalLay(1);
//vvv For now, change to AudacityLogoWithName via old-fashioned ways, not Theme. //v For now, change to AudacityLogoWithName via old-fashioned ways, not Theme.
m_pLogo = new wxBitmap((const char **) AudacityLogoWithName_xpm); //vvv m_pLogo = new wxBitmap((const char **) AudacityLogoWithName_xpm); //v
// JKC: Resize to 50% of size. Later we may use a smaller xpm as // JKC: Resize to 50% of size. Later we may use a smaller xpm as
// our source, but this allows us to tweak the size - if we want to. // our source, but this allows us to tweak the size - if we want to.
@ -95,7 +95,7 @@ void SplashDialog::Populate( ShuttleGui & S )
wxBitmap RescaledBitmap( RescaledImage ); wxBitmap RescaledBitmap( RescaledImage );
m_pIcon = m_pIcon =
new wxStaticBitmap(S.GetParent(), -1, new wxStaticBitmap(S.GetParent(), -1,
//*m_pLogo, //vvv theTheme.Bitmap(bmpAudacityLogoWithName), //*m_pLogo, //v theTheme.Bitmap(bmpAudacityLogoWithName),
RescaledBitmap, RescaledBitmap,
wxDefaultPosition, wxDefaultPosition,
wxSize(int(LOGOWITHNAME_WIDTH*fScale), int(LOGOWITHNAME_HEIGHT*fScale))); wxSize(int(LOGOWITHNAME_WIDTH*fScale), int(LOGOWITHNAME_HEIGHT*fScale)));

View File

@ -99,7 +99,7 @@ BlockFile *LegacyAliasBlockFile::BuildFromXML(wxString projDir, const wxChar **a
const wxString strValue = value; const wxString strValue = value;
if (!wxStricmp(attr, wxT("name")) && XMLValueChecker::IsGoodFileName(strValue, projDir)) if (!wxStricmp(attr, wxT("name")) && XMLValueChecker::IsGoodFileName(strValue, projDir))
//vvv Should this be //v Should this be
// dm.AssignFile(summaryFileName, strValue, false); // dm.AssignFile(summaryFileName, strValue, false);
// as in PCMAliasBlockFile::BuildFromXML? Test with an old project. // as in PCMAliasBlockFile::BuildFromXML? Test with an old project.
summaryFileName.Assign(projDir, strValue, wxT("")); summaryFileName.Assign(projDir, strValue, wxT(""));

View File

@ -304,7 +304,7 @@ BlockFile *LegacyBlockFile::BuildFromXML(wxString projDir, const wxChar **attrs,
const wxString strValue = value; const wxString strValue = value;
if (!wxStricmp(attr, wxT("name")) && XMLValueChecker::IsGoodFileName(strValue, projDir)) if (!wxStricmp(attr, wxT("name")) && XMLValueChecker::IsGoodFileName(strValue, projDir))
//vvv Should this be //v Should this be
// dm.AssignFile(fileName, strValue, false); // dm.AssignFile(fileName, strValue, false);
// as in PCMAliasBlockFile::BuildFromXML? Test with an old project. // as in PCMAliasBlockFile::BuildFromXML? Test with an old project.
fileName.Assign(projDir, strValue); fileName.Assign(projDir, strValue);

View File

@ -349,7 +349,7 @@ void LWSlider::SetStyle(int style)
if (mOrientation == wxHORIZONTAL) if (mOrientation == wxHORIZONTAL)
mMaxValue = DB_MAX; mMaxValue = DB_MAX;
else else
mMaxValue = DB_MAX; // for MixerBoard //vvv Previously was 6dB for MixerBoard, but identical for now. mMaxValue = DB_MAX; // for MixerBoard //v Previously was 6dB for MixerBoard, but identical for now.
mStepValue = 1.0f; mStepValue = 1.0f;
mSpeed = 0.5; mSpeed = 0.5;
mName = _("Gain"); mName = _("Gain");
@ -609,7 +609,7 @@ void LWSlider::Draw()
mThumbBitmap = &theTheme.Bitmap( bmpSliderThumb ); mThumbBitmap = &theTheme.Bitmap( bmpSliderThumb );
mThumbBitmapAllocated = false; mThumbBitmapAllocated = false;
} }
//vvv \todo Convert this to an image in AllThemeResources, as bmpSliderThumb. Make an alpha also, as for horizontal slider thumb? //v \todo Convert this to an image in AllThemeResources, as bmpSliderThumb. Make an alpha also, as for horizontal slider thumb?
else if (mOrientation == wxHORIZONTAL) else if (mOrientation == wxHORIZONTAL)
{ {
wxImage thumbImage(wxBitmap(SliderThumbDisabled).ConvertToImage()); wxImage thumbImage(wxBitmap(SliderThumbDisabled).ConvertToImage());
@ -701,7 +701,7 @@ void LWSlider::Draw()
if (mOrientation == wxHORIZONTAL) if (mOrientation == wxHORIZONTAL)
AColor::Line(*dc, mLeftX, mCenterY+1, mRightX+2, mCenterY+1); AColor::Line(*dc, mLeftX, mCenterY+1, mRightX+2, mCenterY+1);
else //vvv if (mStyle != DB_SLIDER) // Let the ruler do it for vertical DB_SLIDER. else //v if (mStyle != DB_SLIDER) // Let the ruler do it for vertical DB_SLIDER.
AColor::Line(*dc, mCenterX+1, mTopY, mCenterX+1, mBottomY+2); AColor::Line(*dc, mCenterX+1, mTopY, mCenterX+1, mBottomY+2);
@ -773,7 +773,7 @@ void LWSlider::Draw()
} }
} }
//vvv 20090820: Ruler doesn't align with slider correctly -- yet. //v 20090820: Ruler doesn't align with slider correctly -- yet.
//if ((mOrientation == wxVERTICAL) && (mStyle == DB_SLIDER)) //if ((mOrientation == wxVERTICAL) && (mStyle == DB_SLIDER))
//{ //{
// if (!mpRuler) // if (!mpRuler)
@ -797,7 +797,7 @@ void LWSlider::Draw()
// mpRuler->SetRange(mMaxValue, mMinValue); // mpRuler->SetRange(mMaxValue, mMinValue);
// mpRuler->SetFormat(Ruler::LinearDBFormat); // mpRuler->SetFormat(Ruler::LinearDBFormat);
// } // }
// mpRuler->SetBounds(mLeft, mTop, mWidth, mHeightY); //vvv Why the magic number reqd on height to get it to line up? + 9); // mpRuler->SetBounds(mLeft, mTop, mWidth, mHeightY); //v Why the magic number reqd on height to get it to line up? + 9);
// mpRuler->Draw(*dc); // mpRuler->Draw(*dc);
//} //}
//else //else

View File

@ -814,7 +814,7 @@ void Meter::HandleLayout()
left += mLeftSize.x+4; left += mLeftSize.x+4;
} }
mRightTextPos = wxPoint(width-mLeftSize.x, height-2-mLeftSize.y); mRightTextPos = wxPoint(width-mLeftSize.x, height-2-mLeftSize.y);
width -= mLeftSize.x + mRightSize.x + 8; //vvv ...but then -8 in UmixIt? -- for vertical only? width -= mLeftSize.x + mRightSize.x + 8; //v ...but then -8 in UmixIt? -- for vertical only?
} }
barw = (width-2)/2; barw = (width-2)/2;
barh = height - 4; barh = height - 4;