forked from mia/Aegisub
Changed buttons for the resample dialog and made call tips be off by default.
Originally committed to SVN as r1608.
This commit is contained in:
parent
d4d4c864db
commit
5d5278db88
3 changed files with 8 additions and 14 deletions
|
@ -46,6 +46,7 @@
|
||||||
#include "video_context.h"
|
#include "video_context.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "subs_edit_box.h"
|
#include "subs_edit_box.h"
|
||||||
|
#include "help_button.h"
|
||||||
|
|
||||||
|
|
||||||
///////////////
|
///////////////
|
||||||
|
@ -104,17 +105,11 @@ DialogResample::DialogResample(wxWindow *parent, SubtitlesGrid *_grid)
|
||||||
ResBoxSizer->Add(Anamorphic,0,0,0);
|
ResBoxSizer->Add(Anamorphic,0,0,0);
|
||||||
|
|
||||||
// Button sizer
|
// Button sizer
|
||||||
wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
|
wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer();
|
||||||
ButtonSizer->AddStretchSpacer(1);
|
ButtonSizer->AddButton(new wxButton(this,wxID_OK));
|
||||||
#ifndef __WXMAC__
|
ButtonSizer->AddButton(new wxButton(this,wxID_CANCEL));
|
||||||
ButtonSizer->Add(new wxButton(this,BUTTON_RESAMPLE,_("Resample")),0,wxRIGHT,5);
|
ButtonSizer->AddButton(new HelpButton(this,_T("dialog_resample")));
|
||||||
ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,0);
|
ButtonSizer->Realize();
|
||||||
#else
|
|
||||||
ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5);
|
|
||||||
wxButton *resampleButton = new wxButton(this,BUTTON_RESAMPLE,_("Resample"));
|
|
||||||
ButtonSizer->Add(resampleButton,0,wxRight,0);
|
|
||||||
resampleButton->SetDefault();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Main sizer
|
// Main sizer
|
||||||
wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
|
wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
|
||||||
|
@ -131,7 +126,7 @@ DialogResample::DialogResample(wxWindow *parent, SubtitlesGrid *_grid)
|
||||||
///////////////
|
///////////////
|
||||||
// Event table
|
// Event table
|
||||||
BEGIN_EVENT_TABLE(DialogResample,wxDialog)
|
BEGIN_EVENT_TABLE(DialogResample,wxDialog)
|
||||||
EVT_BUTTON(BUTTON_RESAMPLE,DialogResample::OnResample)
|
EVT_BUTTON(wxID_OK,DialogResample::OnResample)
|
||||||
EVT_BUTTON(BUTTON_DEST_FROM_VIDEO,DialogResample::OnGetDestRes)
|
EVT_BUTTON(BUTTON_DEST_FROM_VIDEO,DialogResample::OnGetDestRes)
|
||||||
EVT_CHECKBOX(CHECK_SYMMETRICAL,DialogResample::OnSymmetrical)
|
EVT_CHECKBOX(CHECK_SYMMETRICAL,DialogResample::OnSymmetrical)
|
||||||
EVT_TEXT(TEXT_MARGIN_T,DialogResample::OnMarginChange)
|
EVT_TEXT(TEXT_MARGIN_T,DialogResample::OnMarginChange)
|
||||||
|
|
|
@ -91,7 +91,6 @@ public:
|
||||||
// IDs
|
// IDs
|
||||||
enum {
|
enum {
|
||||||
BUTTON_DEST_FROM_VIDEO = 1520,
|
BUTTON_DEST_FROM_VIDEO = 1520,
|
||||||
BUTTON_RESAMPLE,
|
|
||||||
CHECK_ANAMORPHIC,
|
CHECK_ANAMORPHIC,
|
||||||
CHECK_SYMMETRICAL,
|
CHECK_SYMMETRICAL,
|
||||||
TEXT_MARGIN_T,
|
TEXT_MARGIN_T,
|
||||||
|
|
|
@ -116,7 +116,7 @@ void OptionsManager::LoadDefaults(bool onlyDefaults) {
|
||||||
SetBool(_T("Insert mode on time boxes"),false);
|
SetBool(_T("Insert mode on time boxes"),false);
|
||||||
#endif
|
#endif
|
||||||
SetModificationType(MOD_EDIT_BOX);
|
SetModificationType(MOD_EDIT_BOX);
|
||||||
SetBool(_T("Call tips enabled"),true);
|
SetBool(_T("Call tips enabled"),false);
|
||||||
SetBool(_T("Syntax highlight enabled"),true);
|
SetBool(_T("Syntax highlight enabled"),true);
|
||||||
|
|
||||||
// Edit box cosmetic
|
// Edit box cosmetic
|
||||||
|
|
Loading…
Reference in a new issue