From d7f5bb01631f83621c863aeb05cd885d7da36aca Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 1 Jan 2005 15:07:52 +0000 Subject: [PATCH] The beginning of supporting appending files in mmg. --- src/mmg/mmg.cpp | 8 ++++---- src/mmg/tab_input.cpp | 11 +++++++++++ src/mmg/tab_input.h | 3 ++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp index ce373436a..d4ef4d5df 100644 --- a/src/mmg/mmg.cpp +++ b/src/mmg/mmg.cpp @@ -701,11 +701,11 @@ mmg_dialog::mmg_dialog(): bs_main->Add(bs_buttons, 0, wxALIGN_CENTER_HORIZONTAL); #ifdef SYS_WINDOWS - SetSizeHints(520, 740); - SetSize(520, 740); + SetSizeHints(600, 740); + SetSize(600, 740); #else - SetSizeHints(520, 718); - SetSize(520, 718); + SetSizeHints(600, 718); + SetSize(600, 718); #endif muxing_in_progress = false; diff --git a/src/mmg/tab_input.cpp b/src/mmg/tab_input.cpp index 7c2ee1125..5cebfb4fc 100644 --- a/src/mmg/tab_input.cpp +++ b/src/mmg/tab_input.cpp @@ -88,10 +88,18 @@ tab_input::tab_input(wxWindow *parent): b_remove_file = new wxButton(this, ID_B_REMOVEFILE, wxT("remove"), wxDefaultPosition, wxSize(50, -1)); b_remove_file->Enable(false); + b_append_file = new wxButton(this, ID_B_APPENDFILE, wxT("append"), + wxDefaultPosition, wxSize(60, -1)); + b_append_file->Enable(false); siz_column->Add(b_add_file, 0, wxBOTTOM, 10); siz_column->Add(b_remove_file, 0, 0, 0); siz_line->Add(siz_column, 0, wxLEFT, 10); + + siz_column = new wxBoxSizer(wxVERTICAL); + siz_column->Add(b_append_file, 0, wxBOTTOM, 10); + siz_line->Add(siz_column, 0, wxLEFT, 10); + siz_all->Add(siz_line, 2, wxGROW | wxLEFT | wxRIGHT, 10); siz_all->Add(0, GROUPSPACING, 0, 0, 0); @@ -981,6 +989,7 @@ tab_input::on_remove_file(wxCommandEvent &evt) { cb_no_attachments->Enable(false); cb_no_tags->Enable(false); b_remove_file->Enable(false); + b_append_file->Enable(false); b_track_up->Enable(false); b_track_down->Enable(false); no_track_mode(); @@ -1056,6 +1065,7 @@ tab_input::on_file_selected(wxCommandEvent &evt) { wxString label; b_remove_file->Enable(true); + b_append_file->Enable(true); selected_file = -1; old_track = selected_track; selected_track = -1; @@ -1437,6 +1447,7 @@ tab_input::load(wxConfigBase *cfg) { selected_file = -1; selected_track = -1; b_remove_file->Enable(false); + b_append_file->Enable(false); for (fidx = 0; fidx < files.size(); fidx++) { f = &files[fidx]; diff --git a/src/mmg/tab_input.h b/src/mmg/tab_input.h index 9d5714aa9..d7fd3ad28 100644 --- a/src/mmg/tab_input.h +++ b/src/mmg/tab_input.h @@ -49,6 +49,7 @@ #define ID_B_TRACKUP 11028 #define ID_B_TRACKDOWN 11029 #define ID_T_INPUTVALUES 11030 +#define ID_B_APPENDFILE 11031 class tab_input: public wxPanel { DECLARE_CLASS(tab_input); @@ -56,7 +57,7 @@ class tab_input: public wxPanel { protected: wxListBox *lb_input_files; wxButton *b_add_file, *b_remove_file, *b_browse_tags, *b_browse_timecodes; - wxButton *b_track_up, *b_track_down; + wxButton *b_track_up, *b_track_down, *b_append_file; wxCheckBox *cb_no_chapters, *cb_no_attachments, *cb_no_tags; wxCheckBox *cb_default, *cb_aac_is_sbr; wxCheckListBox *clb_tracks;