KiCad PCB EDA Suite
Loading...
Searching...
No Matches
dialog_kicad_merge_3way_base.cpp
Go to the documentation of this file.
1
2// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty)
3// http://www.wxformbuilder.org/
4//
5// PLEASE DO *NOT* EDIT THIS FILE!
7
9
11
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 )
13{
14 this->SetSizeHints( wxSize( 850,650 ), wxDefaultSize );
15
16 wxBoxSizer* bMainSizer;
17 bMainSizer = new wxBoxSizer( wxVERTICAL );
18
19 m_labelIntro = new wxStaticText( this, wxID_ANY, _("Resolve each conflict by picking which side to keep, then click Apply."), wxDefaultPosition, wxDefaultSize, 0 );
20 m_labelIntro->Wrap( -1 );
21 bMainSizer->Add( m_labelIntro, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 );
22
23 m_splitter = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_LIVE_UPDATE );
24 m_splitter->SetSashGravity( 0.35 );
25 m_splitter->Connect( wxEVT_IDLE, wxIdleEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::m_splitterOnIdle ), NULL, this );
26
27 m_panelConflicts = new wxPanel( m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
28 wxBoxSizer* bConflictsSizer;
29 bConflictsSizer = new wxBoxSizer( wxVERTICAL );
30
31 m_labelConflicts = new wxStaticText( m_panelConflicts, wxID_ANY, _("Conflicts"), wxDefaultPosition, wxDefaultSize, 0 );
32 m_labelConflicts->Wrap( -1 );
33 bConflictsSizer->Add( m_labelConflicts, 0, wxALL|wxEXPAND, 5 );
34
35 m_listConflicts = new wxListBox( m_panelConflicts, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE );
36 m_listConflicts->SetMinSize( wxSize( 220,300 ) );
37
38 bConflictsSizer->Add( m_listConflicts, 1, wxALL|wxEXPAND, 5 );
39
40
41 m_panelConflicts->SetSizer( bConflictsSizer );
42 m_panelConflicts->Layout();
43 bConflictsSizer->Fit( m_panelConflicts );
44 m_panelResolution = new wxPanel( m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
45 wxBoxSizer* bResolutionSizer;
46 bResolutionSizer = new wxBoxSizer( wxVERTICAL );
47
48 m_labelDetail = new wxStaticText( m_panelResolution, wxID_ANY, _("Select a conflict on the left to see details."), wxDefaultPosition, wxDefaultSize, 0 );
49 m_labelDetail->Wrap( -1 );
50 bResolutionSizer->Add( m_labelDetail, 0, wxALL|wxEXPAND, 5 );
51
52 m_textDetail = new wxTextCtrl( m_panelResolution, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_DONTWRAP );
53 m_textDetail->SetMinSize( wxSize( 400,180 ) );
54
55 bResolutionSizer->Add( m_textDetail, 1, wxALL|wxEXPAND, 5 );
56
57 wxStaticBoxSizer* sbResolutionBox;
58 sbResolutionBox = new wxStaticBoxSizer( new wxStaticBox( m_panelResolution, wxID_ANY, _("Pick a side") ), wxHORIZONTAL );
59
60 m_radioOurs = new wxRadioButton( sbResolutionBox->GetStaticBox(), wxID_ANY, _("Ours"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
61 m_radioOurs->SetValue( true );
62 sbResolutionBox->Add( m_radioOurs, 0, wxALL, 5 );
63
64 m_radioTheirs = new wxRadioButton( sbResolutionBox->GetStaticBox(), wxID_ANY, _("Theirs"), wxDefaultPosition, wxDefaultSize, 0 );
65 sbResolutionBox->Add( m_radioTheirs, 0, wxALL, 5 );
66
67 m_radioAncestor = new wxRadioButton( sbResolutionBox->GetStaticBox(), wxID_ANY, _("Ancestor"), wxDefaultPosition, wxDefaultSize, 0 );
68 sbResolutionBox->Add( m_radioAncestor, 0, wxALL, 5 );
69
70
71 bResolutionSizer->Add( sbResolutionBox, 0, wxALL|wxEXPAND, 5 );
72
73
74 m_panelResolution->SetSizer( bResolutionSizer );
75 m_panelResolution->Layout();
76 bResolutionSizer->Fit( m_panelResolution );
77 m_splitter->SplitVertically( m_panelConflicts, m_panelResolution, 300 );
78 bMainSizer->Add( m_splitter, 1, wxEXPAND|wxALL, 5 );
79
80 m_sdbSizer = new wxStdDialogButtonSizer();
81 m_sdbSizerApply = new wxButton( this, wxID_APPLY );
82 m_sdbSizer->AddButton( m_sdbSizerApply );
83 m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
84 m_sdbSizer->AddButton( m_sdbSizerCancel );
85 m_sdbSizer->Realize();
86
87 bMainSizer->Add( m_sdbSizer, 0, wxEXPAND|wxALL, 5 );
88
89
90 this->SetSizer( bMainSizer );
91 this->Layout();
92
93 this->Centre( wxBOTH );
94
95 // Connect Events
96 this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnClose ) );
97 m_listConflicts->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnConflictSelected ), NULL, this );
98 m_radioOurs->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnResolutionChanged ), NULL, this );
99 m_radioTheirs->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnResolutionChanged ), NULL, this );
100 m_radioAncestor->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnResolutionChanged ), NULL, this );
101 m_sdbSizerApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnApply ), NULL, this );
102 m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnCancel ), NULL, this );
103}
104
106{
107 // Disconnect Events
108 this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnClose ) );
109 m_listConflicts->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnConflictSelected ), NULL, this );
110 m_radioOurs->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnResolutionChanged ), NULL, this );
111 m_radioTheirs->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnResolutionChanged ), NULL, this );
112 m_radioAncestor->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnResolutionChanged ), NULL, this );
113 m_sdbSizerApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnApply ), NULL, this );
114 m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_KICAD_MERGE_3WAY_BASE::OnCancel ), NULL, this );
115
116}
virtual void OnResolutionChanged(wxCommandEvent &event)
virtual void OnClose(wxCloseEvent &event)
virtual void OnConflictSelected(wxCommandEvent &event)
virtual void OnCancel(wxCommandEvent &event)
DIALOG_KICAD_MERGE_3WAY_BASE(wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("Resolve Merge Conflicts"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(950, 700), long style=wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
virtual void OnApply(wxCommandEvent &event)
DIALOG_SHIM(wxWindow *aParent, wxWindowID id, const wxString &title, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER, const wxString &name=wxDialogNameStr)
#define _(s)