From 923308ff45346bc77ffd099799f3d48629ca015f Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 20 Jan 2005 11:18:41 +0000 Subject: [PATCH] Changed the tooltip for the "stretch" input box. Only append "/1" to the "stretch" argument if the user hasn't entered a fraction himself. --- ChangeLog | 5 +++++ src/mmg/mmg.cpp | 7 +++++-- src/mmg/tab_input.cpp | 7 ++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f3ab84b3..eb759c5d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-20 Moritz Bunkus + + * mmg: bug fix: The "stretch" input box tooltip was wrong. The + resulting command line was broken, too. + 2005-01-08 Moritz Bunkus * mmg: new feature: Made the mkvmerge GUI guide available by diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp index 8c88a5c82..fb1a6af16 100644 --- a/src/mmg/mmg.cpp +++ b/src/mmg/mmg.cpp @@ -1283,8 +1283,11 @@ mmg_dialog::update_command_line() { arg += t->delay; else arg += wxT("0"); - if (t->stretch.Length() > 0) - arg += wxT(",") + t->stretch + wxT("/1"); + if (t->stretch.Length() > 0) { + arg += wxT(",") + t->stretch; + if (t->stretch.Find(wxT("/")) < 0) + arg += wxT("/1"); + } clargs.Add(wxT("--sync")); clargs.Add(arg); } diff --git a/src/mmg/tab_input.cpp b/src/mmg/tab_input.cpp index 49a09f0f8..e4c53bf87 100644 --- a/src/mmg/tab_input.cpp +++ b/src/mmg/tab_input.cpp @@ -248,9 +248,10 @@ tab_input::tab_input(wxWindow *parent): siz_fg->Add(st_stretch, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 10); tc_stretch = new wxTextCtrl(this, ID_TC_STRETCH, wxT("")); tc_stretch->SetToolTip(TIP("Stretch the audio or subtitle track by a " - "factor. This should be a positive floating " - "point number. Not all formats can be stretched " - "at the moment.")); + "factor. This entry can have two formats. It is " + "either a positive floating point number, or a " + "fraction like e.g. 1200/1253. Not all formats " + "can be stretched at the moment.")); tc_stretch->SetSizeHints(0, -1); siz_fg->Add(tc_stretch, 0, wxGROW, 0);