Add color selector in 3D viewer for silkscreen, solder mask and copper.
Remove unused or duplicate icons.
This commit is contained in:
jean-pierre charras
parent
06aa47c93d
commit
d0daa2cab7
|
|
@ -46,9 +46,21 @@ static const wxChar keyBgColor_Red[] = wxT( "BgColor_Red" );
|
||||||
static const wxChar keyBgColor_Green[] = wxT( "BgColor_Green" );
|
static const wxChar keyBgColor_Green[] = wxT( "BgColor_Green" );
|
||||||
static const wxChar keyBgColor_Blue[] = wxT( "BgColor_Blue" );
|
static const wxChar keyBgColor_Blue[] = wxT( "BgColor_Blue" );
|
||||||
|
|
||||||
static const wxChar keyBgColor_Red_Top[] = wxT( "BgColor_Red_Top" );
|
static const wxChar keyBgColor_Red_Top[] = wxT( "BgColor_Red_Top" );
|
||||||
static const wxChar keyBgColor_Green_Top[] = wxT( "BgColor_Green_Top" );
|
static const wxChar keyBgColor_Green_Top[] = wxT( "BgColor_Green_Top" );
|
||||||
static const wxChar keyBgColor_Blue_Top[] = wxT( "BgColor_Blue_Top" );
|
static const wxChar keyBgColor_Blue_Top[] = wxT( "BgColor_Blue_Top" );
|
||||||
|
|
||||||
|
static const wxChar keySMaskColor_Red[] = wxT( "SMaskColor_Red" );
|
||||||
|
static const wxChar keySMaskColor_Green[] = wxT( "SMaskColor_Green" );
|
||||||
|
static const wxChar keySMaskColor_Blue[] = wxT( "SMaskColor_Blue" );
|
||||||
|
|
||||||
|
static const wxChar keySilkColor_Red[] = wxT( "SilkColor_Red" );
|
||||||
|
static const wxChar keySilkColor_Green[] = wxT( "SilkColor_Green" );
|
||||||
|
static const wxChar keySilkColor_Blue[] = wxT( "SilkColor_Blue" );
|
||||||
|
|
||||||
|
static const wxChar keyCopperColor_Red[] = wxT( "CopperColor_Red" );
|
||||||
|
static const wxChar keyCopperColor_Green[] = wxT( "CopperColor_Green" );
|
||||||
|
static const wxChar keyCopperColor_Blue[] = wxT( "CopperColor_Blue" );
|
||||||
|
|
||||||
static const wxChar keyShowRealisticMode[] = wxT( "ShowRealisticMode" );
|
static const wxChar keyShowRealisticMode[] = wxT( "ShowRealisticMode" );
|
||||||
static const wxChar keyRenderShadows[] = wxT( "Render_Shadows" );
|
static const wxChar keyRenderShadows[] = wxT( "Render_Shadows" );
|
||||||
|
|
@ -236,6 +248,18 @@ void EDA_3D_FRAME::LoadSettings( wxConfigBase* aCfg )
|
||||||
aCfg->Read( keyBgColor_Green_Top, &GetPrm3DVisu().m_BgColor_Top.m_Green, 0.8 );
|
aCfg->Read( keyBgColor_Green_Top, &GetPrm3DVisu().m_BgColor_Top.m_Green, 0.8 );
|
||||||
aCfg->Read( keyBgColor_Blue_Top, &GetPrm3DVisu().m_BgColor_Top.m_Blue, 0.9 );
|
aCfg->Read( keyBgColor_Blue_Top, &GetPrm3DVisu().m_BgColor_Top.m_Blue, 0.9 );
|
||||||
|
|
||||||
|
aCfg->Read( keySMaskColor_Red, &GetPrm3DVisu().m_SolderMaskColor.m_Red, 100.0*(0.2/255.0) );
|
||||||
|
aCfg->Read( keySMaskColor_Green, &GetPrm3DVisu().m_SolderMaskColor.m_Green, 255.0*(0.2/255.0) );
|
||||||
|
aCfg->Read( keySMaskColor_Blue, &GetPrm3DVisu().m_SolderMaskColor.m_Blue, 180.0*(0.2/255.0) );
|
||||||
|
|
||||||
|
aCfg->Read( keySilkColor_Red, &GetPrm3DVisu().m_SilkScreenColor.m_Red, 0.9 );
|
||||||
|
aCfg->Read( keySilkColor_Green, &GetPrm3DVisu().m_SilkScreenColor.m_Green, 0.9 );
|
||||||
|
aCfg->Read( keySilkColor_Blue, &GetPrm3DVisu().m_SilkScreenColor.m_Blue, 0.9 );
|
||||||
|
|
||||||
|
aCfg->Read( keyCopperColor_Red, &GetPrm3DVisu().m_CopperColor.m_Red, 255.0*(0.7/255.0) );
|
||||||
|
aCfg->Read( keyCopperColor_Green, &GetPrm3DVisu().m_CopperColor.m_Green, 223.0*(0.7/255.0) );
|
||||||
|
aCfg->Read( keyCopperColor_Blue, &GetPrm3DVisu().m_CopperColor.m_Blue, 0.0*(0.7/255.0) );
|
||||||
|
|
||||||
bool tmp;
|
bool tmp;
|
||||||
aCfg->Read( keyShowRealisticMode, &tmp, false );
|
aCfg->Read( keyShowRealisticMode, &tmp, false );
|
||||||
prms.SetFlag( FL_USE_REALISTIC_MODE, tmp );
|
prms.SetFlag( FL_USE_REALISTIC_MODE, tmp );
|
||||||
|
|
@ -315,6 +339,18 @@ void EDA_3D_FRAME::SaveSettings( wxConfigBase* aCfg )
|
||||||
aCfg->Write( keyBgColor_Green_Top, GetPrm3DVisu().m_BgColor_Top.m_Green );
|
aCfg->Write( keyBgColor_Green_Top, GetPrm3DVisu().m_BgColor_Top.m_Green );
|
||||||
aCfg->Write( keyBgColor_Blue_Top, GetPrm3DVisu().m_BgColor_Top.m_Blue );
|
aCfg->Write( keyBgColor_Blue_Top, GetPrm3DVisu().m_BgColor_Top.m_Blue );
|
||||||
|
|
||||||
|
aCfg->Write( keySMaskColor_Red, GetPrm3DVisu().m_SolderMaskColor.m_Red );
|
||||||
|
aCfg->Write( keySMaskColor_Green, GetPrm3DVisu().m_SolderMaskColor.m_Green );
|
||||||
|
aCfg->Write( keySMaskColor_Blue, GetPrm3DVisu().m_SolderMaskColor.m_Blue );
|
||||||
|
|
||||||
|
aCfg->Write( keySilkColor_Red, GetPrm3DVisu().m_SilkScreenColor.m_Red );
|
||||||
|
aCfg->Write( keySilkColor_Green, GetPrm3DVisu().m_SilkScreenColor.m_Green );
|
||||||
|
aCfg->Write( keySilkColor_Blue, GetPrm3DVisu().m_SilkScreenColor.m_Blue );
|
||||||
|
|
||||||
|
aCfg->Write( keyCopperColor_Red, GetPrm3DVisu().m_CopperColor.m_Red );
|
||||||
|
aCfg->Write( keyCopperColor_Green, GetPrm3DVisu().m_CopperColor.m_Green );
|
||||||
|
aCfg->Write( keyCopperColor_Blue, GetPrm3DVisu().m_CopperColor.m_Blue );
|
||||||
|
|
||||||
aCfg->Write( keyShowRealisticMode, prms.GetFlag( FL_USE_REALISTIC_MODE ) );
|
aCfg->Write( keyShowRealisticMode, prms.GetFlag( FL_USE_REALISTIC_MODE ) );
|
||||||
|
|
||||||
aCfg->Write( keyRenderShadows, prms.GetFlag( FL_RENDER_SHADOWS ) );
|
aCfg->Write( keyRenderShadows, prms.GetFlag( FL_RENDER_SHADOWS ) );
|
||||||
|
|
@ -478,6 +514,18 @@ void EDA_3D_FRAME::Process_Special_Functions( wxCommandEvent& event )
|
||||||
Get3DColorFromUser( GetPrm3DVisu().m_BgColor_Top );
|
Get3DColorFromUser( GetPrm3DVisu().m_BgColor_Top );
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
case ID_MENU3D_SILKSCREEN_COLOR_SELECTION:
|
||||||
|
Set3DSilkScreenColorFromUser();
|
||||||
|
return;
|
||||||
|
|
||||||
|
case ID_MENU3D_SOLDERMASK_COLOR_SELECTION:
|
||||||
|
Set3DSoldermaskColorFromUser();
|
||||||
|
return;
|
||||||
|
|
||||||
|
case ID_MENU3D_COPPER_COLOR_SELECTION:
|
||||||
|
Set3DCopperColorFromUser();
|
||||||
|
break;;
|
||||||
|
|
||||||
case ID_MENU3D_REALISTIC_MODE:
|
case ID_MENU3D_REALISTIC_MODE:
|
||||||
GetPrm3DVisu().SetFlag( FL_USE_REALISTIC_MODE, isChecked );
|
GetPrm3DVisu().SetFlag( FL_USE_REALISTIC_MODE, isChecked );
|
||||||
NewDisplay();
|
NewDisplay();
|
||||||
|
|
@ -683,6 +731,107 @@ bool EDA_3D_FRAME::Get3DColorFromUser( S3D_COLOR &color )
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* called to set the silkscreen color. Sets up a number of default colors
|
||||||
|
*/
|
||||||
|
bool EDA_3D_FRAME::Set3DSilkScreenColorFromUser()
|
||||||
|
{
|
||||||
|
S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_SilkScreenColor;
|
||||||
|
wxColour oldcolor;
|
||||||
|
oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ),
|
||||||
|
KiROUND( curr_3Dcolor.m_Green * 255 ),
|
||||||
|
KiROUND( curr_3Dcolor.m_Blue * 255 ) );
|
||||||
|
|
||||||
|
wxColourData colorData;
|
||||||
|
|
||||||
|
colorData.SetCustomColour(0, wxColour(241, 241, 241)); // White
|
||||||
|
colorData.SetCustomColour(1, wxColour(180, 180, 180 )); // Gray
|
||||||
|
|
||||||
|
wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData);
|
||||||
|
|
||||||
|
if( !newcolor.IsOk() ) // Cancel command
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if( newcolor != oldcolor )
|
||||||
|
{
|
||||||
|
curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0;
|
||||||
|
curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0;
|
||||||
|
curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0;
|
||||||
|
NewDisplay(GL_ID_TECH_LAYERS);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* called to set the soldermask color. Sets up a number of default colors
|
||||||
|
*/
|
||||||
|
bool EDA_3D_FRAME::Set3DSoldermaskColorFromUser()
|
||||||
|
{
|
||||||
|
S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_SolderMaskColor;
|
||||||
|
wxColour oldcolor;
|
||||||
|
oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ),
|
||||||
|
KiROUND( curr_3Dcolor.m_Green * 255 ),
|
||||||
|
KiROUND( curr_3Dcolor.m_Blue * 255 ) );
|
||||||
|
|
||||||
|
wxColourData colorData;
|
||||||
|
|
||||||
|
colorData.SetCustomColour(0, wxColour(20, 51, 36 )); // Green
|
||||||
|
colorData.SetCustomColour(1, wxColour(43, 10, 65 )); // Purple
|
||||||
|
colorData.SetCustomColour(2, wxColour(117, 19, 21 )); // Red
|
||||||
|
colorData.SetCustomColour(3, wxColour(54, 79, 116)); // Light blue
|
||||||
|
colorData.SetCustomColour(4, wxColour(11, 11, 11 )); // Black
|
||||||
|
colorData.SetCustomColour(5, wxColour(241, 241,241)); // White
|
||||||
|
|
||||||
|
wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData);
|
||||||
|
|
||||||
|
if( !newcolor.IsOk() ) // Cancel command
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if( newcolor != oldcolor )
|
||||||
|
{
|
||||||
|
curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0;
|
||||||
|
curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0;
|
||||||
|
curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0;
|
||||||
|
NewDisplay(GL_ID_TECH_LAYERS);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* called to set the copper surface color. Sets up a number of default colors
|
||||||
|
*/
|
||||||
|
bool EDA_3D_FRAME::Set3DCopperColorFromUser()
|
||||||
|
{
|
||||||
|
S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_CopperColor;
|
||||||
|
wxColour oldcolor;
|
||||||
|
oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ),
|
||||||
|
KiROUND( curr_3Dcolor.m_Green * 255 ),
|
||||||
|
KiROUND( curr_3Dcolor.m_Blue * 255 ) );
|
||||||
|
|
||||||
|
wxColourData colorData;
|
||||||
|
|
||||||
|
colorData.SetCustomColour(0, wxColour(255, 223, 0 )); // Copper
|
||||||
|
colorData.SetCustomColour(1, wxColour(233, 221, 82 )); // Gold
|
||||||
|
colorData.SetCustomColour(2, wxColour(213, 213, 213)); // Silver
|
||||||
|
|
||||||
|
wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData);
|
||||||
|
|
||||||
|
if( !newcolor.IsOk() ) // Cancel command
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if( newcolor != oldcolor )
|
||||||
|
{
|
||||||
|
curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0;
|
||||||
|
curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0;
|
||||||
|
curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0;
|
||||||
|
NewDisplay(GL_ID_TECH_LAYERS);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
BOARD* EDA_3D_FRAME::GetBoard()
|
BOARD* EDA_3D_FRAME::GetBoard()
|
||||||
{
|
{
|
||||||
return Parent()->GetBoard();
|
return Parent()->GetBoard();
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,15 @@ void EDA_3D_FRAME::CreateMenuBar()
|
||||||
AddMenuItem( backgrounColorMenu, ID_MENU3D_BGCOLOR_SELECTION,
|
AddMenuItem( backgrounColorMenu, ID_MENU3D_BGCOLOR_SELECTION,
|
||||||
_( "Background Bottom Color" ), KiBitmap( palette_xpm ) );
|
_( "Background Bottom Color" ), KiBitmap( palette_xpm ) );
|
||||||
|
|
||||||
|
AddMenuItem( backgrounColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION,
|
||||||
|
_( "Silkscreen Color" ), KiBitmap( palette_xpm ) );
|
||||||
|
|
||||||
|
AddMenuItem( backgrounColorMenu, ID_MENU3D_SOLDERMASK_COLOR_SELECTION,
|
||||||
|
_( "Solder Mask Color" ), KiBitmap( palette_xpm ) );
|
||||||
|
|
||||||
|
AddMenuItem( backgrounColorMenu, ID_MENU3D_COPPER_COLOR_SELECTION,
|
||||||
|
_( "Copper/Surface Finish Color" ), KiBitmap( palette_xpm ) );
|
||||||
|
|
||||||
AddMenuItem( prefsMenu, ID_MENU3D_AXIS_ONOFF,
|
AddMenuItem( prefsMenu, ID_MENU3D_AXIS_ONOFF,
|
||||||
_( "Show 3D &Axis" ), KiBitmap( axis3d_front_xpm ), wxITEM_CHECK );
|
_( "Show 3D &Axis" ), KiBitmap( axis3d_front_xpm ), wxITEM_CHECK );
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -145,11 +145,38 @@ private:
|
||||||
double BestZoom();
|
double BestZoom();
|
||||||
void RedrawActiveWindow( wxDC* DC, bool EraseBg );
|
void RedrawActiveWindow( wxDC* DC, bool EraseBg );
|
||||||
|
|
||||||
// Get a S3D_COLOR from a wx colour dialog
|
/**
|
||||||
// return true if a new color is chosen, false if
|
* Function Get3DColorFromUser
|
||||||
// no change or aborted by user
|
* Get a S3D_COLOR from a wx colour dialog
|
||||||
|
* @return true if a new color is chosen, false if
|
||||||
|
* no change or aborted by user
|
||||||
|
*/
|
||||||
bool Get3DColorFromUser( S3D_COLOR &color );
|
bool Get3DColorFromUser( S3D_COLOR &color );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function Set3DSoldermaskColorFromUser
|
||||||
|
* Set the solder mask color from a set of colors
|
||||||
|
* @return true if a new color is chosen, false if
|
||||||
|
* no change or aborted by user
|
||||||
|
*/
|
||||||
|
bool Set3DSoldermaskColorFromUser();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function Set3DCopperColorFromUser
|
||||||
|
* Set the copper color from a set of colors
|
||||||
|
* @return true if a new color is chosen, false if
|
||||||
|
* no change or aborted by user
|
||||||
|
*/
|
||||||
|
bool Set3DCopperColorFromUser();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function Set3DSilkScreenColorFromUser
|
||||||
|
* Set the silkscreen color from a set of colors
|
||||||
|
* @return true if a new color is chosen, false if
|
||||||
|
* no change or aborted by user
|
||||||
|
*/
|
||||||
|
bool Set3DSilkScreenColorFromUser();
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,9 @@ enum id_3dview_frm
|
||||||
ID_MENU3D_COLOR,
|
ID_MENU3D_COLOR,
|
||||||
ID_MENU3D_BGCOLOR_SELECTION,
|
ID_MENU3D_BGCOLOR_SELECTION,
|
||||||
ID_MENU3D_BGCOLOR_TOP_SELECTION,
|
ID_MENU3D_BGCOLOR_TOP_SELECTION,
|
||||||
|
ID_MENU3D_SILKSCREEN_COLOR_SELECTION,
|
||||||
|
ID_MENU3D_SOLDERMASK_COLOR_SELECTION,
|
||||||
|
ID_MENU3D_COPPER_COLOR_SELECTION,
|
||||||
ID_MENU3D_USE_COPPER_THICKNESS,
|
ID_MENU3D_USE_COPPER_THICKNESS,
|
||||||
ID_MENU3D_AXIS_ONOFF,
|
ID_MENU3D_AXIS_ONOFF,
|
||||||
ID_MENU3D_MODULE_ONOFF,
|
ID_MENU3D_MODULE_ONOFF,
|
||||||
|
|
|
||||||
|
|
@ -68,26 +68,6 @@ INFO3D_VISU::INFO3D_VISU()
|
||||||
m_BiuTo3Dunits = 1.0;
|
m_BiuTo3Dunits = 1.0;
|
||||||
zpos_offset = 0.0;
|
zpos_offset = 0.0;
|
||||||
|
|
||||||
// Set copper color, in realistic mode
|
|
||||||
#define LUMINANCE 0.7/255.0
|
|
||||||
m_CopperColor.m_Red = 255.0*LUMINANCE;
|
|
||||||
m_CopperColor.m_Green = 223.0*LUMINANCE;
|
|
||||||
m_CopperColor.m_Blue = 0.0*LUMINANCE;
|
|
||||||
|
|
||||||
// Set the solder mask color, in realistic mode
|
|
||||||
#undef LUMINANCE
|
|
||||||
#define LUMINANCE 0.2/255.0
|
|
||||||
m_SolderMaskColor.m_Red = 100.0*LUMINANCE;
|
|
||||||
m_SolderMaskColor.m_Green = 255.0*LUMINANCE;
|
|
||||||
m_SolderMaskColor.m_Blue = 180.0*LUMINANCE;
|
|
||||||
|
|
||||||
// Set the silk screen mask color, in realistic mode
|
|
||||||
#undef LUMINANCE
|
|
||||||
#define LUMINANCE 0.9
|
|
||||||
m_SilkScreenColor.m_Red = 1.0*LUMINANCE;
|
|
||||||
m_SilkScreenColor.m_Green = 1.0*LUMINANCE;
|
|
||||||
m_SilkScreenColor.m_Blue = 1.0*LUMINANCE;
|
|
||||||
|
|
||||||
// Set the body board (FR4) color, in realistic mode
|
// Set the body board (FR4) color, in realistic mode
|
||||||
#undef LUMINANCE
|
#undef LUMINANCE
|
||||||
#define LUMINANCE 0.2/255.0
|
#define LUMINANCE 0.2/255.0
|
||||||
|
|
|
||||||
|
|
@ -400,8 +400,6 @@ set( BMAPS_MID
|
||||||
new_project
|
new_project
|
||||||
new_project_with_template
|
new_project_with_template
|
||||||
new_sch
|
new_sch
|
||||||
new_txt
|
|
||||||
new
|
|
||||||
noconn
|
noconn
|
||||||
normal
|
normal
|
||||||
online_help
|
online_help
|
||||||
|
|
@ -508,6 +506,10 @@ set( BMAPS_MID
|
||||||
select_w_layer
|
select_w_layer
|
||||||
shape_3d
|
shape_3d
|
||||||
sheetset
|
sheetset
|
||||||
|
setcolor_3d_bg
|
||||||
|
setcolor_silkscreen
|
||||||
|
setcolor_soldermask
|
||||||
|
setcolor_copper
|
||||||
show_dcodenumber
|
show_dcodenumber
|
||||||
show_footprint
|
show_footprint
|
||||||
show_mod_edge
|
show_mod_edge
|
||||||
|
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
|
|
||||||
/* Do not modify this file, it was automatically generated by the
|
|
||||||
* PNG2cpp CMake script, using a *.png file as input.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <bitmaps.h>
|
|
||||||
|
|
||||||
static const unsigned char png[] = {
|
|
||||||
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
|
|
||||||
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
|
|
||||||
0xce, 0x00, 0x00, 0x02, 0xbc, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0xb1, 0x6e, 0x1b,
|
|
||||||
0x47, 0x10, 0x86, 0xbf, 0x99, 0x3b, 0x16, 0x76, 0xc3, 0xe8, 0x00, 0x35, 0x24, 0x61, 0x50, 0x4f,
|
|
||||||
0xe2, 0x56, 0x2f, 0xa1, 0x57, 0x48, 0xa0, 0x52, 0x11, 0x54, 0x07, 0x10, 0x90, 0x56, 0xb0, 0xe1,
|
|
||||||
0xca, 0xae, 0xf8, 0x00, 0x2e, 0xd9, 0xa4, 0x15, 0x60, 0x40, 0x10, 0xd2, 0xa4, 0x10, 0xa1, 0x44,
|
|
||||||
0xe1, 0x11, 0x48, 0x63, 0x8b, 0x80, 0x62, 0x92, 0xb7, 0xb7, 0xeb, 0xc2, 0xdc, 0xe3, 0xde, 0xf2,
|
|
||||||
0x8e, 0xb4, 0x81, 0x64, 0x81, 0xc5, 0xce, 0x2d, 0xee, 0xf6, 0x9f, 0x6f, 0x66, 0x67, 0x70, 0x02,
|
|
||||||
0x0c, 0x81, 0x01, 0x90, 0xf2, 0xff, 0x0c, 0x03, 0xfc, 0x9d, 0x02, 0x2f, 0x3e, 0x7e, 0xfc, 0xf4,
|
|
||||||
0x9b, 0x31, 0x06, 0x51, 0x41, 0x64, 0x3d, 0x01, 0xc2, 0x55, 0x04, 0xe0, 0xeb, 0xf3, 0x7a, 0xaf,
|
|
||||||
0x7a, 0x16, 0x69, 0x55, 0x49, 0x92, 0x84, 0xe7, 0xcf, 0x9e, 0xbd, 0x4c, 0x01, 0x2d, 0x8a, 0x15,
|
|
||||||
0x77, 0x77, 0x13, 0x86, 0x47, 0x47, 0xa8, 0x2a, 0xaa, 0xeb, 0x43, 0x62, 0x51, 0xd9, 0xec, 0xe3,
|
|
||||||
0x1c, 0x02, 0xb8, 0xc0, 0xa6, 0x41, 0xd4, 0x59, 0x0b, 0xa0, 0x29, 0x80, 0x26, 0x09, 0xfd, 0x7e,
|
|
||||||
0x8f, 0x24, 0xd1, 0xcd, 0xe1, 0x91, 0xc0, 0x16, 0x61, 0xb8, 0xc6, 0x84, 0xc1, 0xf0, 0xce, 0xa9,
|
|
||||||
0xdf, 0xc8, 0xf3, 0xbc, 0x4e, 0x21, 0x82, 0xa8, 0xa2, 0xb1, 0xdd, 0xb4, 0xae, 0xed, 0xf0, 0xdd,
|
|
||||||
0x6a, 0xae, 0x85, 0x52, 0x1f, 0xc7, 0xfe, 0x60, 0x40, 0x92, 0x24, 0x88, 0xf7, 0xe2, 0x7b, 0xc8,
|
|
||||||
0x62, 0x3b, 0x18, 0xaa, 0x1a, 0x10, 0x39, 0x47, 0x3e, 0x9d, 0x7e, 0x7d, 0x7f, 0xed, 0x85, 0x36,
|
|
||||||
0x90, 0x35, 0x12, 0x89, 0x54, 0x44, 0xb2, 0x8f, 0x48, 0x54, 0xe9, 0xf7, 0xfb, 0xa8, 0x6a, 0x8d,
|
|
||||||
0xc2, 0xdb, 0x44, 0x7b, 0xec, 0x58, 0xd9, 0x9b, 0xa3, 0xd9, 0xac, 0x9e, 0xa3, 0x40, 0x54, 0x23,
|
|
||||||
0x42, 0xef, 0x50, 0xe8, 0xd8, 0x56, 0x7e, 0x83, 0x59, 0x11, 0xa9, 0x2a, 0xfd, 0x5e, 0xaf, 0x4e,
|
|
||||||
0x14, 0x51, 0xc5, 0x07, 0xee, 0xa2, 0x68, 0x1a, 0x7b, 0x6f, 0x5d, 0x9b, 0x97, 0xfb, 0x28, 0x9a,
|
|
||||||
0x89, 0x44, 0xb6, 0x73, 0xd4, 0x42, 0x16, 0xc7, 0xbe, 0xed, 0xb9, 0x91, 0xc8, 0x39, 0xc7, 0x74,
|
|
||||||
0x3a, 0xad, 0x2a, 0x3c, 0x14, 0xd1, 0x16, 0x82, 0x98, 0x26, 0x14, 0x6c, 0x25, 0x12, 0x55, 0x06,
|
|
||||||
0x83, 0xc1, 0x86, 0x68, 0x5d, 0xe1, 0x12, 0x79, 0xdb, 0x46, 0xf4, 0x2d, 0xb9, 0xaa, 0x72, 0x34,
|
|
||||||
0xf5, 0x75, 0xb4, 0x23, 0x17, 0x6d, 0x44, 0x6d, 0x74, 0xe1, 0x77, 0xb5, 0x1c, 0x35, 0x25, 0x7f,
|
|
||||||
0x5f, 0xcd, 0x78, 0xdb, 0x5a, 0x8b, 0x73, 0x0e, 0xe7, 0x1c, 0x3e, 0x1d, 0x5b, 0xa1, 0x73, 0xeb,
|
|
||||||
0x5b, 0xd7, 0xed, 0x76, 0x6b, 0x5d, 0xba, 0xc9, 0xb3, 0x78, 0xb5, 0xd6, 0x6e, 0x4d, 0x2f, 0x06,
|
|
||||||
0x90, 0xa6, 0x69, 0x9d, 0xa8, 0x17, 0xdc, 0xba, 0x7d, 0xb5, 0xe2, 0xf7, 0xca, 0xb2, 0xc4, 0x5a,
|
|
||||||
0x4b, 0x59, 0x96, 0x18, 0x63, 0xb6, 0xc4, 0x54, 0x95, 0xc5, 0x62, 0x61, 0x00, 0x57, 0x11, 0xcd,
|
|
||||||
0xf2, 0x9c, 0x1f, 0xba, 0xdd, 0xc6, 0xb0, 0x34, 0x89, 0xfa, 0x03, 0x8b, 0xa2, 0xc0, 0x18, 0xc3,
|
|
||||||
0x6a, 0xb5, 0x62, 0xb1, 0x58, 0xb0, 0x5c, 0x2e, 0x29, 0x8a, 0x82, 0x4e, 0xa7, 0x83, 0xb5, 0xd6,
|
|
||||||
0x5e, 0x5d, 0x5d, 0xbd, 0x03, 0xe6, 0x1b, 0xa2, 0xa8, 0x33, 0xec, 0x0a, 0x9d, 0x17, 0x31, 0xc6,
|
|
||||||
0x60, 0x8c, 0xe1, 0xe9, 0xe9, 0x89, 0x9b, 0x9b, 0x1b, 0x44, 0x84, 0x2c, 0xcb, 0xc8, 0xb2, 0x8c,
|
|
||||||
0xf9, 0x7c, 0xee, 0x2e, 0x2f, 0x2f, 0x5f, 0x8d, 0x46, 0xa3, 0xb7, 0xc0, 0x1f, 0x55, 0x1d, 0xe5,
|
|
||||||
0x79, 0x5e, 0x8b, 0xed, 0xae, 0xab, 0xeb, 0x9c, 0xa3, 0x2c, 0xcb, 0x2a, 0x64, 0x45, 0x51, 0x20,
|
|
||||||
0x22, 0x1c, 0x1f, 0x1f, 0x33, 0x1c, 0x0e, 0x79, 0x7c, 0x7c, 0x74, 0x17, 0x17, 0x17, 0xbf, 0x8e,
|
|
||||||
0x46, 0xa3, 0xd7, 0xc0, 0x2d, 0xf0, 0x39, 0xf5, 0x87, 0xf5, 0x7a, 0xbd, 0xbd, 0xf5, 0x20, 0x22,
|
|
||||||
0xd5, 0xcd, 0xf2, 0xb9, 0x29, 0xcb, 0x92, 0xe5, 0x6a, 0xc5, 0xc1, 0xc1, 0x01, 0xb3, 0xd9, 0x8c,
|
|
||||||
0x87, 0x87, 0x07, 0x7b, 0x7e, 0x7e, 0xfe, 0xcb, 0x78, 0x3c, 0x7e, 0x07, 0xfc, 0xe9, 0x9c, 0x5b,
|
|
||||||
0xd6, 0x3a, 0x43, 0x4c, 0xb4, 0x4b, 0xd4, 0x8b, 0x79, 0xb2, 0xe5, 0x62, 0xc1, 0xe1, 0xe1, 0x21,
|
|
||||||
0x93, 0xc9, 0xc4, 0x9c, 0x9e, 0x9e, 0xfe, 0x3c, 0x1e, 0x8f, 0xdf, 0x00, 0x13, 0x2f, 0xb2, 0xe9,
|
|
||||||
0x0c, 0xdf, 0x48, 0xe4, 0x45, 0x42, 0xb1, 0xb2, 0x2c, 0x49, 0x92, 0x84, 0xfb, 0xfb, 0xfb, 0xf9,
|
|
||||||
0xd9, 0xd9, 0xd9, 0x8f, 0xd7, 0xd7, 0xd7, 0xef, 0x81, 0x4f, 0xce, 0xb9, 0x32, 0xfc, 0x2e, 0x05,
|
|
||||||
0xac, 0x26, 0x09, 0x59, 0x96, 0xed, 0xec, 0x02, 0x71, 0x2f, 0x4b, 0xd3, 0x14, 0xe7, 0x1c, 0x69,
|
|
||||||
0xa7, 0x63, 0x6e, 0x6f, 0x6f, 0x3f, 0x9c, 0x9c, 0x9c, 0xfc, 0x54, 0x14, 0xc5, 0xef, 0xc0, 0xbf,
|
|
||||||
0xae, 0x21, 0xd9, 0xf2, 0x1f, 0xfc, 0x40, 0x16, 0xc0, 0x5f, 0xc0, 0x3f, 0x61, 0xa8, 0xe2, 0xf1,
|
|
||||||
0x05, 0x95, 0x9b, 0x4e, 0x78, 0x5f, 0x66, 0xb8, 0x85, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
|
|
||||||
0x44, 0xae, 0x42, 0x60, 0x82,
|
|
||||||
};
|
|
||||||
|
|
||||||
const BITMAP_OPAQUE new_xpm[1] = {{ png, sizeof( png ), "new_xpm" }};
|
|
||||||
|
|
||||||
//EOF
|
|
||||||
|
|
@ -1,89 +0,0 @@
|
||||||
|
|
||||||
/* Do not modify this file, it was automatically generated by the
|
|
||||||
* PNG2cpp CMake script, using a *.png file as input.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <bitmaps.h>
|
|
||||||
|
|
||||||
static const unsigned char png[] = {
|
|
||||||
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
|
|
||||||
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
|
|
||||||
0xce, 0x00, 0x00, 0x04, 0x79, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x5d, 0x4c, 0x5b,
|
|
||||||
0x65, 0x18, 0xc7, 0x6b, 0x94, 0x68, 0xe6, 0xa5, 0xd7, 0x46, 0xaf, 0xbc, 0xd4, 0xa9, 0xb1, 0x33,
|
|
||||||
0x8c, 0x6c, 0x35, 0x63, 0x31, 0x8e, 0x18, 0x97, 0x45, 0x91, 0x44, 0x84, 0xc4, 0x0b, 0x63, 0x8c,
|
|
||||||
0x17, 0x78, 0xb1, 0x2c, 0x71, 0x43, 0x67, 0x30, 0x06, 0x87, 0x3a, 0x22, 0x22, 0x31, 0xdd, 0xc0,
|
|
||||||
0x8f, 0xa9, 0x2c, 0x02, 0x41, 0x5d, 0x8a, 0xce, 0x91, 0x99, 0x8c, 0x04, 0x2a, 0x1f, 0x66, 0x23,
|
|
||||||
0x50, 0xd6, 0x16, 0x3b, 0x5a, 0xe8, 0x77, 0x7b, 0x5a, 0xfa, 0xfd, 0x41, 0xff, 0x3e, 0xcf, 0xdb,
|
|
||||||
0xf3, 0x1e, 0x4e, 0xbb, 0xd6, 0x5d, 0x18, 0x4f, 0xf2, 0x4f, 0xe9, 0xe1, 0xf0, 0xfc, 0xde, 0xff,
|
|
||||||
0xff, 0x79, 0xde, 0xf7, 0x60, 0x30, 0x18, 0x0c, 0x0f, 0x93, 0x9a, 0x48, 0xa6, 0xff, 0x49, 0x4d,
|
|
||||||
0x2a, 0xc3, 0x70, 0x40, 0x51, 0x62, 0x08, 0x85, 0xc2, 0x08, 0x47, 0x22, 0x88, 0x44, 0xa3, 0x88,
|
|
||||||
0x2a, 0x0a, 0x14, 0x56, 0x2c, 0x86, 0x18, 0x2b, 0x1e, 0x47, 0x7c, 0x7b, 0x5b, 0x68, 0x5b, 0x2a,
|
|
||||||
0x91, 0x10, 0x4a, 0xb0, 0x92, 0xc9, 0xba, 0x4a, 0x67, 0x32, 0x60, 0x06, 0x83, 0x4c, 0xc1, 0x60,
|
|
||||||
0x10, 0xb3, 0xb3, 0x73, 0xf0, 0xf9, 0x03, 0x08, 0x04, 0x43, 0x08, 0x85, 0xc3, 0x42, 0x1a, 0x58,
|
|
||||||
0xc2, 0x09, 0xaa, 0xa8, 0x60, 0x01, 0xff, 0x97, 0x05, 0x48, 0xa5, 0x52, 0x29, 0xa8, 0xce, 0x0c,
|
|
||||||
0x26, 0x2e, 0xe8, 0x76, 0xbb, 0x11, 0x0c, 0x85, 0xea, 0x02, 0x34, 0x67, 0x6a, 0x71, 0x59, 0x34,
|
|
||||||
0xa1, 0x2a, 0x3e, 0xf5, 0x0b, 0x62, 0x17, 0x2e, 0x20, 0xe9, 0xf5, 0x22, 0x49, 0x4e, 0xa4, 0xd2,
|
|
||||||
0xe9, 0x74, 0x25, 0x68, 0x6e, 0x6e, 0x4e, 0x80, 0x2a, 0xe2, 0xab, 0x8a, 0xae, 0xa2, 0xb8, 0x5a,
|
|
||||||
0x88, 0xc1, 0xb6, 0xd7, 0x5b, 0xe1, 0x6c, 0x6f, 0x43, 0xb8, 0xbb, 0x1b, 0x4a, 0xeb, 0x8b, 0x48,
|
|
||||||
0x51, 0x42, 0x29, 0x02, 0xb0, 0x32, 0xe5, 0xe8, 0xca, 0x20, 0x2e, 0xe8, 0xd9, 0xdc, 0xd4, 0x5c,
|
|
||||||
0x68, 0xfd, 0xa9, 0x06, 0xc8, 0x95, 0x52, 0x1c, 0x1c, 0x49, 0x54, 0x89, 0xe0, 0xfb, 0x81, 0x0f,
|
|
||||||
0x71, 0x65, 0x72, 0x0c, 0x3f, 0x9c, 0xed, 0x83, 0xb5, 0xa7, 0x07, 0xee, 0xb6, 0x63, 0x48, 0xaf,
|
|
||||||
0xad, 0x09, 0x00, 0x2b, 0x97, 0xcb, 0xe9, 0x40, 0x54, 0xd8, 0x6a, 0xb5, 0x0a, 0x90, 0x74, 0xa1,
|
|
||||||
0x45, 0xa4, 0x03, 0x70, 0x71, 0x5e, 0x25, 0xc7, 0x91, 0x8c, 0x47, 0xa8, 0xf8, 0x71, 0x8c, 0x5f,
|
|
||||||
0x1c, 0xc1, 0xf2, 0x8d, 0xeb, 0x18, 0x18, 0x18, 0xc0, 0xf0, 0xc9, 0x13, 0xd8, 0x3c, 0x62, 0x44,
|
|
||||||
0x96, 0x00, 0x59, 0x02, 0xb0, 0xf2, 0xf9, 0xfc, 0x2e, 0x88, 0x57, 0xbe, 0x49, 0x8e, 0xaa, 0x5d,
|
|
||||||
0x70, 0x44, 0x9a, 0x03, 0x15, 0xc0, 0xab, 0x4c, 0x06, 0x36, 0xe0, 0xfa, 0xf8, 0x19, 0x64, 0x2c,
|
|
||||||
0x1d, 0x50, 0x26, 0x9e, 0xc7, 0xc8, 0xa7, 0xc7, 0x31, 0x34, 0xd8, 0x8f, 0xf1, 0xd3, 0x6f, 0x23,
|
|
||||||
0x97, 0x49, 0x89, 0xe2, 0x52, 0x85, 0x42, 0xa1, 0x12, 0xf4, 0xe7, 0xfc, 0xbc, 0x00, 0xd5, 0x72,
|
|
||||||
0x21, 0x01, 0xac, 0xf8, 0xad, 0xeb, 0x70, 0x9d, 0x69, 0x42, 0xee, 0xd7, 0x0e, 0xe4, 0xc7, 0x4d,
|
|
||||||
0x88, 0x9c, 0x3b, 0x88, 0x2b, 0x67, 0x5e, 0xc1, 0xf8, 0xe7, 0xdd, 0xa2, 0x68, 0xb5, 0x8a, 0xc5,
|
|
||||||
0xe2, 0x2e, 0x88, 0x0b, 0x6f, 0x6d, 0x6d, 0x55, 0x42, 0xd4, 0x3e, 0x48, 0x48, 0x36, 0x9b, 0x85,
|
|
||||||
0x72, 0xe3, 0x32, 0xdc, 0x67, 0x4d, 0x28, 0xfc, 0xde, 0x81, 0xec, 0x68, 0x23, 0xc2, 0xe7, 0x0f,
|
|
||||||
0xc1, 0xd1, 0x63, 0x84, 0xe7, 0xa7, 0x8f, 0x6a, 0x42, 0x6a, 0x82, 0xe6, 0xc9, 0x11, 0x83, 0x12,
|
|
||||||
0xfa, 0xa8, 0x54, 0x17, 0x0c, 0x09, 0xfe, 0x61, 0x86, 0x6f, 0xe8, 0x59, 0x14, 0x2f, 0xb7, 0x23,
|
|
||||||
0xfd, 0xdd, 0x3e, 0x04, 0xcd, 0x87, 0x71, 0xf3, 0xdd, 0x27, 0x10, 0xb1, 0x8e, 0x89, 0x62, 0xf5,
|
|
||||||
0xb4, 0xb3, 0xb3, 0xb3, 0x0b, 0xe2, 0x88, 0xbc, 0x34, 0xff, 0xb7, 0x41, 0x08, 0xc0, 0x0d, 0xf5,
|
|
||||||
0x8e, 0xbd, 0x83, 0xe0, 0x57, 0x47, 0x51, 0xfc, 0xed, 0x25, 0x24, 0xbf, 0x7e, 0x0a, 0xfe, 0x2f,
|
|
||||||
0x09, 0x72, 0xea, 0x31, 0x24, 0x9c, 0xd6, 0x8a, 0x82, 0xf5, 0xa4, 0x81, 0x12, 0xaa, 0xa3, 0x84,
|
|
||||||
0xba, 0x93, 0x25, 0x24, 0x93, 0x49, 0xc3, 0x6d, 0xee, 0x44, 0xec, 0xe2, 0xcb, 0x28, 0x5a, 0x5e,
|
|
||||||
0x40, 0x7c, 0xc4, 0x08, 0xef, 0xe0, 0x21, 0xd8, 0x4e, 0xed, 0x45, 0x3a, 0xe0, 0xaa, 0x59, 0xb4,
|
|
||||||
0x54, 0x2a, 0xdd, 0xa6, 0x5d, 0x47, 0x54, 0xdc, 0xe7, 0xf3, 0x55, 0xf4, 0x24, 0xbd, 0x1d, 0x85,
|
|
||||||
0xab, 0xbf, 0x05, 0xa9, 0xc9, 0x76, 0x14, 0x2f, 0x3d, 0x87, 0xd8, 0x39, 0xea, 0x45, 0xbf, 0x09,
|
|
||||||
0x37, 0xdf, 0x6f, 0x44, 0x6e, 0x3b, 0x72, 0xc7, 0xe2, 0x75, 0x41, 0x0b, 0x0b, 0x0b, 0x02, 0xc4,
|
|
||||||
0x90, 0x54, 0xc8, 0x83, 0xbf, 0xfb, 0xca, 0xe3, 0x5b, 0xfc, 0xf9, 0x30, 0xa2, 0xe6, 0xa7, 0x71,
|
|
||||||
0xeb, 0x13, 0x13, 0x1c, 0x7d, 0x47, 0x50, 0xc8, 0x65, 0xc4, 0xd8, 0x72, 0x5c, 0xfa, 0x62, 0xfa,
|
|
||||||
0xab, 0xfa, 0xbe, 0x06, 0x62, 0x17, 0xec, 0x28, 0xad, 0x36, 0xde, 0x3b, 0xf1, 0x26, 0x0a, 0xce,
|
|
||||||
0x49, 0xe4, 0x2f, 0x1d, 0x45, 0xc4, 0xbc, 0x1f, 0xeb, 0xbd, 0x4d, 0xb0, 0x7f, 0xd1, 0x29, 0xf6,
|
|
||||||
0x1a, 0xf7, 0x92, 0x37, 0x33, 0x4f, 0x94, 0x1e, 0xc0, 0xce, 0x18, 0x2e, 0xa7, 0x4d, 0xee, 0xa1,
|
|
||||||
0x8a, 0xa9, 0xe3, 0xe6, 0x2f, 0x2e, 0x2e, 0x96, 0x63, 0x8b, 0x07, 0x10, 0xbe, 0xda, 0x83, 0x5c,
|
|
||||||
0x78, 0x0d, 0xb1, 0x6b, 0xbd, 0x58, 0x7b, 0xef, 0x49, 0xcc, 0x7e, 0xf6, 0x86, 0x38, 0x39, 0x96,
|
|
||||||
0x97, 0x97, 0xe1, 0x72, 0xb9, 0xc0, 0xa7, 0x3d, 0x3f, 0xcb, 0xc7, 0x8b, 0x54, 0x56, 0xf4, 0x34,
|
|
||||||
0x23, 0x52, 0xd1, 0x1f, 0xaa, 0x7c, 0x5f, 0x03, 0xf1, 0x03, 0x3e, 0xbf, 0x5f, 0xdc, 0x3c, 0xf9,
|
|
||||||
0x56, 0x2b, 0x26, 0x7a, 0x8f, 0xc1, 0xfd, 0xe3, 0x6b, 0x70, 0x7c, 0xf3, 0x2a, 0xae, 0x0e, 0x9f,
|
|
||||||
0xc6, 0xcc, 0xcc, 0x0c, 0x56, 0x56, 0x56, 0xb0, 0xb1, 0xb1, 0x41, 0xef, 0xad, 0x90, 0x70, 0xc4,
|
|
||||||
0x83, 0x23, 0x5f, 0x0d, 0xfc, 0x5d, 0x91, 0xef, 0x30, 0x52, 0x84, 0x0e, 0xe6, 0x30, 0xbd, 0x05,
|
|
||||||
0xf8, 0xdc, 0xa4, 0xcf, 0x02, 0x31, 0x0e, 0x96, 0xa3, 0x23, 0xd0, 0xd2, 0xd2, 0x92, 0x58, 0xd1,
|
|
||||||
0xb7, 0xc3, 0x43, 0xf8, 0x6b, 0xfe, 0x9a, 0x88, 0x92, 0xcf, 0x3c, 0x39, 0x20, 0x7a, 0xe9, 0x57,
|
|
||||||
0x2f, 0x21, 0xec, 0xd2, 0xe3, 0xf1, 0xc0, 0xe9, 0x74, 0xc2, 0x66, 0xb3, 0x89, 0x4f, 0xbb, 0xdd,
|
|
||||||
0xbe, 0xd3, 0xd5, 0xd5, 0x75, 0x9e, 0x18, 0x8f, 0x0b, 0x10, 0xff, 0xa1, 0x9f, 0x1c, 0xe5, 0xd4,
|
|
||||||
0x43, 0x50, 0xbf, 0xab, 0xe5, 0x1e, 0xd1, 0x37, 0x97, 0xbf, 0xf3, 0xef, 0x19, 0xca, 0x20, 0xee,
|
|
||||||
0x9b, 0xc5, 0x62, 0xc1, 0xd4, 0xd4, 0x94, 0x88, 0xd8, 0xe1, 0x70, 0xf0, 0xc2, 0x4b, 0x6d, 0x6d,
|
|
||||||
0x6d, 0x83, 0x54, 0xdf, 0x48, 0xda, 0xa3, 0x45, 0xc7, 0x8e, 0x18, 0x58, 0x0d, 0xaa, 0x1e, 0x61,
|
|
||||||
0xbe, 0xf8, 0x3e, 0x3f, 0xcb, 0xf1, 0x71, 0x4c, 0x1c, 0x29, 0x43, 0xf8, 0x0a, 0x04, 0x02, 0x3c,
|
|
||||||
0xc1, 0xa5, 0x96, 0x96, 0x96, 0x3e, 0xaa, 0xfd, 0x28, 0xe9, 0x3e, 0xd2, 0x5d, 0x77, 0x74, 0xa4,
|
|
||||||
0x07, 0xc9, 0xd1, 0x95, 0x6e, 0x38, 0x5a, 0x8e, 0xcc, 0x4e, 0x0e, 0xf8, 0xc5, 0xc9, 0xce, 0xc8,
|
|
||||||
0xd1, 0x4e, 0x73, 0x73, 0xf3, 0x07, 0x54, 0xf7, 0x11, 0xd2, 0xbd, 0x3c, 0xdd, 0xe5, 0x09, 0xaf,
|
|
||||||
0xe3, 0xa8, 0xfa, 0x68, 0xd1, 0x83, 0xf8, 0x19, 0xee, 0x0f, 0xf7, 0x86, 0x7b, 0xc9, 0xd3, 0xb8,
|
|
||||||
0xbe, 0xbe, 0xce, 0x43, 0x53, 0x68, 0x6c, 0x6c, 0x3c, 0x41, 0x35, 0x1f, 0x22, 0xdd, 0x23, 0x21,
|
|
||||||
0x1a, 0xa8, 0x96, 0xa3, 0x7a, 0x20, 0xfe, 0x99, 0x9f, 0xe1, 0xd1, 0xe5, 0xa9, 0xe2, 0xbd, 0xb5,
|
|
||||||
0xba, 0xba, 0x8a, 0xe9, 0xe9, 0xe9, 0xb8, 0xd1, 0x68, 0xec, 0xa4, 0x7a, 0x0f, 0x90, 0xee, 0xd6,
|
|
||||||
0x43, 0x24, 0xe8, 0x40, 0x5e, 0xb7, 0xc1, 0xea, 0x0d, 0x41, 0x75, 0x74, 0xb2, 0x47, 0xfe, 0x40,
|
|
||||||
0xa0, 0x30, 0x3a, 0x3a, 0x3a, 0xd7, 0xd0, 0xd0, 0xb0, 0x8f, 0x6a, 0xdd, 0xcf, 0xfd, 0xa8, 0x86,
|
|
||||||
0x48, 0xd0, 0x7f, 0xfd, 0x07, 0x72, 0x3f, 0xe9, 0x41, 0x7d, 0x3f, 0x6a, 0xe9, 0x1f, 0x89, 0xbc,
|
|
||||||
0x3d, 0xaa, 0x92, 0xe6, 0x6d, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
|
|
||||||
0x60, 0x82,
|
|
||||||
};
|
|
||||||
|
|
||||||
const BITMAP_OPAQUE new_txt_xpm[1] = {{ png, sizeof( png ), "new_txt_xpm" }};
|
|
||||||
|
|
||||||
//EOF
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 30 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 36 KiB |
|
|
@ -1,92 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
||||||
<defs>
|
|
||||||
<linearGradient id="ab" y2="122.72" gradientUnits="userSpaceOnUse" x2="69.666" gradientTransform="matrix(.35342 0 0 .32233 -45.419 2.1542)" y1="2.2454" x1="36.572">
|
|
||||||
<stop stop-color="#bbb" offset="0"/>
|
|
||||||
<stop stop-color="#888" offset="1"/>
|
|
||||||
</linearGradient>
|
|
||||||
<linearGradient id="z" y2="105.11" gradientUnits="userSpaceOnUse" x2="98.098" gradientTransform="translate(-36,-20)" y1="77.513" x1="97.623">
|
|
||||||
<stop stop-color="#fff" offset="0"/>
|
|
||||||
<stop stop-color="#fff" stop-opacity="0" offset="1"/>
|
|
||||||
</linearGradient>
|
|
||||||
<linearGradient id="y" y2="72" xlink:href="#c" gradientUnits="userSpaceOnUse" x2="14.698" gradientTransform="matrix(.99697 0 0 .99697 -63.641 -170.75)" y1="96" x1="26.698"/>
|
|
||||||
<linearGradient id="x" y2="96.001" xlink:href="#c" gradientUnits="userSpaceOnUse" x2="11.681" gradientTransform="matrix(.99697 0 0 .99697 -63.641 -170.75)" y1="52" x1="6.6976"/>
|
|
||||||
<linearGradient id="w" y2="108.01" gradientUnits="userSpaceOnUse" x2="11.681" gradientTransform="matrix(.99697 0 0 .99697 -63.631 -170.75)" y1="60.539" x1="11.681">
|
|
||||||
<stop stop-color="#cbff9c" offset="0"/>
|
|
||||||
<stop stop-color="#65c171" stop-opacity="0" offset="1"/>
|
|
||||||
</linearGradient>
|
|
||||||
<radialGradient id="r" fx="-40" fy="96" xlink:href="#d" gradientUnits="userSpaceOnUse" cy="84" cx="-44" gradientTransform="matrix(.99697 0 0 .99697 -1.1332 -170.75)" r="20"/>
|
|
||||||
<linearGradient id="b" y2="19.282" xlink:href="#c" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="80" y1="15.337" x1="73.743"/>
|
|
||||||
<radialGradient id="q" fx="-60" fy="100" gradientUnits="userSpaceOnUse" cy="84" cx="-44" gradientTransform="matrix(.99697 0 0 .99697 -1.1332 -170.75)" r="24">
|
|
||||||
<stop stop-opacity=".77903" offset="0"/>
|
|
||||||
<stop stop-opacity="0" offset="1"/>
|
|
||||||
</radialGradient>
|
|
||||||
<linearGradient id="v" y2="18.504" gradientUnits="userSpaceOnUse" x2="76.284" gradientTransform="scale(1.0394 .96211)" y1="18.504" x1="64.342">
|
|
||||||
<stop stop-color="#fff" offset="0"/>
|
|
||||||
<stop stop-color="#252525" stop-opacity="0" offset="1"/>
|
|
||||||
</linearGradient>
|
|
||||||
<linearGradient id="u" y2="19.282" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="80" y1="15.337" x1="73.743">
|
|
||||||
<stop stop-color="#fff14d" offset="0"/>
|
|
||||||
<stop stop-color="#f8ffa0" stop-opacity="0" offset="1"/>
|
|
||||||
</linearGradient>
|
|
||||||
<linearGradient id="t" y2="104.81" xlink:href="#d" gradientUnits="userSpaceOnUse" x2="-62.425" gradientTransform="matrix(.99697 0 0 .99697 -1.1332 -170.75)" y1="76.708" x1="-13.757"/>
|
|
||||||
<filter id="s" color-interpolation-filters="sRGB">
|
|
||||||
<feGaussianBlur stdDeviation="0.2025"/>
|
|
||||||
</filter>
|
|
||||||
<linearGradient id="c">
|
|
||||||
<stop stop-color="#fff" offset="0"/>
|
|
||||||
<stop stop-color="#fff" stop-opacity="0" offset="1"/>
|
|
||||||
</linearGradient>
|
|
||||||
<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="-.2148" cx="48" gradientTransform="matrix(.9792 0 0 .9725 133 20.876)" r="55.148">
|
|
||||||
<stop stop-color="#72d13d" offset="0"/>
|
|
||||||
<stop stop-color="#35ac1c" offset=".35530"/>
|
|
||||||
<stop stop-color="#0f9508" offset=".61940"/>
|
|
||||||
<stop stop-color="#008c00" offset=".75740"/>
|
|
||||||
<stop stop-color="#007a00" offset="1"/>
|
|
||||||
</radialGradient>
|
|
||||||
<filter id="a" height="1.2499" width="1.2041" color-interpolation-filters="sRGB" y="-.12496" x="-.10207">
|
|
||||||
<feGaussianBlur stdDeviation="0.44655691"/>
|
|
||||||
</filter>
|
|
||||||
<linearGradient id="aa" y2="92" gradientUnits="userSpaceOnUse" x2="-36.027" gradientTransform="matrix(.35342 0 0 .35456 -2.302 3.7658)" y1="-22.624" x1="-36.027">
|
|
||||||
<stop stop-color="#dcebff" offset="0"/>
|
|
||||||
<stop stop-color="#fff" offset="1"/>
|
|
||||||
</linearGradient>
|
|
||||||
</defs>
|
|
||||||
<rect height="4.2547" width="4.241" y="34.967" x="41.885" fill="#2c72c7"/>
|
|
||||||
<rect transform="scale(-1)" height="1.4182" width="1.4137" y="-37.804" x="-44.712" fill="#bfd9ff"/>
|
|
||||||
<rect transform="scale(-1,1)" height="28.365" width="36.756" stroke="url(#ab)" stroke-linecap="round" y="7.3114" x="-42.592" stroke-width="1.416" fill="url(#aa)"/>
|
|
||||||
<rect height="4.2547" width="4.241" y="3.7658" x="22.094" fill="#2c72c7"/>
|
|
||||||
<rect height="4.2547" width="4.241" y="34.967" x="22.094" fill="#2c72c7"/>
|
|
||||||
<rect height="4.2547" width="4.241" y="3.7658" x="2.302" fill="#2c72c7"/>
|
|
||||||
<rect height="4.2547" width="4.241" y="34.967" x="2.302" fill="#2c72c7"/>
|
|
||||||
<rect height="4.2547" width="4.241" y="3.7658" x="41.885" fill="#2c72c7"/>
|
|
||||||
<rect height="2.8365" width="2.8274" y="34.967" x="41.885" fill="#2c72c7"/>
|
|
||||||
<rect height="4.2547" width="4.241" y="19.366" x="2.302" fill="#2c72c7"/>
|
|
||||||
<rect height="4.2547" width="4.241" y="19.366" x="41.885" fill="#2c72c7"/>
|
|
||||||
<path fill-opacity=".75688" fill="#fff" d="m48.533 27.189v-0.495 0.495z"/>
|
|
||||||
<g transform="matrix(.35342 0 0 .35456 24.947 26.484)">
|
|
||||||
<g transform="translate(77,119)">
|
|
||||||
<path stroke-linejoin="round" d="m-46.932-110.93c-3.3075 0-6.0441 2.7367-6.0441 6.0441v9.9074h-9.9074c-3.3075 0-6.0441 1.2501-6.0441 4.5576 0-0.94341 0.000001 3.3809 0.000001 5.3498 0 3.3075 2.7367 6.0441 6.0441 6.0441h9.9074v9.9074c0 3.3075 2.7367 6.0441 6.0441 6.0441h3.8633c3.3075 0 6.0441-2.7367 6.0441-6.0441v-9.9074h9.9074c3.3075 0 6.0441-2.7367 6.0441-6.0441v-3.8633c0-3.3075-2.7367-6.0441-6.0441-6.0441h-9.9074v-9.9074c0-3.3075-2.7367-6.0441-6.0441-6.0441h-3.8633z" stroke-dashoffset="1.0878" stroke="#fff" stroke-linecap="round" stroke-width="8" fill="none"/>
|
|
||||||
<path fill="url(#t)" d="m-46.932-110.93c-3.3075 0-6.0441 2.7367-6.0441 6.0441v9.9074h-9.9074c-3.3075 0-6.0441 2.7367-6.0441 6.0441v3.8633c0 3.3075 2.7367 6.0441 6.0441 6.0441h9.9074v9.9074c0 3.3075 2.7367 6.0441 6.0441 6.0441h3.8633c3.3075 0 6.0441-2.7367 6.0441-6.0441v-9.9074h9.9074c3.3075 0 6.0441-2.7367 6.0441-6.0441v-3.8633c0-3.3075-2.7367-6.0441-6.0441-6.0441h-9.9074v-9.9074c0-3.3075-2.7367-6.0441-6.0441-6.0441h-3.8633z"/>
|
|
||||||
<path d="m69.876 12.058c-1.0771 0.06528-2.5282 0.21916-3 0.9375l1.59 11.137 10.534-0.759v-0.469c1.741-2.57-4.78-10.906-9.124-10.847z" fill-rule="evenodd" transform="matrix(-.49849 0 0 .49849 -13.097 -116.55)" filter="url(#a)" fill="url(#b)"/>
|
|
||||||
<path d="m69.876 12.058c-1.0771 0.06528-2.5282 0.21916-3 0.9375l1.297 8.794 10.827 1.584v-0.469c1.741-2.57-4.78-10.906-9.124-10.847z" fill-rule="evenodd" transform="matrix(.49849 0 0 .49849 -76.549 -116.55)" filter="url(#a)" fill="url(#b)"/>
|
|
||||||
<path opacity=".68165" d="m69.876 12.058c-1.0771 0.06528-2.5282 0.21916-3 0.9375l2.176 10.747 9.948-0.369v-0.469c1.741-2.57-4.78-10.906-9.124-10.847z" fill-rule="evenodd" transform="matrix(-.49849 0 0 -.49849 -13.097 -57.062)" filter="url(#a)" fill="url(#u)"/>
|
|
||||||
<path opacity=".70787" d="m69.876 12.058c-1.0771 0.06528-2.5282 0.21916-3 0.9375l0.906 10.552 11.218-0.174v-0.469c1.741-2.57-4.78-10.906-9.124-10.847z" fill-rule="evenodd" transform="matrix(.49849 0 0 -.49849 -76.549 -57.062)" filter="url(#a)" fill="url(#v)"/>
|
|
||||||
<path opacity=".55056" d="m69.876 12.058c-1.0771 0.06528-2.5282 0.21916-3 0.9375l1.59 11.137 10.534-0.759v-0.469c1.741-2.57-4.78-10.906-9.124-10.847z" fill-rule="evenodd" transform="matrix(.49849 0 0 .49849 -60.597 -100.99)" filter="url(#a)" fill="url(#b)"/>
|
|
||||||
<path opacity=".58052" fill="url(#q)" d="m-46.932-110.93c-3.3075 0-6.0441 2.7367-6.0441 6.0441v9.9074h-9.9074c-3.3075 0-6.0441 1.2501-6.0441 4.5576 0-0.94341 0.000001 3.3809 0.000001 5.3498 0 3.3075 2.7367 6.0441 6.0441 6.0441h9.9074v9.9074c0 3.3075 2.7367 6.0441 6.0441 6.0441h3.8633c3.3075 0 6.0441-2.7367 6.0441-6.0441v-9.9074h9.9074c3.3075 0 6.0441-2.7367 6.0441-6.0441v-3.8633c0-3.3075-2.7367-6.0441-6.0441-6.0441h-9.9074v-9.9074c0-3.3075-2.7367-6.0441-6.0441-6.0441h-3.8633z"/>
|
|
||||||
<path opacity=".55056" d="m69.876 12.058c-1.0771 0.06528-2.5282 0.21916-3 0.9375l1.59 11.137 10.534-0.759v-0.469c1.741-2.57-4.78-10.906-9.124-10.847z" fill-rule="evenodd" transform="matrix(-.49849 0 0 .49849 -29.403 -100.99)" filter="url(#a)" fill="url(#b)"/>
|
|
||||||
<path fill="url(#r)" d="m-46.932-106.94c-1.1305 0-2.0563 0.92572-2.0563 2.0562v13.895h-13.895c-1.1305 0-2.0563 0.92572-2.0563 2.0563v3.8633c0 1.1305 0.92572 2.0563 2.0563 2.0563h13.895v13.895c0 1.1305 0.92572 2.0563 2.0563 2.0563h3.8633c1.1305 0 2.0563-0.92572 2.0563-2.0563v-13.895h13.895c1.1305 0 2.0563-0.92572 2.0563-2.0563v-3.8633c0-1.1305-0.92572-2.0563-2.0563-2.0563h-13.895v-13.895c0-1.1305-0.92572-2.0562-2.0563-2.0562h-3.8633z"/>
|
|
||||||
<path fill="url(#w)" d="m-46.932-106.94c-1.1305 0-2.0563 0.92572-2.0563 2.0562v13.895h-13.895c-1.1305 0-2.0563 0.92572-2.0563 2.0563v3.8633c0 0.10947 0.04561 0.20659 0.06231 0.31155 3.2478 0.46815 6.6711 0.74773 10.219 0.74773 11.467 0 21.74-2.6219 28.507-6.7296-0.28836-0.15468-0.61747-0.24924-0.96581-0.24924h-13.895v-13.895c0-1.1305-0.92572-2.0562-2.0563-2.0562h-3.8633z"/>
|
|
||||||
<path fill="url(#x)" d="m-46.932-106.94c-1.1305 0-2.0563 0.92572-2.0563 2.0562v0.99698c0-1.1305 1.3245-2.6544 2.455-2.6544h3.8633c0.28263 0 0.56427 0.0513 0.81004 0.15578 0.10993 0.24876 0.48602 1.1212 0.48602 1.4082l0.3614 13.989 0.03116-13.895c0-0.57388-0.24033-1.0903-0.62311-1.4643-0.08751-0.0875-0.17849-0.17848-0.2804-0.24924-0.0077-0.005-0.02342 0.005-0.03115 0-0.10177-0.0689-0.19807-0.13686-0.31155-0.18693-0.0086-0.004-0.02246 0.004-0.03116 0-0.11425-0.0486-0.25035-0.0973-0.37386-0.12463-0.01021-0.002-0.0209 0.002-0.03116 0-0.12329-0.0254-0.24381-0.0291-0.37386-0.0311h-3.8944zm-15.952 15.952c-1.1305 0-2.0563 0.92572-2.0563 2.0563v0.99697c0-1.1305 0.92572-2.6544 2.0563-2.6544l13.895-0.39879h-13.895zm21.871 0 13.718 0.51017c-6.7387 3.6161-17.769 6.3752-28.423 6.3752-1.7739 0-3.5288-0.08968-5.2341-0.21809 2.0542 0.18635 4.1668 0.31155 6.3245 0.31155 10.737 0 20.422-2.3167 27.168-5.9818 0.0079-0.0043 0.02323 0.0043 0.03115 0 0.44122-0.2405 0.86201-0.4956 1.2774-0.74773-0.13589-0.0729-0.28443-0.14434-0.43617-0.18693-0.01-0.0026-0.02113 0.0025-0.03115 0-0.15192-0.04033-0.30445-0.0596-0.46733-0.06231h-13.926z"/>
|
|
||||||
<path fill="url(#y)" d="m-46.932-106.94c-1.1305 0-2.0563 0.92572-2.0563 2.0562v0.99698c0-1.1305 1.3245-2.6544 2.455-2.6544h3.8633c0.28263 0 0.56427 0.0513 0.81004 0.15578 0.10993 0.24876 0.48602 1.1212 0.48602 1.4082l0.3614 13.989 0.03116-13.895c0-0.57388-0.24033-1.0903-0.62311-1.4643-0.08751-0.0875-0.17849-0.17848-0.2804-0.24924-0.0077-0.005-0.02342 0.005-0.03115 0-0.10177-0.0689-0.19807-0.13686-0.31155-0.18693-0.0086-0.004-0.02246 0.004-0.03116 0-0.11425-0.0486-0.25035-0.0973-0.37386-0.12463-0.01021-0.002-0.0209 0.002-0.03116 0-0.12329-0.0254-0.24381-0.0291-0.37386-0.0311h-3.8944zm-15.952 15.952c-1.1305 0-2.0563 0.92572-2.0563 2.0563v0.99697c0-1.1305 0.92572-2.6544 2.0563-2.6544l13.895-0.39879h-13.895zm21.871 0 13.815 0.51017c-6.7387 3.6161-17.866 6.3752-28.521 6.3752-1.7739 0-3.5288-0.08968-5.2341-0.21809 2.0542 0.18635 4.1668 0.31155 6.3245 0.31155 10.737 0 20.422-2.3167 27.168-5.9818 0.0079-0.0043 0.02323 0.0043 0.03115 0 0.44122-0.2405 0.86201-0.4956 1.2774-0.74773-0.13589-0.0729-0.28443-0.14434-0.43617-0.18693-0.01-0.0026-0.02113 0.0025-0.03115 0-0.15192-0.04033-0.30445-0.0596-0.46733-0.06231h-13.926z"/>
|
|
||||||
<path stroke-linejoin="round" d="m62.062 44c-1.134 0-2.0625 0.92853-2.0625 2.0625v13.938h-13.938c-1.134 0-2.0625 0.92853-2.0625 2.0625v3.875c0 1.134 0.92853 2.0625 2.0625 2.0625h13.938v13.938c0 1.134 0.92853 2.0625 2.0625 2.0625h3.875c1.134 0.003 2.063-0.926 2.063-2.059v-13.938h13.938c1.134 0 2.0625-0.92853 2.0625-2.0625v-3.875c0-1.134-0.92853-2.0625-2.0625-2.0625h-13.938v-13.936c0-1.134-0.92853-2.0625-2.0625-2.0625h-3.875z" stroke-dashoffset="1.0878" transform="matrix(.99697 0 0 .99697 -108.81 -150.81)" filter="url(#s)" stroke="url(#z)" stroke-linecap="round" stroke-width="1.2538" fill="none"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<path d="m21.387 29.294v-1.4182h2.1205l-0.02862-12.764h-4.2124v2.1274h-1.4137v-3.5456h12.723v3.5456h-1.4137v-2.1274h-4.241v12.764h2.1205v1.4182"/>
|
|
||||||
<rect height="1.4182" width="1.4137" y="20.785" x="43.299" fill="#bfd9ff"/>
|
|
||||||
<rect height="1.4182" width="1.4137" y="5.1841" x="43.299" fill="#bfd9ff"/>
|
|
||||||
<rect height="1.4182" width="1.4137" y="5.1841" x="23.507" fill="#bfd9ff"/>
|
|
||||||
<rect height="1.4182" width="1.4137" y="5.1841" x="3.7157" fill="#bfd9ff"/>
|
|
||||||
<rect transform="scale(-1)" height="1.4182" width="1.4137" y="-22.203" x="-5.1294" fill="#bfd9ff"/>
|
|
||||||
<rect transform="scale(-1)" height="1.4182" width="1.4137" y="-37.804" x="-5.1294" fill="#bfd9ff"/>
|
|
||||||
<rect transform="scale(-1)" height="1.4182" width="1.4137" y="-37.804" x="-24.921" fill="#bfd9ff"/>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 12 KiB |
|
|
@ -212,7 +212,7 @@ void WX_HTML_REPORT_PANEL::onBtnSaveToFile( wxCommandEvent& event )
|
||||||
wxString msg;
|
wxString msg;
|
||||||
|
|
||||||
msg.Printf( _( "Cannot write report to file '%s'." ),
|
msg.Printf( _( "Cannot write report to file '%s'." ),
|
||||||
fn.GetFullPath().c_str() );
|
fn.GetFullPath().GetData() );
|
||||||
wxMessageBox( msg, _( "File save error" ), wxOK | wxICON_ERROR, this );
|
wxMessageBox( msg, _( "File save error" ), wxOK | wxICON_ERROR, this );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
|
||||||
ID_NEW_PROJECT,
|
ID_NEW_PROJECT,
|
||||||
_( "&New Schematic Project" ),
|
_( "&New Schematic Project" ),
|
||||||
_( "Clear current schematic hierarchy and start a new schematic root sheet" ),
|
_( "Clear current schematic hierarchy and start a new schematic root sheet" ),
|
||||||
KiBitmap( new_xpm ) );
|
KiBitmap( new_sch_xpm ) );
|
||||||
|
|
||||||
text = AddHotkeyName( _( "&Open Schematic Project" ), g_Schematic_Hokeys_Descr, HK_LOAD_SCH );
|
text = AddHotkeyName( _( "&Open Schematic Project" ), g_Schematic_Hokeys_Descr, HK_LOAD_SCH );
|
||||||
AddMenuItem( fileMenu,
|
AddMenuItem( fileMenu,
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
|
||||||
if( Kiface().IsSingle() ) // not when under a project mgr
|
if( Kiface().IsSingle() ) // not when under a project mgr
|
||||||
{
|
{
|
||||||
// These 2 menus have meaning only outside a project, i.e. not under a project manager:
|
// These 2 menus have meaning only outside a project, i.e. not under a project manager:
|
||||||
m_mainToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, KiBitmap( new_xpm ),
|
m_mainToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, KiBitmap( new_sch_xpm ),
|
||||||
_( "New schematic project" ) );
|
_( "New schematic project" ) );
|
||||||
|
|
||||||
m_mainToolBar->AddTool( ID_LOAD_PROJECT, wxEmptyString, KiBitmap( open_document_xpm ),
|
m_mainToolBar->AddTool( ID_LOAD_PROJECT, wxEmptyString, KiBitmap( open_document_xpm ),
|
||||||
|
|
|
||||||
|
|
@ -370,8 +370,6 @@ EXTERN_BITMAP( new_project_xpm )
|
||||||
EXTERN_BITMAP( new_project_with_template_xpm )
|
EXTERN_BITMAP( new_project_with_template_xpm )
|
||||||
EXTERN_BITMAP( new_python_xpm )
|
EXTERN_BITMAP( new_python_xpm )
|
||||||
EXTERN_BITMAP( new_sch_xpm )
|
EXTERN_BITMAP( new_sch_xpm )
|
||||||
EXTERN_BITMAP( new_txt_xpm )
|
|
||||||
EXTERN_BITMAP( new_xpm )
|
|
||||||
EXTERN_BITMAP( noconn_xpm )
|
EXTERN_BITMAP( noconn_xpm )
|
||||||
EXTERN_BITMAP( normal_xpm )
|
EXTERN_BITMAP( normal_xpm )
|
||||||
EXTERN_BITMAP( online_help_xpm )
|
EXTERN_BITMAP( online_help_xpm )
|
||||||
|
|
@ -501,6 +499,10 @@ EXTERN_BITMAP( select_grid_xpm )
|
||||||
EXTERN_BITMAP( select_layer_pair_xpm )
|
EXTERN_BITMAP( select_layer_pair_xpm )
|
||||||
EXTERN_BITMAP( select_w_layer_xpm )
|
EXTERN_BITMAP( select_w_layer_xpm )
|
||||||
EXTERN_BITMAP( sheetset_xpm )
|
EXTERN_BITMAP( sheetset_xpm )
|
||||||
|
EXTERN_BITMAP( setcolor_3d_bg_xpm )
|
||||||
|
EXTERN_BITMAP( setcolor_silkscreen_xpm )
|
||||||
|
EXTERN_BITMAP( setcolor_soldermask_xpm )
|
||||||
|
EXTERN_BITMAP( setcolor_copper_xpm )
|
||||||
EXTERN_BITMAP( show_dcodenumber_xpm )
|
EXTERN_BITMAP( show_dcodenumber_xpm )
|
||||||
EXTERN_BITMAP( show_footprint_xpm )
|
EXTERN_BITMAP( show_footprint_xpm )
|
||||||
EXTERN_BITMAP( show_mod_edge_xpm )
|
EXTERN_BITMAP( show_mod_edge_xpm )
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue