Update of /cvsroot/audacity/audacity-src/src/effects
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv16711/effects
Modified Files:
DtmfGen.cpp
Log Message:
Fix Dialog appearance on Linux
Make labels adhere to Audacity UI standards by adding colons at the end
Work around GCC warnings because of float -> int conversion
Index: DtmfGen.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/DtmfGen.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DtmfGen.cpp 13 Jan 2007 00:06:18 -0000 1.3
+++ DtmfGen.cpp 24 Jan 2007 13:09:08 -0000 1.4
@@ -33,8 +33,8 @@
#define M_PI 3.14159265358979323846 /* pi */
#endif
#define DUTY_MIN 0
-#define DUTY_MAX 1000.0
-#define DUTY_SCALE (DUTY_MAX/100)
+#define DUTY_MAX 1000
+#define DUTY_SCALE (DUTY_MAX/100.0) // ensure float division
#define FADEINOUT 250.0 // used for fadein/out needed to remove clicking
noise
@@ -383,12 +383,12 @@
S.AddTitle(_("by Salvo Ventura (2006)"));
- S.StartMultiColumn(2, wxCENTER | wxEXPAND);
+ S.StartMultiColumn(2, wxEXPAND);
{
- mDtmfStringT = S.Id(ID_DTMF_STRING_TEXT).AddTextBox(_("DTMF sequence"),
wxT(""), 10);
+ mDtmfStringT = S.Id(ID_DTMF_STRING_TEXT).AddTextBox(_("DTMF sequence:"),
wxT(""), 10);
mDtmfStringT->SetValidator(vldDtmf);
- S.AddFixedText(_("DTMF duration"), false);
+ S.AddPrompt(_("DTMF duration:"));
mDtmfDurationT = new
TimeTextCtrl(this,
ID_DTMF_DURATION_TEXT,
@@ -406,26 +406,22 @@
S.AddWindow(mDtmfDurationT);
mDtmfDurationT->EnableMenu();
- S.SetSizeHints(-1,-1);
- }
- S.EndMultiColumn();
-
- S.StartMultiColumn(2, wxCENTER | wxEXPAND);
- {
S.AddFixedText(_("Tone/silence ratio:"), false);
S.SetStyle(wxSL_HORIZONTAL | wxEXPAND);
- mDtmfDutyS = S.Id(ID_DTMF_DUTYCYCLE_SLIDER).AddSlider(wxT(""),
dDutyCycle, DUTY_MAX);
+ mDtmfDutyS = S.Id(ID_DTMF_DUTYCYCLE_SLIDER).AddSlider(wxT(""),
(int)dDutyCycle, DUTY_MAX);
mDtmfDutyS->SetRange(DUTY_MIN, DUTY_MAX);
+
+ S.SetSizeHints(-1,-1);
}
S.EndMultiColumn();
S.StartMultiColumn(2, wxCENTER);
{
- S.AddFixedText(_("duty cycle"), false);
+ S.AddFixedText(_("duty cycle:"), false);
mDtmfDutyT =
S.Id(ID_DTMF_DUTYCYCLE_TEXT).AddVariableText(wxString::Format(_("%.1f %%"),
(float) dDutyCycle/DUTY_SCALE), false);
- S.AddFixedText(_("tone duration"), false);
+ S.AddFixedText(_("tone duration:"), false);
mDtmfSilenceT =
S.Id(ID_DTMF_TONELEN_TEXT).AddVariableText(wxString::Format(_("%d ms"), (int)
dTone * 1000), false);
- S.AddFixedText(_("silence duration"), false);
+ S.AddFixedText(_("silence duration:"), false);
mDtmfToneT =
S.Id(ID_DTMF_SILENCE_TEXT).AddVariableText(wxString::Format(_("%d ms"), (int)
dSilence * 1000), false);
}
S.EndMultiColumn();
@@ -435,7 +431,7 @@
bool DtmfDialog::TransferDataToWindow()
{
- mDtmfDutyS->SetValue(dDutyCycle);
+ mDtmfDutyS->SetValue((int)dDutyCycle);
mDtmfStringT->SetValue(dString);
mDtmfDurationT->SetTimeValue(dDuration);
mDtmfDurationT->SetFocus();
@@ -527,4 +523,4 @@
void DtmfDialog::OnTimeCtrlUpdate(wxCommandEvent & event) {
this->Fit();
-}
\ No newline at end of file
+}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
