ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2348 from lioncash/about 

DolphinWX: Fix branch information display in the about dialog.
This commit is contained in:
Lioncash 2015-04-30 19:20:53 -04:00
parent 4b00ccbe4e 9012ed18b1
commit ad6ed9a6bc
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinWX/AboutDolphin.cpp
View File

@ -75,15 +75,15 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
const wxString SupportText = _("Support"); const wxString SupportText = _("Support");
wxStaticText* const Dolphin = new wxStaticText(this, wxID_ANY, DolphinText); wxStaticText* const Dolphin = new wxStaticText(this, wxID_ANY, DolphinText);
wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTE_NO_VSCROLL); wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTE_READONLY | wxTE_NO_VSCROLL);
BanishBackground(Revision); BanishBackground(Revision);
wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText); wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText);
wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_NO_VSCROLL); wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_READONLY | wxTE_MULTILINE | wxTE_NO_VSCROLL);
BanishBackground(Branch); BanishBackground(Branch);
wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text);
wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText); wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText);
wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, wxString(" | ")); wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, " | ");
wxStaticText* const SecondSpacer = new wxStaticText(this, wxID_ANY, wxString(" | ")); wxStaticText* const SecondSpacer = new wxStaticText(this, wxID_ANY, " | ");
wxHyperlinkCtrl* const Download = new wxHyperlinkCtrl(this, wxID_ANY, "dolphin-emu.org/download", "https://dolphin-emu.org/download/"); wxHyperlinkCtrl* const Download = new wxHyperlinkCtrl(this, wxID_ANY, "dolphin-emu.org/download", "https://dolphin-emu.org/download/");
wxHyperlinkCtrl* const License = new wxHyperlinkCtrl(this, wxID_ANY, LicenseText, "https://github.com/dolphin-emu/dolphin/blob/master/license.txt"); wxHyperlinkCtrl* const License = new wxHyperlinkCtrl(this, wxID_ANY, LicenseText, "https://github.com/dolphin-emu/dolphin/blob/master/license.txt");
wxHyperlinkCtrl* const Authors = new wxHyperlinkCtrl(this, wxID_ANY, AuthorsText, "https://github.com/dolphin-emu/dolphin/graphs/contributors"); wxHyperlinkCtrl* const Authors = new wxHyperlinkCtrl(this, wxID_ANY, AuthorsText, "https://github.com/dolphin-emu/dolphin/graphs/contributors");
@ -100,13 +100,8 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
RevisionFont.SetWeight(wxFONTWEIGHT_BOLD); RevisionFont.SetWeight(wxFONTWEIGHT_BOLD);
Revision->SetFont(RevisionFont); Revision->SetFont(RevisionFont);
Revision->SetEditable(false);
Revision->SetWindowStyle(wxNO_BORDER);
BranchFont.SetPointSize(7); BranchFont.SetPointSize(7);
Branch->SetFont(BranchFont); Branch->SetFont(BranchFont);
Branch->SetEditable(false);
Branch->AppendText(BranchText + "\n"); Branch->AppendText(BranchText + "\n");
Branch->AppendText(BranchRevText + "\n"); Branch->AppendText(BranchRevText + "\n");
Branch->AppendText(CompiledText); Branch->AppendText(CompiledText);