12DIALOG_KICAD_MERGE_3WAY_BASE::DIALOG_KICAD_MERGE_3WAY_BASE( wxWindow* parent, wxWindowID
id,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
long style ) :
DIALOG_SHIM( parent, id, title, pos, size, style )
14 this->SetSizeHints( wxSize( 850,650 ), wxDefaultSize );
16 wxBoxSizer* bMainSizer;
17 bMainSizer =
new wxBoxSizer( wxVERTICAL );
19 m_labelIntro =
new wxStaticText(
this, wxID_ANY,
_(
"Resolve each conflict by picking which side to keep, then click Apply."), wxDefaultPosition, wxDefaultSize, 0 );
21 bMainSizer->Add(
m_labelIntro, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 );
23 m_splitter =
new wxSplitterWindow(
this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_LIVE_UPDATE );
28 wxBoxSizer* bConflictsSizer;
29 bConflictsSizer =
new wxBoxSizer( wxVERTICAL );
45 wxBoxSizer* bResolutionSizer;
46 bResolutionSizer =
new wxBoxSizer( wxVERTICAL );
48 m_labelDetail =
new wxStaticText(
m_panelResolution, wxID_ANY,
_(
"Select a conflict on the left to see details."), wxDefaultPosition, wxDefaultSize, 0 );
52 m_textDetail =
new wxTextCtrl(
m_panelResolution, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_DONTWRAP );
55 bResolutionSizer->Add(
m_textDetail, 1, wxALL|wxEXPAND, 5 );
57 wxStaticBoxSizer* sbResolutionBox;
58 sbResolutionBox =
new wxStaticBoxSizer(
new wxStaticBox(
m_panelResolution, wxID_ANY,
_(
"Pick a side") ), wxHORIZONTAL );
60 m_radioOurs =
new wxRadioButton( sbResolutionBox->GetStaticBox(), wxID_ANY,
_(
"Ours"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
64 m_radioTheirs =
new wxRadioButton( sbResolutionBox->GetStaticBox(), wxID_ANY,
_(
"Theirs"), wxDefaultPosition, wxDefaultSize, 0 );
67 m_radioAncestor =
new wxRadioButton( sbResolutionBox->GetStaticBox(), wxID_ANY,
_(
"Ancestor"), wxDefaultPosition, wxDefaultSize, 0 );
71 bResolutionSizer->Add( sbResolutionBox, 0, wxALL|wxEXPAND, 5 );
78 bMainSizer->Add(
m_splitter, 1, wxEXPAND|wxALL, 5 );
87 bMainSizer->Add(
m_sdbSizer, 0, wxEXPAND|wxALL, 5 );
90 this->SetSizer( bMainSizer );
93 this->Centre( wxBOTH );