haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjustments to dialog formatting

This commit is contained in:
Chris Pavlina 2016-01-15 20:58:23 -05:00 committed by Chris Pavlina
parent 45a304ed1c
commit 87cb6c4429
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
common/widgets/widget_hotkey_list.cpp
View File

@ -25,6 +25,7 @@
#include <widgets/widget_hotkey_list.h> #include <widgets/widget_hotkey_list.h>
#include <wx/dataview.h> #include <wx/dataview.h>
#include <wx/statline.h>
#include <draw_frame.h> #include <draw_frame.h>
#include <dialog_shim.h> #include <dialog_shim.h>
@ -67,28 +68,44 @@ public:
wxPanel* panel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize ); wxPanel* panel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize );
wxBoxSizer* sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* sizer = new wxBoxSizer( wxVERTICAL );
// Dialog layout:
//
// inst_label........................
// ----------------------------------
//
// cmd_label_0 cmd_label_1 \
// | fgsizer
// key_label_0 key_label_1 /
wxStaticText* inst_label = new wxStaticText( panel, wxID_ANY, wxEmptyString, wxStaticText* inst_label = new wxStaticText( panel, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL ); wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL );
inst_label->SetLabelText( _( "Press a new hotkey, or press Esc to reset..." ) ); inst_label->SetLabelText( _( "Press a new hotkey, or press Esc to cancel..." ) );
{
wxFont font = inst_label->GetFont();
inst_label->SetFont( font.Bold() );
}
sizer->Add( inst_label, 0, wxALL, 5 ); sizer->Add( inst_label, 0, wxALL, 5 );
sizer->Add( new wxStaticText( panel, wxID_ANY, sizer->Add( new wxStaticLine( panel ), 0, wxALL | wxEXPAND, 2 );
_( "Command: " ) + aName ),
0, wxALL, 5 );
sizer->Add( new wxStaticText( panel, wxID_ANY, wxFlexGridSizer* fgsizer = new wxFlexGridSizer( 2 );
_( "Current key: ") + aCurrentKey ),
0, wxALL, 5 ); wxStaticText* cmd_label_0 = new wxStaticText( panel, wxID_ANY, _( "Command:" ) );
fgsizer->Add( cmd_label_0, 0, wxALL | wxALIGN_CENTRE_VERTICAL, 5 );
wxStaticText* cmd_label_1 = new wxStaticText( panel, wxID_ANY, aName );
cmd_label_1->SetFont( cmd_label_1->GetFont().Bold().MakeLarger() );
fgsizer->Add( cmd_label_1, 0, wxALL | wxALIGN_CENTRE_VERTICAL, 5 );
wxStaticText* key_label_0 = new wxStaticText( panel, wxID_ANY, _( "Current key:" ) );
fgsizer->Add( key_label_0, 0, wxALL | wxALIGN_CENTRE_VERTICAL, 5 );
wxStaticText* key_label_1 = new wxStaticText( panel, wxID_ANY, aCurrentKey );
key_label_1->SetFont( key_label_1->GetFont().Bold().MakeLarger() );
fgsizer->Add( key_label_1, 0, wxALL | wxALIGN_CENTRE_VERTICAL, 5 );
sizer->Add( fgsizer, 1, wxEXPAND );
// Wrap the sizer in a second to give a larger border around the whole dialog // Wrap the sizer in a second to give a larger border around the whole dialog
wxBoxSizer* outer_sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* outer_sizer = new wxBoxSizer( wxVERTICAL );
outer_sizer->Add( sizer, 0, wxALL, 10 ); outer_sizer->Add( sizer, 0, wxALL | wxEXPAND, 10 );
panel->SetSizer( outer_sizer ); panel->SetSizer( outer_sizer );
Layout(); Layout();