From 1e1ebf49446612e48d89baf985fcdb01757bf110 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 4 Dec 2003 19:09:08 +0000 Subject: [PATCH] Added a "set output file" menu option which does the same as the "browse" button. --- ChangeLog | 4 ++++ src/mmg/mmg.cpp | 7 ++++++- src/mmg/mmg.h | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfab6e41b..15883ebaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-12-04 Moritz Bunkus + * mmg: new feature: Added a menu option, 'set output file', that + can be used as an alternative to the "browse" button at the bottom + (for those poor users with nothing more than 800x600 ;)). + * mkvmerge: new feature: The user can alter the order in which the tracks for an input file are put into the output file with the new "--track-order" option. diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp index 3853b8fe0..2ffc9559d 100644 --- a/src/mmg/mmg.cpp +++ b/src/mmg/mmg.cpp @@ -143,6 +143,9 @@ mmg_dialog::mmg_dialog(): wxFrame(NULL, -1, "mkvmerge GUI v" VERSION, file_menu->Append(ID_M_FILE_SAVE, _T("&Save settings\tCtrl-S"), _T("Save muxing settings to a file")); file_menu->AppendSeparator(); + file_menu->Append(ID_M_FILE_SETOUTPUT, _T("Set &output file"), + _T("Select the file you want to write to")); + file_menu->AppendSeparator(); file_menu->Append(ID_M_FILE_EXIT, _T("&Quit\tCtrl-Q"), _T("Quit the application")); @@ -307,7 +310,8 @@ mmg_dialog::mmg_dialog(): wxFrame(NULL, -1, "mkvmerge GUI v" VERSION, } void mmg_dialog::on_browse_output(wxCommandEvent &evt) { - wxFileDialog dlg(NULL, "Choose an output file", last_open_dir, "", + wxFileDialog dlg(NULL, "Choose an output file", last_open_dir, + tc_output->GetValue().AfterLast(PSEP), _T("Matroska A/V files (*.mka;*.mkv)|*.mka;*.mkv|" ALLFILES), wxSAVE | wxOVERWRITE_PROMPT); if(dlg.ShowModal() == wxID_OK) { @@ -1029,6 +1033,7 @@ BEGIN_EVENT_TABLE(mmg_dialog, wxFrame) EVT_MENU(ID_M_FILE_NEW, mmg_dialog::on_file_new) EVT_MENU(ID_M_FILE_LOAD, mmg_dialog::on_file_load) EVT_MENU(ID_M_FILE_SAVE, mmg_dialog::on_file_save) + EVT_MENU(ID_M_FILE_SETOUTPUT, mmg_dialog::on_browse_output) EVT_MENU(ID_M_MUXING_START, mmg_dialog::on_run) EVT_MENU(ID_M_MUXING_COPY_CMDLINE, mmg_dialog::on_copy_to_clipboard) EVT_MENU(ID_M_MUXING_SAVE_CMDLINE, mmg_dialog::on_save_cmdline) diff --git a/src/mmg/mmg.h b/src/mmg/mmg.h index f82d1ad5e..c03a27f26 100644 --- a/src/mmg/mmg.h +++ b/src/mmg/mmg.h @@ -139,7 +139,8 @@ using namespace libmatroska; #define ID_M_FILE_NEW 20000 #define ID_M_FILE_LOAD 20001 #define ID_M_FILE_SAVE 20002 -#define ID_M_FILE_EXIT 20003 +#define ID_M_FILE_SETOUTPUT 20003 +#define ID_M_FILE_EXIT 20004 #define ID_M_FILE_LOADSEPARATOR 20090 #define ID_M_FILE_LOADLAST1 20091 #define ID_M_FILE_LOADLAST2 20092