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

Fix some layout issues; change packaage highlight scheme.

This commit is contained in:
Jeff Young 2021-11-13 11:21:00 +00:00
parent eb3d8dbcc8
commit 2f99621bd3
7 changed files with 234 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kicad/pcm/dialogs/dialog_pcm_base.cpp
View File

@ -13,7 +13,7 @@
DIALOG_PCM_BASE::DIALOG_PCM_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) DIALOG_PCM_BASE::DIALOG_PCM_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); this->SetSizeHints( wxSize( 940,550 ), wxDefaultSize );
wxBoxSizer* m_MainSizer; wxBoxSizer* m_MainSizer;
m_MainSizer = new wxBoxSizer( wxVERTICAL ); m_MainSizer = new wxBoxSizer( wxVERTICAL );

2
kicad/pcm/dialogs/dialog_pcm_base.fbp
View File

@ -42,7 +42,7 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size">-1,-1</property> <property name="minimum_size">940,550</property>
<property name="name">DIALOG_PCM_BASE</property> <property name="name">DIALOG_PCM_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">-1,-1</property>

11
kicad/pcm/dialogs/panel_package.cpp
View File

@ -157,17 +157,18 @@ void PANEL_PACKAGE::OnClick( wxMouseEvent& event )
void PANEL_PACKAGE::OnPaint( wxPaintEvent& event ) void PANEL_PACKAGE::OnPaint( wxPaintEvent& event )
{ {
wxRect rect( wxPoint( 1, 1 ), GetClientSize() - wxSize( 1, 1 ) );
wxPaintDC dc( this ); wxPaintDC dc( this );
dc.SetBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_FRAMEBK ) ); dc.SetBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_FRAMEBK ) );
dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ), 1 ) ); dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ), 1 ) );
if( m_selected ) if( m_selected )
dc.SetPen( wxPen( *wxBLACK, 3 ) ); {
rect.Deflate( 1 );
dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ), 4 ) );
}
dc.DrawRectangle( wxPoint( 0, 0 ), GetClientSize() ); dc.DrawRectangle( rect );
if( !m_selected )
dc.DrawLine( 0, 0, GetClientSize().GetX(), 0 );
} }

2
kicad/pcm/dialogs/panel_packages_view.cpp
View File

@ -580,7 +580,7 @@ void PANEL_PACKAGES_VIEW::updatePackageList()
} }
} }
sizer->FitInside( m_packageListWindow ); m_packageListWindow->FitInside();
m_packageListWindow->SetScrollRate( 0, 15 ); m_packageListWindow->SetScrollRate( 0, 15 );
m_packageListWindow->Layout(); m_packageListWindow->Layout();
} }

22
kicad/pcm/dialogs/panel_packages_view_base.cpp
View File

@ -22,16 +22,19 @@ PANEL_PACKAGES_VIEW_BASE::PANEL_PACKAGES_VIEW_BASE( wxWindow* parent, wxWindowID
m_panelList = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelList = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bPanelListSizer; wxBoxSizer* bPanelListSizer;
bPanelListSizer = new wxBoxSizer( wxVERTICAL ); bPanelListSizer = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bColumnSizer;
bColumnSizer = new wxBoxSizer( wxVERTICAL );
m_searchCtrl = new wxSearchCtrl( m_panelList, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_searchCtrl = new wxSearchCtrl( m_panelList, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
#ifndef __WXMAC__ #ifndef __WXMAC__
m_searchCtrl->ShowSearchButton( true ); m_searchCtrl->ShowSearchButton( true );
#endif #endif
m_searchCtrl->ShowCancelButton( false ); m_searchCtrl->ShowCancelButton( false );
bPanelListSizer->Add( m_searchCtrl, 0, wxEXPAND, 5 ); bColumnSizer->Add( m_searchCtrl, 0, wxEXPAND|wxBOTTOM, 5 );
m_packageListWindow = new wxScrolledWindow( m_panelList, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB|wxBORDER_SUNKEN|wxFULL_REPAINT_ON_RESIZE|wxVSCROLL ); m_packageListWindow = new wxScrolledWindow( m_panelList, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE|wxVSCROLL );
m_packageListWindow->SetScrollRate( 5, 5 ); m_packageListWindow->SetScrollRate( 5, 5 );
wxBoxSizer* bSizer2; wxBoxSizer* bSizer2;
bSizer2 = new wxBoxSizer( wxVERTICAL ); bSizer2 = new wxBoxSizer( wxVERTICAL );
@ -40,7 +43,13 @@ PANEL_PACKAGES_VIEW_BASE::PANEL_PACKAGES_VIEW_BASE( wxWindow* parent, wxWindowID
m_packageListWindow->SetSizer( bSizer2 ); m_packageListWindow->SetSizer( bSizer2 );
m_packageListWindow->Layout(); m_packageListWindow->Layout();
bSizer2->Fit( m_packageListWindow ); bSizer2->Fit( m_packageListWindow );
bPanelListSizer->Add( m_packageListWindow, 1, wxEXPAND, 5 ); bColumnSizer->Add( m_packageListWindow, 1, wxEXPAND, 5 );
bPanelListSizer->Add( bColumnSizer, 1, wxEXPAND|wxALL, 5 );
m_staticline2 = new wxStaticLine( m_panelList, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
bPanelListSizer->Add( m_staticline2, 0, wxEXPAND|wxBOTTOM, 5 );
m_panelList->SetSizer( bPanelListSizer ); m_panelList->SetSizer( bPanelListSizer );
@ -48,7 +57,10 @@ PANEL_PACKAGES_VIEW_BASE::PANEL_PACKAGES_VIEW_BASE( wxWindow* parent, wxWindowID
bPanelListSizer->Fit( m_panelList ); bPanelListSizer->Fit( m_panelList );
m_panelDetails = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelDetails = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bPanelDetailsSizer; wxBoxSizer* bPanelDetailsSizer;
bPanelDetailsSizer = new wxBoxSizer( wxVERTICAL ); bPanelDetailsSizer = new wxBoxSizer( wxHORIZONTAL );
m_staticline1 = new wxStaticLine( m_panelDetails, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
bPanelDetailsSizer->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 5 );
m_infoScrollWindow = new wxScrolledWindow( m_panelDetails, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL ); m_infoScrollWindow = new wxScrolledWindow( m_panelDetails, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL );
m_infoScrollWindow->SetScrollRate( 5, 5 ); m_infoScrollWindow->SetScrollRate( 5, 5 );

133
kicad/pcm/dialogs/panel_packages_view_base.fbp
View File

@ -170,11 +170,20 @@
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bPanelListSizer</property> <property name="name">bPanelListSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bColumnSizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxBOTTOM</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxSearchCtrl" expanded="1"> <object class="wxSearchCtrl" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -293,7 +302,7 @@
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style">wxALWAYS_SHOW_SB|wxBORDER_SUNKEN|wxFULL_REPAINT_ON_RESIZE|wxVSCROLL</property> <property name="window_style">wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE|wxVSCROLL</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizer2</property> <property name="name">bSizer2</property>
@ -304,6 +313,66 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM</property>
<property name="proportion">0</property>
<object class="wxStaticLine" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticline2</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxLI_VERTICAL</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
</object>
</object>
</object> </object>
<object class="splitteritem" expanded="1"> <object class="splitteritem" expanded="1">
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="1">
@ -360,8 +429,66 @@
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size">-1,-1</property> <property name="minimum_size">-1,-1</property>
<property name="name">bPanelDetailsSizer</property> <property name="name">bPanelDetailsSizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM</property>
<property name="proportion">0</property>
<object class="wxStaticLine" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticline1</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxLI_VERTICAL</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>

3
kicad/pcm/dialogs/panel_packages_view_base.h
View File

@ -22,6 +22,7 @@ class HTML_WINDOW;
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/scrolwin.h> #include <wx/scrolwin.h>
#include <wx/statline.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/html/htmlwin.h> #include <wx/html/htmlwin.h>
#include <wx/grid.h> #include <wx/grid.h>
@ -47,7 +48,9 @@ class PANEL_PACKAGES_VIEW_BASE : public wxPanel
wxPanel* m_panelList; wxPanel* m_panelList;
wxSearchCtrl* m_searchCtrl; wxSearchCtrl* m_searchCtrl;
wxScrolledWindow* m_packageListWindow; wxScrolledWindow* m_packageListWindow;
wxStaticLine* m_staticline2;
wxPanel* m_panelDetails; wxPanel* m_panelDetails;
wxStaticLine* m_staticline1;
wxScrolledWindow* m_infoScrollWindow; wxScrolledWindow* m_infoScrollWindow;
HTML_WINDOW* m_infoText; HTML_WINDOW* m_infoText;
wxBoxSizer* m_sizerVersions; wxBoxSizer* m_sizerVersions;