diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 8cc642afe7..706758550b 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -286,6 +286,7 @@ set( BMAPS_MID hierarchy_cursor hierarchy_nav hotkeys + html icon_cvpcb_small icon_gerbview_small icon_txt diff --git a/bitmaps_png/cpp_26/html.cpp b/bitmaps_png/cpp_26/html.cpp new file mode 100644 index 0000000000..18eb432cb1 --- /dev/null +++ b/bitmaps_png/cpp_26/html.cpp @@ -0,0 +1,79 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +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, 0x03, 0xe3, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x4d, 0x6c, 0x54, + 0x55, 0x14, 0xc7, 0x7f, 0x77, 0x66, 0xde, 0xcc, 0xf4, 0x23, 0x43, 0x5b, 0x3a, 0x2d, 0x05, 0xda, + 0x18, 0x6a, 0x95, 0x94, 0x50, 0xa2, 0xd4, 0x18, 0x17, 0x26, 0x9a, 0xa8, 0x41, 0x05, 0x45, 0x16, + 0xdd, 0x10, 0xa3, 0x1b, 0x24, 0x02, 0xd1, 0x04, 0x23, 0x36, 0xba, 0x68, 0xaa, 0x89, 0x92, 0x90, + 0x00, 0x2b, 0x95, 0xc4, 0x40, 0xdc, 0x18, 0x0d, 0xb8, 0x90, 0x8d, 0x81, 0xc4, 0x8f, 0x85, 0x68, + 0xc4, 0x08, 0x9a, 0xd4, 0xb6, 0xf6, 0x51, 0x8a, 0x65, 0x6c, 0x4b, 0x67, 0xa6, 0x9d, 0xe9, 0xbc, + 0x99, 0x79, 0x5f, 0xf7, 0x1d, 0x17, 0x1d, 0x8c, 0x9a, 0x60, 0x3b, 0x40, 0xb8, 0xc9, 0x59, 0xdc, + 0xdc, 0x73, 0xee, 0xef, 0xfe, 0x4f, 0xce, 0xb9, 0xf7, 0x2a, 0x11, 0xe1, 0x4e, 0x8c, 0x48, 0x35, + 0xce, 0x2f, 0xbc, 0xbc, 0x7f, 0x4d, 0x32, 0x51, 0x78, 0xa8, 0x58, 0x8a, 0x4f, 0x07, 0xae, 0x7b, + 0xf1, 0xd8, 0xb1, 0x63, 0xa5, 0xe5, 0xc6, 0xaa, 0xa5, 0x14, 0xf5, 0xf5, 0xf5, 0x85, 0xbb, 0x37, + 0xd4, 0x1c, 0xec, 0xd9, 0xb8, 0x72, 0xc7, 0xda, 0xb5, 0xd2, 0xb4, 0xaa, 0xb5, 0xd0, 0x50, 0x2a, + 0xd7, 0xfa, 0xb3, 0xe9, 0x96, 0x9c, 0x69, 0xe6, 0xa7, 0x46, 0x4d, 0xeb, 0xd5, 0x43, 0xef, 0x7d, + 0xf0, 0xed, 0x2d, 0x81, 0xf6, 0xec, 0xdf, 0xb3, 0xae, 0x67, 0xbd, 0x3e, 0xb9, 0xed, 0xa9, 0xc2, + 0xa6, 0xa6, 0x86, 0x4c, 0x58, 0xa9, 0x0e, 0x94, 0x6a, 0x43, 0x28, 0x11, 0xe8, 0x49, 0x74, 0x90, + 0x60, 0x7c, 0xa2, 0xbb, 0x70, 0xe6, 0xac, 0xf9, 0xe9, 0x1b, 0x07, 0x3e, 0x7c, 0xe9, 0xa6, 0x40, + 0x83, 0x83, 0x83, 0xa1, 0xe6, 0xe4, 0xd4, 0xf7, 0x2f, 0x3e, 0x3f, 0xfe, 0xa0, 0x11, 0xd9, 0x8c, + 0x0a, 0x6d, 0x04, 0x34, 0x82, 0x06, 0xd1, 0x08, 0x3e, 0x12, 0x64, 0xf0, 0x9c, 0x53, 0xcc, 0x2d, + 0xec, 0x72, 0x3f, 0x3a, 0x7e, 0xa1, 0xff, 0x9d, 0xc1, 0xe3, 0x47, 0x6e, 0x04, 0x0a, 0xdd, 0xf0, + 0x04, 0xe1, 0x2b, 0x07, 0x9f, 0xd9, 0x96, 0xee, 0x35, 0x8c, 0xfb, 0x21, 0xb4, 0x1e, 0xc1, 0x41, + 0xc4, 0x45, 0xc4, 0x43, 0x70, 0x01, 0x0f, 0x15, 0xaa, 0x45, 0x85, 0x57, 0xd1, 0xb8, 0xe2, 0x64, + 0xf4, 0x89, 0xc7, 0x7b, 0xdf, 0xdc, 0xbb, 0x77, 0x6f, 0x7b, 0xd5, 0xa0, 0xce, 0xce, 0xda, 0x2d, + 0xcd, 0x4d, 0xb3, 0x61, 0xe8, 0x02, 0xf1, 0x2a, 0x80, 0xeb, 0xe6, 0x2f, 0xce, 0xc5, 0x07, 0x55, + 0x0f, 0x32, 0x45, 0xf7, 0x7a, 0xa7, 0x39, 0x99, 0x74, 0xf6, 0x55, 0x05, 0xda, 0xbd, 0xbb, 0x7f, + 0x45, 0xf3, 0x4a, 0x9d, 0x44, 0x1a, 0x17, 0x95, 0xe0, 0x20, 0x2c, 0xaa, 0xf9, 0x17, 0x54, 0x3c, + 0x82, 0x60, 0x1e, 0x51, 0x06, 0x86, 0x71, 0x89, 0xf6, 0x8e, 0x96, 0x07, 0xaa, 0x02, 0xb9, 0x62, + 0xdf, 0xd3, 0xda, 0x92, 0x6b, 0x0c, 0x82, 0x3c, 0xc8, 0x3f, 0x00, 0x7f, 0xab, 0xd1, 0x88, 0x68, + 0x74, 0x70, 0x8d, 0x40, 0x0a, 0x80, 0x81, 0x70, 0x89, 0x55, 0xab, 0xdb, 0xda, 0xaa, 0x4b, 0x9d, + 0xa7, 0xcc, 0xd9, 0x74, 0x73, 0x5e, 0xeb, 0x14, 0x81, 0xcc, 0x2e, 0xaa, 0x61, 0x31, 0x55, 0x01, + 0x3e, 0x82, 0x8f, 0x96, 0x0c, 0x9e, 0x1e, 0xae, 0x40, 0x0c, 0x60, 0x0d, 0xf9, 0xf9, 0x85, 0x4c, + 0x55, 0xa0, 0x13, 0x27, 0x8e, 0xe4, 0xb2, 0xd9, 0xda, 0x39, 0xa8, 0xc7, 0xf3, 0xbe, 0x46, 0xeb, + 0x09, 0x22, 0x91, 0x27, 0x11, 0x9a, 0xf0, 0xdc, 0x59, 0x1c, 0x77, 0x04, 0xdb, 0x4e, 0x62, 0x97, + 0xf6, 0x23, 0x2a, 0x02, 0x44, 0xd0, 0xc1, 0x06, 0x26, 0xae, 0x4c, 0x9b, 0x55, 0x17, 0xc3, 0xe8, + 0x58, 0xee, 0xfd, 0xa9, 0x99, 0x47, 0x6c, 0x91, 0x12, 0xbe, 0xff, 0x33, 0x5a, 0xff, 0x84, 0xd6, + 0x93, 0x84, 0xc3, 0x9b, 0x51, 0x6c, 0x47, 0x29, 0x83, 0x44, 0xc3, 0xef, 0x80, 0x01, 0xac, 0xe4, + 0xd2, 0xe5, 0x8e, 0xf9, 0xd4, 0xa4, 0xf1, 0xf6, 0x4d, 0x35, 0xec, 0xe1, 0xa3, 0xaf, 0x7d, 0xb1, + 0x63, 0xbb, 0xb7, 0xb5, 0xa1, 0xe1, 0xc7, 0x50, 0xc4, 0x78, 0x14, 0x5f, 0x0f, 0x13, 0x08, 0x08, + 0x06, 0x46, 0xa4, 0x1b, 0xad, 0xc7, 0x41, 0x2c, 0xb2, 0xd9, 0x5d, 0xe5, 0x53, 0x9f, 0x7f, 0xf3, + 0x56, 0xff, 0xeb, 0x87, 0xab, 0xef, 0x23, 0x80, 0x42, 0x3e, 0xf1, 0xdc, 0x77, 0x3f, 0xb4, 0x0e, + 0x43, 0x0b, 0xae, 0x37, 0x4c, 0xb1, 0xd8, 0x80, 0x10, 0x01, 0x65, 0x90, 0xcb, 0xbb, 0x88, 0x94, + 0xf1, 0xfc, 0xc7, 0x38, 0x7d, 0xfa, 0xfc, 0xe9, 0xff, 0x83, 0x2c, 0x09, 0x1a, 0x18, 0x18, 0x08, + 0xc6, 0xc6, 0xae, 0x7d, 0x66, 0x95, 0xba, 0x51, 0xca, 0x62, 0x66, 0xc6, 0x06, 0x14, 0x05, 0x2b, + 0x82, 0x65, 0xa5, 0x11, 0x14, 0x73, 0xd9, 0x36, 0xe7, 0xd7, 0xdf, 0x0a, 0xef, 0x2e, 0x75, 0xd7, + 0x85, 0x96, 0x72, 0xf8, 0x73, 0xb2, 0xe6, 0xf8, 0xd0, 0x50, 0x73, 0x1a, 0x5a, 0xb0, 0xac, 0x2c, + 0xb6, 0xed, 0x33, 0x3e, 0x36, 0x47, 0x22, 0x61, 0xa1, 0x54, 0x27, 0x57, 0xfe, 0x70, 0xb3, 0xf1, + 0x50, 0x79, 0xe4, 0x96, 0x6f, 0x6f, 0x80, 0x7d, 0xaf, 0x3c, 0xfb, 0xe5, 0xd6, 0xa7, 0x1f, 0xde, + 0xb2, 0xe9, 0x3e, 0x45, 0x3c, 0xae, 0x11, 0x89, 0xe2, 0x38, 0x8d, 0x5c, 0xbc, 0xe0, 0x70, 0xf6, + 0xab, 0x73, 0x3b, 0x8f, 0x1e, 0xfa, 0xf8, 0x93, 0xdb, 0xf2, 0x1e, 0x95, 0x8b, 0xd3, 0xe5, 0x68, + 0xb4, 0x14, 0x9c, 0x3f, 0x5f, 0x1f, 0x72, 0x9d, 0x00, 0xdb, 0x59, 0xc0, 0x2e, 0xcf, 0x32, 0x6e, + 0x8e, 0xc8, 0xc4, 0xd8, 0xc8, 0xd0, 0x6d, 0x7b, 0xf8, 0x62, 0xf1, 0xe8, 0xea, 0x75, 0x9d, 0x3d, + 0xa1, 0xd6, 0xd6, 0xbb, 0xf1, 0xfd, 0x1c, 0xa9, 0x54, 0x8a, 0x91, 0xa1, 0x21, 0x86, 0xca, 0xa5, + 0x20, 0x08, 0x24, 0xbb, 0x9c, 0x3d, 0x42, 0xcb, 0x71, 0x9a, 0xcb, 0x5a, 0xbf, 0x14, 0xad, 0x9c, + 0x04, 0xe2, 0xe0, 0x6b, 0x4d, 0x24, 0xa2, 0xa8, 0xab, 0xaf, 0xa1, 0xbe, 0xae, 0x8e, 0x20, 0x50, + 0x6d, 0xb7, 0x0c, 0x52, 0x8b, 0xc3, 0x48, 0x24, 0xe2, 0x77, 0x39, 0xce, 0x02, 0x81, 0x76, 0x00, + 0xc1, 0xb6, 0x3d, 0xec, 0xb2, 0x87, 0xe3, 0x3a, 0x14, 0x8b, 0x6e, 0x8d, 0x52, 0x2a, 0xa6, 0x94, + 0x0a, 0x57, 0x5d, 0x0c, 0x4a, 0x29, 0x05, 0xc4, 0x81, 0x18, 0x10, 0x8b, 0xc5, 0xa8, 0xef, 0xed, + 0xed, 0xd8, 0xd9, 0xd9, 0xd9, 0x7d, 0xa0, 0xbd, 0x3d, 0x59, 0x97, 0x4e, 0xe7, 0x49, 0xa5, 0x66, + 0x4c, 0xd3, 0xbc, 0x3c, 0x60, 0x9a, 0x99, 0x8b, 0x80, 0x05, 0x38, 0x15, 0x2b, 0x8b, 0x88, 0xb7, + 0x5c, 0x45, 0xaa, 0xb2, 0x16, 0x06, 0xc2, 0x8e, 0x83, 0x71, 0xee, 0xdc, 0xe4, 0x99, 0x7c, 0x3e, + 0x76, 0xb6, 0xa6, 0xe6, 0xde, 0x39, 0xad, 0x93, 0xd3, 0xa3, 0xa3, 0x99, 0xa3, 0xa6, 0x99, 0x99, + 0x01, 0x6a, 0x81, 0x68, 0xc5, 0xf7, 0x7a, 0xcc, 0xf2, 0xcb, 0xbb, 0xa2, 0x2a, 0x5a, 0x51, 0x65, + 0x54, 0x2c, 0xdc, 0xd5, 0xd5, 0x95, 0xbc, 0x7a, 0xf5, 0xea, 0x82, 0x6d, 0xdb, 0x1e, 0xa0, 0x01, + 0x1f, 0xf0, 0x00, 0x17, 0x70, 0x44, 0xc4, 0xbf, 0xe9, 0x3e, 0xfa, 0x0f, 0x5c, 0x55, 0xa6, 0x22, + 0x55, 0x04, 0xab, 0x3b, 0xf5, 0x81, 0xfc, 0x0b, 0x80, 0xf8, 0x1d, 0x65, 0x6b, 0xc6, 0x6e, 0x3d, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE html_xpm[1] = {{ png, sizeof( png ), "html_xpm" }}; + +//EOF diff --git a/bitmaps_png/sources/html.svg b/bitmaps_png/sources/html.svg new file mode 100644 index 0000000000..4d9d959f1c --- /dev/null +++ b/bitmaps_png/sources/html.svg @@ -0,0 +1,859 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/wildcards_and_files_ext.cpp b/common/wildcards_and_files_ext.cpp index de343ecc47..80326d386d 100644 --- a/common/wildcards_and_files_ext.cpp +++ b/common/wildcards_and_files_ext.cpp @@ -43,6 +43,7 @@ const wxString SchematicFileExtension( wxT( "sch" ) ); const wxString NetlistFileExtension( wxT( "net" ) ); const wxString ComponentFileExtension( wxT( "cmp" ) ); const wxString GerberFileExtension( wxT( ".((gbr|(gb|gt)[alops])|pho)" ) ); +const wxString HtmlFileExtension( wxT( "html" ) ); const wxString LegacyPcbFileExtension( wxT( "brd" ) ); const wxString KiCadPcbFileExtension( wxT( "kicad_pcb" ) ); @@ -93,6 +94,7 @@ const wxString ComponentFileWildcard( _( "KiCad cmp/footprint link files (*.cmp) // Wildcard for reports and fabrication documents const wxString DrillFileWildcard( _( "Drill files (*.drl)|*.drl;*.DRL" ) ); const wxString SVGFileWildcard( _( "SVG files (*.svg)|*.svg;*.SVG" ) ); +const wxString HtmlFileWildcard( _( "HTML files (*.html)|*.htm;*.html" ) ); const wxString PdfFileWildcard( _( "Portable document format files (*.pdf)|*.pdf" ) ); const wxString PSFileWildcard( _( "PostScript files (.ps)|*.ps" ) ); const wxString ReportFileWildcard = _( "Report files (*.rpt)|*.rpt" ); diff --git a/include/bitmaps.h b/include/bitmaps.h index 25b37514f9..c0711c8f89 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -243,6 +243,7 @@ EXTERN_BITMAP( hidden_pin_xpm ) EXTERN_BITMAP( hierarchy_cursor_xpm ) EXTERN_BITMAP( hierarchy_nav_xpm ) EXTERN_BITMAP( hotkeys_xpm ) +EXTERN_BITMAP( html_xpm ) EXTERN_BITMAP( icon_cvpcb_small_xpm ) EXTERN_BITMAP( icon_cvpcb_xpm ) EXTERN_BITMAP( icon_eeschema_xpm ) diff --git a/include/wildcards_and_files_ext.h b/include/wildcards_and_files_ext.h index 94ad151eab..63b43fcd73 100644 --- a/include/wildcards_and_files_ext.h +++ b/include/wildcards_and_files_ext.h @@ -51,6 +51,7 @@ extern const wxString ProjectFileExtension; extern const wxString SchematicFileExtension; extern const wxString NetlistFileExtension; extern const wxString GerberFileExtension; +extern const wxString HtmlFileExtension; extern const wxString LegacyPcbFileExtension; extern const wxString KiCadPcbFileExtension; @@ -81,6 +82,7 @@ extern const wxString SchematicFileWildcard; extern const wxString BoardFileWildcard; extern const wxString NetlistFileWildcard; extern const wxString GerberFileWildcard; +extern const wxString HtmlFileWildcard; extern const wxString LegacyPcbFileWildcard; extern const wxString PcbFileWildcard; extern const wxString EaglePcbFileWildcard; diff --git a/kicad/class_treeproject_item.cpp b/kicad/class_treeproject_item.cpp index 24a7aa194c..2ea7784afd 100644 --- a/kicad/class_treeproject_item.cpp +++ b/kicad/class_treeproject_item.cpp @@ -49,7 +49,6 @@ TREEPROJECT_ITEM::TREEPROJECT_ITEM( enum TreeFileType type, const wxString& data wxTreeItemData() { m_parent = parent; - SetType( type ); SetFileName( data ); SetRootFile( false ); // true only for the root item of the tree (the project name) @@ -218,6 +217,10 @@ void TREEPROJECT_ITEM::Activate( TREE_PROJECT_FRAME* prjframe ) frame->Execute( m_parent, GERBVIEW_EXE, fullFileName ); break; + case TREE_HTML: + wxLaunchDefaultBrowser( fullFileName ); + break; + case TREE_PDF: OpenPDF( fullFileName ); break; diff --git a/kicad/class_treeprojectfiles.cpp b/kicad/class_treeprojectfiles.cpp index b67db30de5..1d2b317a9f 100644 --- a/kicad/class_treeprojectfiles.cpp +++ b/kicad/class_treeprojectfiles.cpp @@ -65,6 +65,7 @@ TREEPROJECTFILES::TREEPROJECTFILES( TREE_PROJECT_FRAME* parent ) : m_ImageList->Add( KiBitmap( pcbnew_xpm ) ); // TREE_LEGACY_PCB m_ImageList->Add( KiBitmap( pcbnew_xpm ) ); // TREE_SFMT_PCB m_ImageList->Add( KiBitmap( icon_gerbview_small_xpm ) ); // TREE_GERBER + m_ImageList->Add( KiBitmap( html_xpm ) ); // TREE_HTML m_ImageList->Add( KiBitmap( datasheet_xpm ) ); // TREE_PDF m_ImageList->Add( KiBitmap( icon_txt_xpm ) ); // TREE_TXT m_ImageList->Add( KiBitmap( netlist_xpm ) ); // TREE_NET diff --git a/kicad/kicad.h b/kicad/kicad.h index a9018a4b39..abdbcf6f7a 100644 --- a/kicad/kicad.h +++ b/kicad/kicad.h @@ -64,6 +64,7 @@ enum TreeFileType { TREE_LEGACY_PCB, // board file (.brd) legacy format TREE_SEXP_PCB, // board file (.kicad_brd) new s expression format TREE_GERBER, // Gerber file (.pho, .g*) + TREE_HTML, // HTML file (.htm, *.html) TREE_PDF, // PDF file (.pdf) TREE_TXT, // ascii text file (.txt) TREE_NET, // netlist file (.net) diff --git a/kicad/tree_project_frame.cpp b/kicad/tree_project_frame.cpp index c02d681f63..0486b3c549 100644 --- a/kicad/tree_project_frame.cpp +++ b/kicad/tree_project_frame.cpp @@ -258,6 +258,10 @@ wxString TREE_PROJECT_FRAME::GetFileExt( TreeFileType type ) ext = GerberFileExtension; break; + case TREE_HTML: + ext = HtmlFileExtension; + break; + case TREE_PDF: ext = PdfFileExtension; break; @@ -336,6 +340,10 @@ wxString TREE_PROJECT_FRAME::GetFileWildcard( TreeFileType type ) ext = GerberFileWildcard; break; + case TREE_HTML: + ext = HtmlFileWildcard; + break; + case TREE_PDF: ext = PdfFileWildcard; break;