Icons: use standard arrows in PCB Calculator

This commit is contained in:
Michael Kavanagh 2020-12-24 15:01:52 +00:00 committed by Seth Hillbrand
parent 8af4cf88a0
commit a4ab596b8d
8 changed files with 9 additions and 101 deletions

View File

@ -1,44 +0,0 @@
/* XPM */
const char *arrow_bottom_xpm[] = {
/* columns rows colors chars-per-pixel */
"22 22 16 1",
" c #FCFEFC",
". c #0C3A58",
"= c #23C1D8",
"+ c #DBEDF6",
"# c #040204",
": c #A8D2E0",
"- c #49DBE8",
"% c #14688D",
"* c #0C8EB3",
"o c #89C9DE",
"X c #244862",
"; c #139DC1",
"@ c #317D9C",
"$ c #70C0D8",
"& c #12ADCE",
"O c #C3E1ED",
/* pixels */
" ",
" ",
" ",
" ..XXX... ",
" .oO++O@# ",
" .+o$oo%# ",
" . O&*=%# ",
" . +$*-%# ",
" . O=*-%# ",
" . $&*=%# ",
" ......O$&;=;.X.... ",
" #@$oo:&**=;&;@%# ",
" #@+:$&*;&=-;%# ",
" #@ +$;;=-;%# ",
" #@ +$$-;%# ",
" #@ O-;%# ",
" #@+;%# ",
" #@%# ",
" ## ",
" ",
" ",
" "
};

View File

@ -1,44 +0,0 @@
/* XPM */
const char *arrow_top_xpm[] = {
/* columns rows colors chars-per-pixel */
"22 22 16 1",
"o c #7994B7",
"- c #27486C",
": c #74B9DC",
"& c #1286BD",
"X c #040B19",
"@ c #AFD3E7",
"O c #165686",
". c #0C3058",
" c #FBFEFC",
"+ c #2298C9",
"* c #74A6CC",
"$ c #8AC7E4",
"; c #147EB1",
"# c #1BABD6",
"% c #41C5E1",
"= c #206596",
/* pixels */
" ",
" ",
" ",
" .X ",
" .oOX ",
" .o +OX ",
" .o @#+OX ",
" .o @$#%+OX ",
" .o %+&#%+OX ",
" .o $*+&&+#%=OX ",
" .-=O=+&&&+&=OO.X ",
" ......++&&#;.....X ",
" X$@+&%=X ",
" - @:;%OX ",
" . $;%=X ",
" . @:;#OX ",
" .@*+;#OX ",
" .-=OOO.X ",
" XXXXXXXX ",
" ",
" ",
" "
};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 B

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -9,8 +9,6 @@
#include "pcb_calculator_frame_base.h" #include "pcb_calculator_frame_base.h"
#include "../bitmaps/arrow_bottom.xpm"
#include "../bitmaps/arrow_top.xpm"
#include "../bitmaps/color_code_multiplier.xpm" #include "../bitmaps/color_code_multiplier.xpm"
#include "../bitmaps/color_code_tolerance.xpm" #include "../bitmaps/color_code_tolerance.xpm"
#include "../bitmaps/color_code_value.xpm" #include "../bitmaps/color_code_value.xpm"
@ -336,8 +334,6 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
bSizerAttButt->Add( m_buttonAlcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerAttButt->Add( m_buttonAlcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bpButtonCalcAtt = new wxBitmapButton( m_panelAttenuators, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpButtonCalcAtt = new wxBitmapButton( m_panelAttenuators, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_bpButtonCalcAtt->SetBitmap( wxBitmap( arrow_bottom_xpm ) );
bSizerAttButt->Add( m_bpButtonCalcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerAttButt->Add( m_bpButtonCalcAtt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
@ -952,8 +948,6 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
m_bpButtonAnalyze = new wxBitmapButton( m_panelTransline, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpButtonAnalyze = new wxBitmapButton( m_panelTransline, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_bpButtonAnalyze->SetBitmap( wxBitmap( arrow_bottom_xpm ) );
bSizerButtons->Add( m_bpButtonAnalyze, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerButtons->Add( m_bpButtonAnalyze, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_AnalyseButton = new wxButton( m_panelTransline, wxID_ANY, _("Analyze"), wxDefaultPosition, wxDefaultSize, 0 ); m_AnalyseButton = new wxButton( m_panelTransline, wxID_ANY, _("Analyze"), wxDefaultPosition, wxDefaultSize, 0 );
@ -963,8 +957,6 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
bSizerButtons->Add( m_SynthetizeButton, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); bSizerButtons->Add( m_SynthetizeButton, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_bpButtonSynthetize = new wxBitmapButton( m_panelTransline, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpButtonSynthetize = new wxBitmapButton( m_panelTransline, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_bpButtonSynthetize->SetBitmap( wxBitmap( arrow_top_xpm ) );
bSizerButtons->Add( m_bpButtonSynthetize, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerButtons->Add( m_bpButtonSynthetize, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );

View File

@ -3434,7 +3434,7 @@
<property name="auth_needed">0</property> <property name="auth_needed">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmap">Load From File; ../bitmaps/arrow_bottom.xpm</property> <property name="bitmap"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
<property name="center_pane">0</property> <property name="center_pane">0</property>
@ -10349,7 +10349,7 @@
<property name="auth_needed">0</property> <property name="auth_needed">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmap">Load From File; ../bitmaps/arrow_bottom.xpm</property> <property name="bitmap"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
<property name="center_pane">0</property> <property name="center_pane">0</property>
@ -10571,7 +10571,7 @@
<property name="auth_needed">0</property> <property name="auth_needed">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmap">Load From File; ../bitmaps/arrow_top.xpm</property> <property name="bitmap"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
<property name="center_pane">0</property> <property name="center_pane">0</property>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

View File

@ -34,6 +34,10 @@ const wxString DataFileNameExt( wxT("pcbcalc") );
PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) : PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
PCB_CALCULATOR_FRAME_BASE( aParent ) PCB_CALCULATOR_FRAME_BASE( aParent )
{ {
m_bpButtonCalcAtt->SetBitmap( KiBitmap( small_down_xpm ) );
m_bpButtonAnalyze->SetBitmap( KiBitmap( small_down_xpm ) );
m_bpButtonSynthetize->SetBitmap( KiBitmap( small_up_xpm ) );
SetKiway( this, aKiway ); SetKiway( this, aKiway );
m_currTransLine = NULL; m_currTransLine = NULL;
m_currTransLineType = DEFAULT_TYPE; m_currTransLineType = DEFAULT_TYPE;