Sheesh, you couldn't wait even an hour for a response to your question
on the -devel list?! Why did you even bother to ask?!
- V
Martyn wrote:
> Update of /cvsroot/audacity/audacity-src/src/effects
> In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28508
>
> Modified Files:
> Amplify.cpp ChangePitch.cpp ChangeSpeed.cpp ChangeTempo.cpp
> Compressor.cpp Equalization.cpp Leveller.cpp Normalize.cpp
> Phaser.cpp Repeat.cpp TruncSilence.cpp Wahwah.cpp
> Log Message:
> Make positioning of OK and Cancel buttons consistent across all built-in
> effects (plug-ins are a different matter)
>
> Index: Compressor.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/Compressor.cpp,v
> retrieving revision 1.36
> retrieving revision 1.37
> diff -u -d -r1.36 -r1.37
> --- Compressor.cpp 18 Apr 2007 05:38:30 -0000 1.36
> +++ Compressor.cpp 27 Jun 2007 00:26:28 -0000 1.37
> @@ -513,13 +513,13 @@
> hSizer->Add(preview, 0, wxALIGN_CENTRE|wxALL, 5);
> hSizer->Add(40, 10);
>
> - wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> - hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> -
> wxButton *ok = new wxButton(this, wxID_OK, _("&OK"));
> ok->SetDefault();
> hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
>
> + wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> + hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> +
> mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL,
> 5);
>
> SetAutoLayout(true);
>
> Index: Equalization.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.cpp,v
> retrieving revision 1.65
> retrieving revision 1.66
> diff -u -d -r1.65 -r1.66
> --- Equalization.cpp 27 May 2007 22:10:41 -0000 1.65
> +++ Equalization.cpp 27 Jun 2007 00:26:28 -0000 1.66
> @@ -1247,13 +1247,13 @@
>
> szrJ->Add(80, 4); // horizontal spacer
>
> - btn = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> - szrJ->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
> -
> btn = new wxButton(this, wxID_OK, _("&OK"));
> btn->SetDefault();
> szrJ->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
>
> + btn = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> + szrJ->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
> +
> szrV->Add( szrJ, 0, wxALIGN_CENTER );
>
> // -------------------------------------------------------------------
>
> Index: ChangeTempo.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeTempo.cpp,v
> retrieving revision 1.32
> retrieving revision 1.33
> diff -u -d -r1.32 -r1.33
> --- ChangeTempo.cpp 29 May 2007 00:16:19 -0000 1.32
> +++ ChangeTempo.cpp 27 Jun 2007 00:26:28 -0000 1.33
> @@ -291,15 +291,15 @@
> pBoxSizer_OK->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 4);
> pBoxSizer_OK->Add(32, 8); // horizontal spacer
>
> - wxButton * pButton_Cancel =
> - new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> wxDefaultSize, 0);
> - pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
> -
> wxButton * pButton_OK =
> new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition,
> wxDefaultSize, 0);
> pButton_OK->SetDefault();
> pBoxSizer_OK->Add(pButton_OK, 0, wxALIGN_CENTER | wxALL, 4);
>
> + wxButton * pButton_Cancel =
> + new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> wxDefaultSize, 0);
> + pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
> +
> pBoxSizer_Dialog->Add(pBoxSizer_OK, 0, wxALIGN_CENTER | wxALL, 8);
>
>
>
> Index: TruncSilence.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/TruncSilence.cpp,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -d -r1.10 -r1.11
> --- TruncSilence.cpp 12 Mar 2007 09:23:12 -0000 1.10
> +++ TruncSilence.cpp 27 Jun 2007 00:26:28 -0000 1.11
> @@ -275,13 +275,13 @@
> mainSizer->Add(hSizer, 0, wxALIGN_CENTRE | wxALL, 5);
> hSizer = new wxBoxSizer(wxHORIZONTAL);
>
> - wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> - hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> -
> wxButton *ok = new wxButton(this, wxID_OK, _("OK"));
> ok->SetDefault();
> hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
>
> + wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> + hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> +
> mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL,
> 5);
>
> SetAutoLayout(true);
>
> Index: Leveller.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/Leveller.cpp,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -d -r1.14 -r1.15
> --- Leveller.cpp 24 Apr 2007 22:55:34 -0000 1.14
> +++ Leveller.cpp 27 Jun 2007 00:26:28 -0000 1.15
> @@ -246,13 +246,14 @@
> mainSizer->Add(group, 0, wxALIGN_CENTRE | wxALL, 5);
>
> hSizer = new wxBoxSizer(wxHORIZONTAL);
> - wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> - hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
>
> wxButton *ok = new wxButton(this, wxID_OK, _("&OK"));
> ok->SetDefault();
> hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
>
> + wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> + hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> +
> mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL,
> 5);
>
> SetAutoLayout(true);
>
> Index: ChangeSpeed.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeSpeed.cpp,v
> retrieving revision 1.34
> retrieving revision 1.35
> diff -u -d -r1.34 -r1.35
> --- ChangeSpeed.cpp 3 Jun 2007 18:04:35 -0000 1.34
> +++ ChangeSpeed.cpp 27 Jun 2007 00:26:28 -0000 1.35
> @@ -388,15 +388,16 @@
> pBoxSizer_OK->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 4);
> pBoxSizer_OK->Add(32, 8); // horizontal spacer
>
> - wxButton * pButton_Cancel =
> - new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> wxDefaultSize, 0);
> - pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
> -
> wxButton * pButton_OK =
> new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition,
> wxDefaultSize, 0);
> pButton_OK->SetDefault();
> pBoxSizer_OK->Add(pButton_OK, 0, wxALIGN_CENTER | wxALL, 4);
>
> + wxButton * pButton_Cancel =
> + new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> wxDefaultSize, 0);
> + pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
> +
> +
> pBoxSizer_Dialog->Add(pBoxSizer_OK, 0, wxALIGN_CENTER | wxALL, 8);
>
>
>
> Index: Normalize.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/Normalize.cpp,v
> retrieving revision 1.15
> retrieving revision 1.16
> diff -u -d -r1.15 -r1.16
> --- Normalize.cpp 3 Jul 2006 19:15:47 -0000 1.15
> +++ Normalize.cpp 27 Jun 2007 00:26:28 -0000 1.16
> @@ -350,13 +350,13 @@
> hSizer->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 5);
> hSizer->Add(20, 10); // horizontal spacer
>
> - wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> - hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> -
> wxButton *ok = new wxButton(this, wxID_OK, _("&OK"));
> ok->SetDefault();
> hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
>
> + wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> + hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> +
> mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL,
> 5);
>
> SetAutoLayout(true);
>
> Index: Amplify.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/Amplify.cpp,v
> retrieving revision 1.35
> retrieving revision 1.36
> diff -u -d -r1.35 -r1.36
> --- Amplify.cpp 20 Sep 2006 22:33:27 -0000 1.35
> +++ Amplify.cpp 27 Jun 2007 00:26:28 -0000 1.36
> @@ -205,16 +205,16 @@
> pBoxSizer_OK->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 5);
> pBoxSizer_OK->Add(25, 8); // horizontal spacer
>
> - wxButton *item11 =
> - new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> - wxDefaultSize, 0);
> - pBoxSizer_OK->Add(item11, 0, wxALIGN_CENTER | wxALL, 5);
> -
> wxButton *item10 =
> new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition,
> wxDefaultSize, 0);
> item10->SetDefault();
> pBoxSizer_OK->Add(item10, 0, wxALIGN_CENTER | wxALL, 5);
>
> + wxButton *item11 =
> + new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> + wxDefaultSize, 0);
> + pBoxSizer_OK->Add(item11, 0, wxALIGN_CENTER | wxALL, 5);
> +
> pBoxSizer_Dialog->Add(pBoxSizer_OK, 0, wxALIGN_CENTER | wxALL, 5);
>
> SetAutoLayout(TRUE);
>
> Index: Wahwah.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/Wahwah.cpp,v
> retrieving revision 1.29
> retrieving revision 1.30
> diff -u -d -r1.29 -r1.30
> --- Wahwah.cpp 3 Jul 2006 19:15:47 -0000 1.29
> +++ Wahwah.cpp 27 Jun 2007 00:26:28 -0000 1.30
> @@ -583,17 +583,17 @@
> item23->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 5);
> item23->Add(20, 10); // horizontal spacer
>
> - wxButton *item25 =
> - new wxButton(parent, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> - wxDefaultSize, 0);
> - item23->Add(item25, 0, wxALIGN_CENTRE | wxALL, 5);
> -
> wxButton *item24 =
> new wxButton(parent, wxID_OK, _("&OK"), wxDefaultPosition,
> wxDefaultSize, 0);
> item24->SetDefault();
> item23->Add(item24, 0, wxALIGN_CENTRE | wxALL, 5);
>
> + wxButton *item25 =
> + new wxButton(parent, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> + wxDefaultSize, 0);
> + item23->Add(item25, 0, wxALIGN_CENTRE | wxALL, 5);
> +
> item0->Add(item23, 0, wxALIGN_CENTRE | wxALL, 5);
>
> if (set_sizer) {
>
> Index: ChangePitch.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangePitch.cpp,v
> retrieving revision 1.38
> retrieving revision 1.39
> diff -u -d -r1.38 -r1.39
> --- ChangePitch.cpp 3 Jun 2007 09:46:16 -0000 1.38
> +++ ChangePitch.cpp 27 Jun 2007 00:26:28 -0000 1.39
> @@ -390,15 +390,15 @@
> pBoxSizer_OK->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 4);
> pBoxSizer_OK->Add(32, 8); // horizontal spacer
>
> - wxButton * pButton_Cancel =
> - new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> wxDefaultSize, 0);
> - pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
> -
> wxButton * pButton_OK =
> new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition,
> wxDefaultSize, 0);
> pButton_OK->SetDefault();
> pBoxSizer_OK->Add(pButton_OK, 0, wxALIGN_CENTER | wxALL, 4);
>
> + wxButton * pButton_Cancel =
> + new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> wxDefaultSize, 0);
> + pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
> +
> pBoxSizer_Dialog->Add(pBoxSizer_OK, 0, wxALIGN_CENTER | wxALL, 8);
>
>
>
> Index: Phaser.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/Phaser.cpp,v
> retrieving revision 1.29
> retrieving revision 1.30
> diff -u -d -r1.29 -r1.30
> --- Phaser.cpp 3 Jul 2006 19:15:47 -0000 1.29
> +++ Phaser.cpp 27 Jun 2007 00:26:28 -0000 1.30
> @@ -596,17 +596,17 @@
> item23->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 5);
> item23->Add(20, 10); // horizontal spacer
>
> - wxButton *item25 =
> - new wxButton(parent, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> - wxDefaultSize, 0);
> - item23->Add(item25, 0, wxALIGN_CENTRE | wxALL, 5);
> -
> wxButton *item24 =
> new wxButton(parent, wxID_OK, _("&OK"), wxDefaultPosition,
> wxDefaultSize, 0);
> item24->SetDefault();
> item23->Add(item24, 0, wxALIGN_CENTRE | wxALL, 5);
>
> + wxButton *item25 =
> + new wxButton(parent, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
> + wxDefaultSize, 0);
> + item23->Add(item25, 0, wxALIGN_CENTRE | wxALL, 5);
> +
> item0->Add(item23, 0, wxALIGN_CENTRE | wxALL, 5);
>
> if (set_sizer) {
>
> Index: Repeat.cpp
> ===================================================================
> RCS file: /cvsroot/audacity/audacity-src/src/effects/Repeat.cpp,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -d -r1.16 -r1.17
> --- Repeat.cpp 8 Aug 2006 02:40:45 -0000 1.16
> +++ Repeat.cpp 27 Jun 2007 00:26:28 -0000 1.17
> @@ -268,13 +268,13 @@
>
> hSizer = new wxBoxSizer(wxHORIZONTAL);
>
> - wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> - hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> -
> wxButton *ok = new wxButton(this, wxID_OK, _("&OK"));
> ok->SetDefault();
> hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
>
> + wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
> + hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
> +
> mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL,
> 5);
>
> SetAutoLayout(true);
>
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by DB2 Express
> Download DB2 Express C - the FREE version of DB2 express and take
> control of your XML. No limits. Just data. Click to get it now.
> http://sourceforge.net/powerbar/db2/
> _______________________________________________
> Audacity-cvs mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/audacity-cvs
>
>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
