Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-12 07:35:51 +01:00
Code Issues Releases Wiki Activity

Change some magic numbers whose original use was no longer, and get rid of some no-longer-correct comments, for clarity.

Browse Source
This commit is contained in:
v.audacity
2010-07-26 22:34:57 +00:00
parent a485b6f0fd
commit 49f8db7114
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/AboutDialog.cpp
View File

@@ -180,6 +180,8 @@ AboutDialog::AboutDialog(wxWindow * parent)
this->Centre(); this->Centre();
} }
#define ABOUT_DIALOG_WIDTH 506
void AboutDialog::PopulateAudacityPage( ShuttleGui & S ) void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
{ {
wxString versionStr = AUDACITY_VERSION_STRING; wxString versionStr = AUDACITY_VERSION_STRING;
@@ -297,13 +299,14 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
//vvv theTheme.Bitmap(bmpAudacityLogo), wxPoint(93, 10), wxSize(215, 190)); //vvv theTheme.Bitmap(bmpAudacityLogo), wxPoint(93, 10), wxSize(215, 190));
//vvv theTheme.Bitmap(bmpAudacityLogoWithName), //vvv theTheme.Bitmap(bmpAudacityLogoWithName),
RescaledBitmap, RescaledBitmap,
wxDefaultPosition, wxSize(int(LOGOWITHNAME_WIDTH*fScale), int(LOGOWITHNAME_HEIGHT*fScale))); wxDefaultPosition,
wxSize(int(LOGOWITHNAME_WIDTH*fScale), int(LOGOWITHNAME_HEIGHT*fScale)));
delete logo; delete logo;
S.Prop(0).AddWindow( icon ); S.Prop(0).AddWindow( icon );
HtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1, HtmlWindow *html = new LinkingHtmlWindow(S.GetParent(), -1,
wxDefaultPosition, wxDefaultPosition,
wxSize(LOGOWITHNAME_WIDTH, 359), // wxSize(480, 240), wxSize(ABOUT_DIALOG_WIDTH, 359),
wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER); wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
html->SetFocus(); html->SetFocus();
html->SetPage(creditStr); html->SetPage(creditStr);
@@ -325,7 +328,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
S.StartNotebookPage( _("Build Information") ); // start the tab S.StartNotebookPage( _("Build Information") ); // start the tab
S.StartVerticalLay(2); // create the window S.StartVerticalLay(2); // create the window
HtmlWindow *html = new HtmlWindow(S.GetParent(), -1, wxDefaultPosition, HtmlWindow *html = new HtmlWindow(S.GetParent(), -1, wxDefaultPosition,
wxSize(LOGOWITHNAME_WIDTH, 264), wxSize(ABOUT_DIALOG_WIDTH, 264),
wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER); wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
// create a html pane in it to put the content in. // create a html pane in it to put the content in.
wxString enabled = _("Enabled"); wxString enabled = _("Enabled");
@@ -523,7 +526,7 @@ void AboutDialog::PopulateLicensePage( ShuttleGui & S )
S.StartVerticalLay(1); S.StartVerticalLay(1);
HtmlWindow *html = new HtmlWindow(S.GetParent(), -1, HtmlWindow *html = new HtmlWindow(S.GetParent(), -1,
wxDefaultPosition, wxDefaultPosition,
wxSize(LOGOWITHNAME_WIDTH, 264), // wxSize(480, 240), wxSize(ABOUT_DIALOG_WIDTH, 264),
wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER); wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
// I tried using <pre> here to get a monospaced font, // I tried using <pre> here to get a monospaced font,

14
src/AllThemeResources.h
View File

@@ -204,20 +204,8 @@ from there. Audacity will look for a file called "Pause.png".
#define LOGOWITHNAME_WIDTH 506 #define LOGOWITHNAME_WIDTH 506
#define LOGOWITHNAME_HEIGHT 200 #define LOGOWITHNAME_HEIGHT 200
//vvv For now, do the new image the old-fashioned way, not via Theme.
// DEFINE_IMAGE(bmpAudacityLogoWithName, wxImage(LOGOWITHNAME_WIDTH, LOGOWITHNAME_HEIGHT), wxT("AudacityLogoWithName"));
// AWD: no sense in statically building the XPM into every file that includes DEFINE_IMAGE( bmpAudacityLogo, wxImage( 215, 190 ), wxT("AudacityLogo"));
// this one; the few that need it should include it themselves.
//#ifndef HAVE_AUDACITYLOGOWITHNAME
// #define HAVE_AUDACITYLOGOWITHNAME
// #include "../images/AudacityLogoWithName.xpm"
//#ifdef __WXGTK__
// #include "../images/AudacityLogoAlpha.xpm"
//#endif
//#endif
DEFINE_IMAGE( bmpAudacityLogo, wxImage( 215, 190 ), wxT("AudacityLogo")); //vvv
DEFINE_IMAGE( bmpAudacityLogo48x48, wxImage( 48, 48 ), wxT("AudacityLogo48x48")); DEFINE_IMAGE( bmpAudacityLogo48x48, wxImage( 48, 48 ), wxT("AudacityLogo48x48"));
DEFINE_IMAGE( bmpLinkSelect, wxImage(27, 27), wxT("LinkSelect")); DEFINE_IMAGE( bmpLinkSelect, wxImage(27, 27), wxT("LinkSelect"));