diff --git a/eeschema/dialogs/dialog_signal_list_base.cpp b/eeschema/dialogs/dialog_signal_list_base.cpp index d07cb0323c..177f64c5ad 100644 --- a/eeschema/dialogs/dialog_signal_list_base.cpp +++ b/eeschema/dialogs/dialog_signal_list_base.cpp @@ -16,7 +16,7 @@ DIALOG_SIGNAL_LIST_BASE::DIALOG_SIGNAL_LIST_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxVERTICAL ); - m_signals = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_NEEDED_SB|wxLB_SORT ); + m_signals = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT ); bSizer6->Add( m_signals, 1, wxALL|wxEXPAND, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); diff --git a/eeschema/dialogs/dialog_signal_list_base.fbp b/eeschema/dialogs/dialog_signal_list_base.fbp index 484ab18a7c..7c677737bd 100644 --- a/eeschema/dialogs/dialog_signal_list_base.fbp +++ b/eeschema/dialogs/dialog_signal_list_base.fbp @@ -143,7 +143,7 @@ Resizable 1 - wxLB_MULTIPLE|wxLB_NEEDED_SB|wxLB_SORT + wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT 0 diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp index 2d5f2e86e4..64231f41a7 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.cpp +++ b/eeschema/dialogs/dialog_sim_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) +// C++ code generated with wxFormBuilder (version Jun 24 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -368,7 +368,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer2->Add( m_staticText18, 0, wxALL, 5 ); m_customTxt = new wxTextCtrl( m_pgCustom, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - m_customTxt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) ); + m_customTxt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); bSizer2->Add( m_customTxt, 1, wxALL|wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp index 1fdf847b6c..1312b87579 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.fbp +++ b/eeschema/dialogs/dialog_sim_settings_base.fbp @@ -44,7 +44,7 @@ DIALOG_SIM_SETTINGS_BASE - 445,677 + 450,700 wxDEFAULT_DIALOG_STYLE Simulation settings @@ -1014,6 +1014,7 @@ sbSizer21 wxVERTICAL + 1 none @@ -1830,6 +1831,7 @@ sbSizer2 wxVERTICAL + 1 none diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h index a8d62b4bba..c010e6aab5 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.h +++ b/eeschema/dialogs/dialog_sim_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) +// C++ code generated with wxFormBuilder (version Jun 24 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -115,7 +115,7 @@ class DIALOG_SIM_SETTINGS_BASE : public wxDialog public: - DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 445,677 ), long style = wxDEFAULT_DIALOG_STYLE ); + DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 450,700 ), long style = wxDEFAULT_DIALOG_STYLE ); ~DIALOG_SIM_SETTINGS_BASE(); }; diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp index db1eefd828..c888c6f210 100644 --- a/eeschema/dialogs/dialog_spice_model_base.cpp +++ b/eeschema/dialogs/dialog_spice_model_base.cpp @@ -47,7 +47,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_passive->SetSizer( fgSizer1 ); m_passive->Layout(); fgSizer1->Fit( m_passive ); - m_notebook->AddPage( m_passive, _("Passive"), true ); + m_notebook->AddPage( m_passive, _("Passive"), false ); m_semiconductor = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer3; fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 ); @@ -438,7 +438,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_power->SetSizer( bSizer4 ); m_power->Layout(); bSizer4->Fit( m_power ); - m_notebook->AddPage( m_power, _("Source"), false ); + m_notebook->AddPage( m_power, _("Source"), true ); bSizer1->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp index 4574086a82..7171827c58 100644 --- a/eeschema/dialogs/dialog_spice_model_base.fbp +++ b/eeschema/dialogs/dialog_spice_model_base.fbp @@ -44,7 +44,7 @@ DIALOG_SPICE_MODEL_BASE - 497,719 + 500,768 wxDEFAULT_DIALOG_STYLE DIALOG_SHIM; dialog_shim.h @@ -178,7 +178,7 @@ Passive - 1 + 0 1 1 @@ -1881,7 +1881,7 @@ Source - 0 + 1 1 1 diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h index 158b0b1dfd..e299d60baa 100644 --- a/eeschema/dialogs/dialog_spice_model_base.h +++ b/eeschema/dialogs/dialog_spice_model_base.h @@ -143,7 +143,7 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM public: - DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 497,719 ), long style = wxDEFAULT_DIALOG_STYLE ); + DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,768 ), long style = wxDEFAULT_DIALOG_STYLE ); ~DIALOG_SPICE_MODEL_BASE(); }; diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp index 9febb8fecf..01127ab713 100644 --- a/eeschema/sim/sim_plot_frame_base.cpp +++ b/eeschema/sim/sim_plot_frame_base.cpp @@ -170,7 +170,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const m_panel5->SetSizer( m_sizer13 ); m_panel5->Layout(); m_sizer13->Fit( m_panel5 ); - m_splitterConsole->SplitHorizontally( m_plotPanel, m_panel5, 0 ); + m_splitterConsole->SplitHorizontally( m_plotPanel, m_panel5, 500 ); m_sizer11->Add( m_splitterConsole, 1, wxEXPAND, 5 ); @@ -212,7 +212,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const m_sidePanel->SetSizer( m_sideSizer ); m_sidePanel->Layout(); m_sideSizer->Fit( m_sidePanel ); - m_splitterPlot->SplitVertically( m_panel2, m_sidePanel, 0 ); + m_splitterPlot->SplitVertically( m_panel2, m_sidePanel, 700 ); m_sizer1->Add( m_splitterPlot, 1, wxEXPAND, 5 ); diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp index 7aa7be9adb..9990183bf7 100644 --- a/eeschema/sim/sim_plot_frame_base.fbp +++ b/eeschema/sim/sim_plot_frame_base.fbp @@ -44,7 +44,7 @@ SIM_PLOT_FRAME_BASE - 1280,900 + 1000,700 wxDEFAULT_FRAME_STYLE KIWAY_PLAYER; kiway_player.h Simulation Workbook @@ -88,7 +88,7 @@ - + 1 @@ -133,7 +133,7 @@ - + File m_fileMenu protected @@ -240,7 +240,7 @@ - + Simulation m_simulationMenu protected @@ -552,7 +552,7 @@ Resizable 0.8 - 0 + 700 -1 1 @@ -720,7 +720,7 @@ Resizable 0.8 - 0 + 500 -1 1 @@ -839,11 +839,11 @@ m_sizer5 wxHORIZONTAL protected - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -929,7 +929,7 @@ - + a page 0 @@ -1154,8 +1154,8 @@ - - + + 1 1 1 @@ -1229,7 +1229,7 @@ - + m_sizer13 wxVERTICAL @@ -1333,8 +1333,8 @@ - - + + 1 1 1 @@ -1408,12 +1408,12 @@ - + m_sideSizer wxVERTICAL protected - + 5 wxEXPAND 1 @@ -1516,7 +1516,7 @@ - + 5 wxEXPAND 1 @@ -1636,11 +1636,11 @@ - + 5 wxEXPAND 1 - + wxID_ANY Tune diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h index 7e2f63b2ad..b41679a951 100644 --- a/eeschema/sim/sim_plot_frame_base.h +++ b/eeschema/sim/sim_plot_frame_base.h @@ -99,19 +99,19 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER public: - SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation Workbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1280,900 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("SIM_PLOT_FRAME") ); + SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation Workbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1000,700 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("SIM_PLOT_FRAME") ); ~SIM_PLOT_FRAME_BASE(); void m_splitterPlotOnIdle( wxIdleEvent& ) { - m_splitterPlot->SetSashPosition( 0 ); + m_splitterPlot->SetSashPosition( 700 ); m_splitterPlot->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterPlotOnIdle ), NULL, this ); } void m_splitterConsoleOnIdle( wxIdleEvent& ) { - m_splitterConsole->SetSashPosition( 0 ); + m_splitterConsole->SetSashPosition( 500 ); m_splitterConsole->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterConsoleOnIdle ), NULL, this ); }