mirror of https://github.com/odrling/Aegisub
Fix some longstanding bugs now that I understand wxWidgets better.
Originally committed to SVN as r5116.
This commit is contained in:
parent
f04d721228
commit
22c797a5d1
|
@ -87,8 +87,9 @@ bool Reporter::OnInit()
|
||||||
setlocale(LC_NUMERIC, "C");
|
setlocale(LC_NUMERIC, "C");
|
||||||
setlocale(LC_CTYPE, "C");
|
setlocale(LC_CTYPE, "C");
|
||||||
|
|
||||||
|
|
||||||
mFrame *frame = new mFrame(_("Aegisub Reporter"));
|
mFrame *frame = new mFrame(_("Aegisub Reporter"));
|
||||||
Report *r = new Report;
|
// Report *r = new Report;
|
||||||
|
|
||||||
if (parser.Found("x")) {
|
if (parser.Found("x")) {
|
||||||
r->Save("report.xml");
|
r->Save("report.xml");
|
||||||
|
@ -98,7 +99,7 @@ bool Reporter::OnInit()
|
||||||
|
|
||||||
SetTopWindow(frame);
|
SetTopWindow(frame);
|
||||||
|
|
||||||
frame->SetReport(r);
|
// frame->SetReport(r);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -110,31 +111,31 @@ mFrame::mFrame(const wxString &window_title)
|
||||||
|
|
||||||
wxBoxSizer *topSizer = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer *topSizer = new wxBoxSizer(wxVERTICAL);
|
||||||
|
|
||||||
wxStaticBoxSizer *msgSizer = new wxStaticBoxSizer(wxVERTICAL, this, "");
|
wxBoxSizer *msgSizer = new wxBoxSizer(wxVERTICAL);
|
||||||
topSizer->Add(msgSizer, 1, wxALL, 5);
|
topSizer->Add(msgSizer, 0, wxALL, 5);
|
||||||
|
|
||||||
wxStaticText *title = new wxStaticText(this, -1,_("Welcome to the Aegisub Reporter!"), wxDefaultPosition, wxSize(325,-1), wxALIGN_CENTRE|wxST_NO_AUTORESIZE);
|
wxStaticText *title = new wxStaticText(this, -1, _("Welcome to the Aegisub reporter!"));
|
||||||
msgSizer->Add(title, 1, wxALL, 5);
|
msgSizer->Add(title, 0, wxALL, 5);
|
||||||
title->SetFont(wxFont(11, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
|
title->SetFont(wxFont(11, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
|
||||||
|
|
||||||
wxStaticText *msg = new wxStaticText(this, -1,_("In order to better help us target development, and improve Aegisub we would like you to submit some information about your system and setup."));
|
wxStaticText *msg = new wxStaticText(this, -1, _("In order to better help us target development, and improve Aegisub we would like you to submit some information about your system and setup."));
|
||||||
msg->Wrap(325);
|
msg->Wrap(325);
|
||||||
msgSizer->Add(msg, 1, wxALL, 5);
|
msgSizer->Add(msg, 1, wxALL, 5);
|
||||||
|
|
||||||
wxStaticText *notice = new wxStaticText(this, -1,_("This information is completely anonymous, no personal information is sent along it is strictly used for targeting new features and the future direction of Aegisub."));
|
wxStaticText *notice = new wxStaticText(this, -1, _("This information is completely anonymous, no personal information is sent along it is strictly used for targeting new features and the future direction of Aegisub."));
|
||||||
msgSizer->Add(notice, 1, wxALL, 5);
|
msgSizer->Add(notice, 1, wxALL, 5);
|
||||||
notice->SetFont(wxFont(11, wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL));
|
notice->SetFont(wxFont(11, wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL));
|
||||||
notice->Wrap(325);
|
notice->Wrap(325);
|
||||||
msgSizer->Add(new wxButton(this, 42, "View Report"), 0, wxALL, 10 );
|
msgSizer->Add(new wxButton(this, 42, "View Report"), 0, wxTOP, 5);
|
||||||
|
|
||||||
|
|
||||||
wxStdDialogButtonSizer *stdButton = new wxStdDialogButtonSizer();
|
wxStdDialogButtonSizer *stdButton = new wxStdDialogButtonSizer();
|
||||||
stdButton->AddButton(new wxButton(this, wxID_OK, _("Submit")));
|
stdButton->AddButton(new wxButton(this, wxID_OK, _("Submit")));
|
||||||
stdButton->AddButton(new wxButton(this, wxID_CANCEL, _("Cancel")));
|
stdButton->AddButton(new wxButton(this, wxID_CANCEL, _("Cancel")));
|
||||||
stdButton->Realize();
|
stdButton->Realize();
|
||||||
topSizer->Add(stdButton, 1, wxALL, 5);
|
topSizer->Add(stdButton, 0, wxALL, 5);
|
||||||
|
|
||||||
this->SetSizerAndFit(topSizer);
|
this->SetSizerAndFit(topSizer);
|
||||||
|
msgSizer->Layout();
|
||||||
|
|
||||||
// Is there a better way to do this?
|
// Is there a better way to do this?
|
||||||
this->SetMaxSize(this->GetEffectiveMinSize());
|
this->SetMaxSize(this->GetEffectiveMinSize());
|
||||||
|
|
Loading…
Reference in New Issue