Hi Wayne, it sound good. I think "Run" should go and I think "Edit Schematic" in place of "Run Eeschema" is a great step up.
The considerations about the use of the words "Symbol" and "Table" sound good too. I changed the patch accordingly and resubmitted here. Just as reference, this is what I came up with: - Run Eeschema + Edit Schematic - Run Library Editor + Edit Schematic Symbol - Run Pcbnew + Edit PCB - Run Footprint Editor + Edit PCB Footprint - Run Gerbview + View GERBER - Run Bitmap2Component + Convert Bitmap to Footprint - Run Pcb Calculator + Run PCB Calculator - Run Page Layout Editor + Edit Sheet Layout Wayne, please feel free to change the content of this patch as you think it is best. cheers Fabrizio On Mon, Aug 28, 2017 at 9:00 PM, Wayne Stambaugh <stambau...@gmail.com> wrote: > Fabrizio, > > I'm fine with the icon changes. The menu entry changes could use some > improvement. I'm not sure removing "Run" from the KiCad launcher menu > entries is a good idea. Generally (at least in most of the applications > that I've looked at), actions are used in menu string when the entry is > an action. I also think it's probably time to get rid of the old > Eeschema/Pcbnew application names. Since KiCad normally runs in a > single process, better menu entries might be "Edit Schematic" and "Edit > Board (or PCB)". New users aren't going to know what Eeschema and > Pcbnew are. > > I would also would not refer to the footprint library "table" either. > The word table seems to confuse users. I know we refer to it as a table > on the developers mailing list but I think users are more comfortable > with "Manage Footprint Libraries". I am aware that I used table for the > symbol library table dialog menus entry but this is temporary. Once I > finish the symbol library table remapping code, this dialog will go away > and "Manage Symbol Libraries" will open the symbol library table edit > dialog. > > The use of symbol was intentional so I would prefer that it not be > changed. There was a discussion about this not too long ago and the > consensus was that symbol made the most sense versus component or part. > I realize that component (and part) are used in the source code and most > of the UI strings but I would prefer that we change the UI strings to > symbol for the stable 5 release rather than continue to use component > and/or part. I will change the source when I get a chance so that the > terminology is coherent between the source and the UI strings. I know > we still have the module/footprint distinction in the Pcbnew source but > at least all of the UI strings are "footprint". > > Cheers, > > Wayne > > On 8/22/2017 5:47 PM, Fabrizio Tappero wrote: > > Reminder. > > > > Regards > > Fabrizio > > > > > > On Aug 17, 2017 4:42 PM, "Fabrizio Tappero" <fabrizio.tapp...@gmail.com > > <mailto:fabrizio.tapp...@gmail.com>> wrote: > > > > Hello, > > the following patch does the following: > > 1) correct few pcbnew and eeschema menu text entries > > 2) add the library table icon (minor look change) > > 3) delete the redundant word "Run" into the KiCad - Tools menu entry > > > > cheers > > Fabrzio > > > > > > > > _______________________________________________ > > Mailing list: https://launchpad.net/~kicad-developers > > Post to : kicad-developers@lists.launchpad.net > > Unsubscribe : https://launchpad.net/~kicad-developers > > More help : https://help.launchpad.net/ListHelp > > > > _______________________________________________ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp >
From b977fa7899d3aac0ac925aa57b31edf4d79b510c Mon Sep 17 00:00:00 2001 From: Fabrizio Tappero <fabrizio.tapp...@gmail.com> Date: Thu, 17 Aug 2017 16:39:11 +0200 Subject: [PATCH] library option reviewed and renamed, minor menu text changes --- bitmaps_png/CMakeLists.txt | 1 - bitmaps_png/cpp_26/library_option.cpp | 117 +++++++++++++++++++++++ bitmaps_png/cpp_26/library_table.cpp | 170 ++++++++++++++-------------------- bitmaps_png/cpp_26/move_zone.cpp | 67 -------------- bitmaps_png/sources/library_table.svg | 137 ++++++++++----------------- bitmaps_png/sources/move_zone.svg | 169 --------------------------------- cvpcb/menubar.cpp | 2 +- eeschema/menubar.cpp | 8 +- eeschema/menubar_libedit.cpp | 6 +- include/bitmaps.h | 1 - kicad/menubar.cpp | 16 ++-- pcbnew/help_common_strings.h | 4 +- pcbnew/menubar_modedit.cpp | 4 +- pcbnew/menubar_pcbframe.cpp | 4 +- pcbnew/onrightclick.cpp | 2 +- 15 files changed, 258 insertions(+), 450 deletions(-) create mode 100644 bitmaps_png/cpp_26/library_option.cpp delete mode 100644 bitmaps_png/cpp_26/move_zone.cpp delete mode 100644 bitmaps_png/sources/move_zone.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 40003dc..33bcdbc 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -345,7 +345,6 @@ set( BMAPS_MID move_rectangle move_sheet move_target - move_zone move move_relative mw_add_gap diff --git a/bitmaps_png/cpp_26/library_option.cpp b/bitmaps_png/cpp_26/library_option.cpp new file mode 100644 index 0000000..8e90fbf --- /dev/null +++ b/bitmaps_png/cpp_26/library_option.cpp @@ -0,0 +1,117 @@ + +/* 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, 0x06, 0x41, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x6b, 0x4c, 0x93, + 0x57, 0x18, 0xc7, 0x0b, 0x7e, 0xd8, 0x96, 0x7d, 0xdc, 0xfc, 0xb2, 0x2d, 0x93, 0xf7, 0x2d, 0x83, + 0x4d, 0x65, 0x43, 0x05, 0x26, 0x8a, 0x02, 0x6d, 0xb9, 0x33, 0x83, 0x2e, 0x5e, 0xe2, 0x15, 0x50, + 0xc8, 0x20, 0x92, 0xa9, 0x44, 0x68, 0x01, 0x95, 0xcc, 0x88, 0x20, 0x0e, 0x04, 0x26, 0xcc, 0x11, + 0x05, 0x17, 0x30, 0xd0, 0x22, 0xe3, 0x32, 0x19, 0xb0, 0x04, 0x27, 0x2a, 0xde, 0xca, 0x45, 0xee, + 0x20, 0x13, 0x14, 0x08, 0xa0, 0x68, 0xb9, 0x94, 0x16, 0x69, 0xcb, 0x7f, 0xe7, 0x9c, 0x42, 0x27, + 0x48, 0xa6, 0x26, 0x7b, 0x93, 0x27, 0x39, 0x79, 0xfb, 0xe6, 0xfc, 0xce, 0xf3, 0xfc, 0xff, 0xe7, + 0x79, 0x2a, 0x10, 0xcc, 0x7b, 0xc4, 0xd1, 0xc2, 0x08, 0x71, 0x34, 0x97, 0x2d, 0x91, 0x72, 0xc1, + 0xa2, 0x08, 0xce, 0xc1, 0xf1, 0xe0, 0x27, 0xef, 0x09, 0xde, 0xf0, 0x69, 0x56, 0x98, 0xa9, 0x5a, + 0x14, 0x66, 0x93, 0xf3, 0x83, 0xbc, 0x9f, 0x78, 0xe5, 0x63, 0xd7, 0x68, 0xae, 0xe9, 0xeb, 0x64, + 0x1e, 0x8e, 0xa7, 0x79, 0xb5, 0x73, 0x2c, 0x37, 0x2a, 0x91, 0xf1, 0x3a, 0x71, 0x0c, 0xf7, 0xc8, + 0xe5, 0x88, 0x45, 0xa1, 0x9b, 0x4c, 0xb8, 0xf6, 0xbf, 0x40, 0x2d, 0x72, 0x81, 0x7e, 0xb2, 0xce, + 0x12, 0xba, 0x06, 0xab, 0x39, 0xd1, 0xaa, 0x30, 0x7b, 0x31, 0xe7, 0xc3, 0xd8, 0x58, 0x81, 0xb9, + 0x44, 0xc6, 0x4d, 0x5a, 0x29, 0x2c, 0x61, 0x59, 0x64, 0x8c, 0xcf, 0x0a, 0x2d, 0xb1, 0x2c, 0xc7, + 0x12, 0x04, 0xaa, 0x91, 0x48, 0xf9, 0x6f, 0x5f, 0x07, 0xd2, 0xdf, 0xb7, 0x06, 0x9a, 0x97, 0xce, + 0x89, 0xd6, 0x02, 0xf3, 0xc9, 0xb9, 0x65, 0x93, 0xf1, 0x56, 0xa2, 0x18, 0x4e, 0x4d, 0x01, 0xd6, + 0xc5, 0xd6, 0x70, 0xf8, 0xc3, 0xc1, 0x04, 0x24, 0xef, 0x27, 0x24, 0xd2, 0x4f, 0xf9, 0x37, 0x06, + 0xa9, 0x4a, 0x80, 0x16, 0xdb, 0x85, 0x41, 0x92, 0x48, 0x6e, 0xcb, 0xda, 0x38, 0x7e, 0x94, 0x6e, + 0xec, 0x5d, 0xe5, 0x8d, 0x46, 0x55, 0x23, 0x83, 0x58, 0x93, 0x0c, 0xc5, 0x32, 0x4e, 0x6b, 0xe6, + 0x26, 0x1f, 0x11, 0xb8, 0xc9, 0x0d, 0xaf, 0x84, 0x84, 0xc4, 0x7c, 0x90, 0x6e, 0x08, 0x68, 0x5d, + 0xb9, 0x30, 0x48, 0x14, 0x65, 0x11, 0x6f, 0x9f, 0xc6, 0xeb, 0xe9, 0xe6, 0xe1, 0xca, 0x70, 0xe4, + 0xf7, 0xe4, 0x33, 0x90, 0x4d, 0xb6, 0x10, 0xae, 0x31, 0x5c, 0x83, 0xb9, 0x7b, 0x81, 0xc6, 0xf3, + 0xf4, 0x18, 0xfc, 0xce, 0x4e, 0x99, 0xe2, 0x9b, 0x14, 0x2d, 0x08, 0x08, 0x6f, 0x05, 0x22, 0x9b, + 0xdd, 0xf8, 0xf2, 0x82, 0x90, 0x6d, 0x9e, 0xf9, 0x20, 0x13, 0xb1, 0xf7, 0x63, 0xd9, 0x7a, 0x55, + 0x3a, 0x3f, 0x2d, 0x89, 0xe2, 0x33, 0x28, 0xc8, 0xf7, 0x8c, 0x06, 0x9b, 0xcf, 0xc1, 0x14, 0x9b, + 0xd2, 0xf5, 0x6f, 0x0f, 0x12, 0x45, 0x73, 0xaa, 0xcf, 0xf3, 0x8c, 0x9a, 0xdc, 0x7c, 0x72, 0x13, + 0x5b, 0xab, 0xb7, 0xb2, 0xf5, 0x9a, 0x04, 0x7e, 0x9c, 0x18, 0x21, 0xf0, 0x7f, 0x01, 0x79, 0xc9, + 0x2c, 0x17, 0x13, 0x1d, 0x5e, 0x58, 0xfe, 0x66, 0x04, 0x0d, 0x4f, 0x0e, 0xc3, 0xf6, 0x77, 0x5b, + 0xb6, 0x76, 0x39, 0xca, 0x8f, 0x89, 0xa2, 0x96, 0xac, 0x7c, 0x19, 0x54, 0x58, 0x0f, 0x84, 0xcb, + 0xf5, 0x88, 0xbf, 0xf2, 0x02, 0x1b, 0x8f, 0x56, 0x63, 0x7c, 0x7c, 0x5c, 0xd4, 0xaa, 0x58, 0xf4, + 0x7a, 0x90, 0x9b, 0x94, 0x73, 0x5f, 0x7f, 0x9c, 0x1b, 0xa1, 0x1b, 0x3b, 0x55, 0x38, 0xa1, 0x5b, + 0xdd, 0x6d, 0xb2, 0x37, 0xbd, 0x4b, 0x2e, 0xb1, 0x16, 0xef, 0xbe, 0x0c, 0x1a, 0xd3, 0x02, 0xd7, + 0x5b, 0xd5, 0x28, 0x2f, 0x2f, 0x47, 0x49, 0x49, 0x09, 0xee, 0xdd, 0xbb, 0x87, 0xce, 0xb2, 0x2f, + 0x0c, 0xaf, 0x05, 0x11, 0x23, 0x44, 0xae, 0x3e, 0x23, 0x9c, 0xa4, 0x9b, 0x07, 0xdf, 0x0e, 0x46, + 0x59, 0x7f, 0x19, 0x03, 0x2d, 0xcb, 0x11, 0x82, 0x94, 0xb4, 0x9b, 0x7e, 0xf3, 0xfd, 0x59, 0xe5, + 0xd4, 0xaf, 0xd5, 0x6a, 0x6c, 0xcb, 0x34, 0x82, 0x6e, 0x29, 0x5b, 0xe0, 0xec, 0xec, 0x8c, 0xa0, + 0xa0, 0x20, 0x6c, 0xd8, 0xb0, 0x01, 0xdd, 0xd7, 0x37, 0x31, 0x90, 0xee, 0xef, 0xef, 0xa0, 0x99, + 0x50, 0x61, 0xba, 0xdd, 0x75, 0x01, 0x50, 0x0c, 0x57, 0x6c, 0x9b, 0x69, 0x34, 0x42, 0x72, 0x5b, + 0x32, 0x92, 0x5a, 0x93, 0xd8, 0xda, 0xf6, 0x1c, 0x0f, 0xd2, 0x2d, 0x0a, 0x46, 0x47, 0x47, 0x8f, + 0x77, 0x74, 0x74, 0x20, 0x3c, 0x3c, 0x1c, 0x55, 0x77, 0x3a, 0x31, 0x36, 0x3e, 0x81, 0x82, 0x82, + 0x02, 0x84, 0x86, 0x86, 0xa2, 0xb3, 0xb3, 0x13, 0x8e, 0x8e, 0x8e, 0x18, 0x78, 0xdc, 0x04, 0xf5, + 0x60, 0x25, 0xf2, 0xf2, 0xf2, 0x10, 0x13, 0x13, 0x03, 0xd5, 0x50, 0x03, 0x81, 0xb9, 0xcc, 0xcf, + 0x88, 0xef, 0x5d, 0x96, 0x6b, 0xd4, 0xa7, 0xbc, 0xbf, 0x1c, 0xfb, 0x6e, 0xed, 0x63, 0xeb, 0xd5, + 0x49, 0xbc, 0x56, 0x71, 0xed, 0x7c, 0x7e, 0x63, 0x63, 0x23, 0x3c, 0x3d, 0x3d, 0x71, 0xe0, 0xc0, + 0x01, 0xb8, 0xba, 0xba, 0x22, 0x20, 0x20, 0x80, 0x65, 0x93, 0x99, 0x99, 0x89, 0x9e, 0x9e, 0x1e, + 0x84, 0x84, 0x84, 0x40, 0x22, 0x91, 0x60, 0xc7, 0x8e, 0x1d, 0x2c, 0x64, 0x32, 0x19, 0x82, 0x83, + 0x83, 0xf1, 0xb4, 0xef, 0x16, 0x01, 0x2d, 0x32, 0x82, 0x68, 0xe3, 0xa4, 0x3a, 0x50, 0x3d, 0xe8, + 0xe6, 0xca, 0x67, 0x4a, 0xa6, 0x13, 0x5d, 0x3b, 0x1f, 0xe7, 0x47, 0xf6, 0x26, 0x7b, 0xf8, 0xd4, + 0xd4, 0xd4, 0xf4, 0x52, 0x40, 0x65, 0x65, 0x25, 0xd3, 0x25, 0x23, 0x23, 0x03, 0x6d, 0x6d, 0x6d, + 0x0c, 0xd2, 0xdf, 0xdf, 0x8f, 0xa1, 0xa1, 0x21, 0xd4, 0xd6, 0xd6, 0x42, 0xa1, 0x50, 0x40, 0xa3, + 0xd1, 0x20, 0x37, 0x37, 0x17, 0x5b, 0xb6, 0x6c, 0x81, 0xba, 0x3d, 0xf4, 0xdf, 0x8c, 0x68, 0x97, + 0xa6, 0x0d, 0x74, 0xb6, 0xdd, 0x98, 0xfa, 0x5c, 0x11, 0xeb, 0x08, 0x53, 0x62, 0xd9, 0xc7, 0x1f, + 0x8c, 0x8d, 0x8d, 0xf9, 0xa7, 0xa5, 0xa5, 0xc1, 0xdf, 0xdf, 0x9f, 0x01, 0x1e, 0x3c, 0x78, 0x60, + 0x82, 0xf4, 0xf5, 0xf5, 0xe1, 0xf9, 0xf3, 0xe7, 0xd4, 0x79, 0xd0, 0x6a, 0xb5, 0xe8, 0xea, 0xea, + 0xc2, 0x9a, 0x35, 0x6b, 0xd0, 0x7e, 0xbf, 0x68, 0xae, 0x46, 0x74, 0x24, 0x38, 0x26, 0xf2, 0xea, + 0xf9, 0xa0, 0xe5, 0x79, 0x56, 0xd8, 0x9f, 0xbe, 0x49, 0x45, 0x21, 0x24, 0x6e, 0x53, 0x7d, 0x12, + 0x13, 0x13, 0x4d, 0x90, 0x8b, 0x17, 0x2f, 0xc2, 0xdd, 0xdd, 0x9d, 0xe9, 0x43, 0xcb, 0xd5, 0xd4, + 0x44, 0x34, 0x52, 0xab, 0xa1, 0x52, 0xa9, 0xb0, 0x6b, 0xd7, 0x2e, 0x92, 0x9d, 0x1c, 0xda, 0xc1, + 0x02, 0xf4, 0xd5, 0x1e, 0xd6, 0xcd, 0xcc, 0x20, 0x8b, 0xf3, 0x2b, 0x7f, 0x16, 0x4e, 0xcf, 0x07, + 0x6d, 0x90, 0x4b, 0xf0, 0xf8, 0xf1, 0x63, 0x44, 0x44, 0x44, 0x60, 0xdb, 0xb6, 0x6d, 0x70, 0x70, + 0x70, 0x40, 0x43, 0x43, 0x03, 0x83, 0x54, 0x54, 0x54, 0xc0, 0xdb, 0xc7, 0x07, 0xd2, 0x0b, 0xed, + 0x58, 0xbe, 0xb7, 0x0c, 0xd9, 0xd9, 0xd9, 0xf5, 0xde, 0xde, 0xde, 0xac, 0x84, 0x4f, 0x9f, 0x3e, + 0x45, 0x61, 0x61, 0x21, 0xc4, 0x62, 0x31, 0xd3, 0x31, 0x32, 0x32, 0x12, 0x33, 0x1d, 0x81, 0x6f, + 0xb1, 0xb9, 0x38, 0x17, 0x42, 0x63, 0x6f, 0xfe, 0x66, 0xc3, 0xdd, 0xbb, 0x77, 0xe1, 0xeb, 0xeb, + 0xcb, 0xee, 0x4a, 0x7d, 0x7d, 0x3d, 0x83, 0xd0, 0x52, 0x9d, 0x3c, 0x79, 0x12, 0x31, 0x09, 0xe7, + 0x4d, 0x9d, 0x81, 0x64, 0xf2, 0x55, 0x60, 0x60, 0x20, 0xaa, 0xaa, 0xaa, 0x30, 0x30, 0x30, 0xc0, + 0x0e, 0x48, 0xdd, 0x48, 0x35, 0xa5, 0xc0, 0x05, 0x67, 0xd0, 0x6c, 0x04, 0x5d, 0xf0, 0x53, 0x2b, + 0x95, 0xc4, 0x18, 0x4e, 0x4e, 0xcc, 0x55, 0xa7, 0x4e, 0x9d, 0x62, 0x10, 0x7a, 0x6a, 0xea, 0xb6, + 0x08, 0xe9, 0x11, 0x04, 0x64, 0xe9, 0x40, 0xba, 0x3a, 0xdd, 0x3c, 0xde, 0xcb, 0xcb, 0x0b, 0xf4, + 0x7b, 0x0a, 0xa1, 0xc0, 0x3d, 0x7b, 0xf6, 0xc0, 0xcd, 0xcd, 0x8d, 0x95, 0x57, 0xe0, 0x1a, 0xc1, + 0x59, 0xd3, 0x19, 0x64, 0x55, 0x6c, 0x85, 0xac, 0xae, 0x2c, 0x54, 0x0d, 0x54, 0xc1, 0xb9, 0xd2, + 0x99, 0x81, 0x7c, 0x7f, 0xb0, 0xd1, 0x74, 0xf4, 0x34, 0x9d, 0x20, 0x8e, 0x53, 0x14, 0x15, 0x15, + 0xa9, 0x3c, 0x3c, 0x3c, 0x58, 0x07, 0x78, 0xf6, 0xec, 0x19, 0x06, 0x07, 0x07, 0xe1, 0xe7, 0xe7, + 0x87, 0x48, 0xa9, 0x14, 0x29, 0x3f, 0x9d, 0xc3, 0xce, 0x9d, 0x3b, 0x99, 0xa5, 0x29, 0x84, 0x6a, + 0x48, 0x33, 0x3e, 0x7c, 0xf8, 0x30, 0xba, 0xeb, 0x53, 0xf0, 0xf0, 0xc6, 0x4e, 0x9d, 0x40, 0x2c, + 0xb5, 0xd8, 0x4a, 0x67, 0x10, 0x6d, 0xa0, 0xb3, 0x0f, 0x05, 0xce, 0xcc, 0x20, 0x0d, 0xa9, 0xac, + 0x19, 0x2d, 0x2f, 0xb9, 0xb0, 0x61, 0xa9, 0xa9, 0xa9, 0x38, 0x74, 0xe8, 0x10, 0x88, 0x31, 0x98, + 0xbb, 0xa8, 0x16, 0x59, 0x59, 0x59, 0x88, 0x8b, 0x8b, 0xc3, 0xe5, 0xcb, 0x97, 0xf1, 0xe8, 0xd1, + 0x23, 0x06, 0xa1, 0x77, 0x8e, 0x66, 0xf2, 0xd7, 0xd5, 0x72, 0x32, 0xfc, 0x6c, 0x8c, 0xae, 0x13, + 0xcb, 0x2c, 0x12, 0x56, 0xa5, 0xf1, 0x06, 0xbb, 0x32, 0x3b, 0x0c, 0x6a, 0x07, 0xa1, 0x9f, 0xd6, + 0x23, 0xe4, 0x4e, 0x88, 0x71, 0x06, 0x45, 0x73, 0xf5, 0xb3, 0x17, 0x9a, 0x38, 0x49, 0x4e, 0xbb, + 0x00, 0x2d, 0x1f, 0x85, 0x4c, 0x4c, 0x4c, 0x60, 0x64, 0x64, 0x04, 0xc3, 0xc3, 0xc3, 0x4c, 0x93, + 0xde, 0xde, 0x5e, 0x06, 0xa9, 0xab, 0xab, 0x63, 0x59, 0x1f, 0x3b, 0x76, 0x8c, 0x5d, 0x05, 0x6d, + 0x4f, 0x9c, 0x11, 0x24, 0x3a, 0xc2, 0x9b, 0x66, 0xd0, 0xf2, 0xd2, 0xe5, 0xb0, 0x2f, 0xb3, 0x9f, + 0x99, 0x41, 0xc2, 0x69, 0xd2, 0x2d, 0xd2, 0x29, 0x84, 0x64, 0x10, 0x94, 0x9f, 0x9f, 0xcf, 0x6a, + 0xfd, 0xe4, 0xc9, 0x13, 0x06, 0xa3, 0xc2, 0x97, 0x96, 0x96, 0xb2, 0x3b, 0x43, 0x21, 0xd4, 0x34, + 0x49, 0x49, 0x49, 0xac, 0x3b, 0xd0, 0xde, 0x97, 0x93, 0x93, 0xc3, 0x6c, 0x7f, 0xe3, 0xfa, 0x55, + 0xb4, 0x15, 0x7f, 0xf8, 0x82, 0xcd, 0xa0, 0x15, 0xbf, 0x08, 0x61, 0x2d, 0x17, 0xce, 0x31, 0xc2, + 0xda, 0x04, 0xe1, 0x38, 0xe9, 0x16, 0x01, 0x14, 0x44, 0x4e, 0xff, 0x11, 0x39, 0x79, 0x5b, 0x58, + 0x58, 0x18, 0x33, 0x46, 0x04, 0xb1, 0x6b, 0x5e, 0x5e, 0x3e, 0x3b, 0xf1, 0xf6, 0xed, 0x3b, 0x58, + 0x26, 0xbb, 0x77, 0xef, 0x06, 0xfd, 0xbd, 0xe6, 0x5a, 0x09, 0x12, 0xe2, 0xe3, 0x60, 0x67, 0x67, + 0x47, 0xca, 0x7a, 0x01, 0x53, 0x0f, 0x0f, 0xce, 0x94, 0x2e, 0x9a, 0x4b, 0x21, 0x93, 0x55, 0x29, + 0x8e, 0xe2, 0x26, 0x08, 0x54, 0xe3, 0x74, 0x82, 0x1f, 0xb5, 0x4f, 0xe5, 0xf5, 0xa2, 0x23, 0xf4, + 0xcf, 0xc8, 0x92, 0x15, 0xb3, 0xa5, 0x23, 0xb7, 0x7e, 0xf1, 0xf5, 0x86, 0x5e, 0xc3, 0xa5, 0xd2, + 0x1a, 0xec, 0xbf, 0x64, 0x40, 0x68, 0xae, 0x01, 0xb7, 0x9b, 0x07, 0xb0, 0x6e, 0xdd, 0x3a, 0xa6, + 0xc9, 0xfa, 0xf5, 0xeb, 0xd1, 0x76, 0x3b, 0x7e, 0x5a, 0xdf, 0xb8, 0x14, 0xfa, 0x0e, 0x3f, 0x74, + 0xb5, 0xfc, 0x89, 0xa9, 0xee, 0x43, 0x0b, 0x4f, 0x58, 0x4f, 0xa9, 0x85, 0x05, 0xd1, 0xcc, 0x4f, + 0x24, 0xe3, 0x8e, 0x93, 0x6c, 0xae, 0x78, 0x85, 0x59, 0xbe, 0xf3, 0xf2, 0xef, 0xef, 0xfb, 0x5e, + 0x56, 0x9b, 0x7b, 0x28, 0x0c, 0x66, 0xee, 0xc6, 0xf8, 0x51, 0xde, 0x32, 0xed, 0x43, 0x2e, 0x2d, + 0x3d, 0xfd, 0xc6, 0x8d, 0x1b, 0xd1, 0x5d, 0xed, 0xa7, 0x6f, 0x2e, 0x30, 0xd3, 0x19, 0xc3, 0x5c, + 0x67, 0x5a, 0xcb, 0x05, 0xf8, 0x07, 0xfc, 0x4b, 0xc4, 0xf7, 0xc2, 0x63, 0xf9, 0xc0, 0x00, 0x00, + 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE library_option_xpm[1] = {{ png, sizeof( png ), "library_option_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/library_table.cpp b/bitmaps_png/cpp_26/library_table.cpp index 85f892c..8ec7f70 100644 --- a/bitmaps_png/cpp_26/library_table.cpp +++ b/bitmaps_png/cpp_26/library_table.cpp @@ -8,108 +8,74 @@ 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, 0x06, 0x41, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x6b, 0x4c, 0x93, - 0x57, 0x18, 0xc7, 0x0b, 0x7e, 0xd8, 0x96, 0x7d, 0xdc, 0xfc, 0xb2, 0x2d, 0x93, 0xf7, 0x2d, 0x83, - 0x4d, 0x65, 0x43, 0x05, 0x26, 0x8a, 0x02, 0x6d, 0xb9, 0x33, 0x83, 0x2e, 0x5e, 0xe2, 0x15, 0x50, - 0xc8, 0x20, 0x92, 0xa9, 0x44, 0x68, 0x01, 0x95, 0xcc, 0x88, 0x20, 0x0e, 0x04, 0x26, 0xcc, 0x11, - 0x05, 0x17, 0x30, 0xd0, 0x22, 0xe3, 0x32, 0x19, 0xb0, 0x04, 0x27, 0x2a, 0xde, 0xca, 0x45, 0xee, - 0x20, 0x13, 0x14, 0x08, 0xa0, 0x68, 0xb9, 0x94, 0x16, 0x69, 0xcb, 0x7f, 0xe7, 0x9c, 0x42, 0x27, - 0x48, 0xa6, 0x26, 0x7b, 0x93, 0x27, 0x39, 0x79, 0xfb, 0xe6, 0xfc, 0xce, 0xf3, 0xfc, 0xff, 0xe7, - 0x79, 0x2a, 0x10, 0xcc, 0x7b, 0xc4, 0xd1, 0xc2, 0x08, 0x71, 0x34, 0x97, 0x2d, 0x91, 0x72, 0xc1, - 0xa2, 0x08, 0xce, 0xc1, 0xf1, 0xe0, 0x27, 0xef, 0x09, 0xde, 0xf0, 0x69, 0x56, 0x98, 0xa9, 0x5a, - 0x14, 0x66, 0x93, 0xf3, 0x83, 0xbc, 0x9f, 0x78, 0xe5, 0x63, 0xd7, 0x68, 0xae, 0xe9, 0xeb, 0x64, - 0x1e, 0x8e, 0xa7, 0x79, 0xb5, 0x73, 0x2c, 0x37, 0x2a, 0x91, 0xf1, 0x3a, 0x71, 0x0c, 0xf7, 0xc8, - 0xe5, 0x88, 0x45, 0xa1, 0x9b, 0x4c, 0xb8, 0xf6, 0xbf, 0x40, 0x2d, 0x72, 0x81, 0x7e, 0xb2, 0xce, - 0x12, 0xba, 0x06, 0xab, 0x39, 0xd1, 0xaa, 0x30, 0x7b, 0x31, 0xe7, 0xc3, 0xd8, 0x58, 0x81, 0xb9, - 0x44, 0xc6, 0x4d, 0x5a, 0x29, 0x2c, 0x61, 0x59, 0x64, 0x8c, 0xcf, 0x0a, 0x2d, 0xb1, 0x2c, 0xc7, - 0x12, 0x04, 0xaa, 0x91, 0x48, 0xf9, 0x6f, 0x5f, 0x07, 0xd2, 0xdf, 0xb7, 0x06, 0x9a, 0x97, 0xce, - 0x89, 0xd6, 0x02, 0xf3, 0xc9, 0xb9, 0x65, 0x93, 0xf1, 0x56, 0xa2, 0x18, 0x4e, 0x4d, 0x01, 0xd6, - 0xc5, 0xd6, 0x70, 0xf8, 0xc3, 0xc1, 0x04, 0x24, 0xef, 0x27, 0x24, 0xd2, 0x4f, 0xf9, 0x37, 0x06, - 0xa9, 0x4a, 0x80, 0x16, 0xdb, 0x85, 0x41, 0x92, 0x48, 0x6e, 0xcb, 0xda, 0x38, 0x7e, 0x94, 0x6e, - 0xec, 0x5d, 0xe5, 0x8d, 0x46, 0x55, 0x23, 0x83, 0x58, 0x93, 0x0c, 0xc5, 0x32, 0x4e, 0x6b, 0xe6, - 0x26, 0x1f, 0x11, 0xb8, 0xc9, 0x0d, 0xaf, 0x84, 0x84, 0xc4, 0x7c, 0x90, 0x6e, 0x08, 0x68, 0x5d, - 0xb9, 0x30, 0x48, 0x14, 0x65, 0x11, 0x6f, 0x9f, 0xc6, 0xeb, 0xe9, 0xe6, 0xe1, 0xca, 0x70, 0xe4, - 0xf7, 0xe4, 0x33, 0x90, 0x4d, 0xb6, 0x10, 0xae, 0x31, 0x5c, 0x83, 0xb9, 0x7b, 0x81, 0xc6, 0xf3, - 0xf4, 0x18, 0xfc, 0xce, 0x4e, 0x99, 0xe2, 0x9b, 0x14, 0x2d, 0x08, 0x08, 0x6f, 0x05, 0x22, 0x9b, - 0xdd, 0xf8, 0xf2, 0x82, 0x90, 0x6d, 0x9e, 0xf9, 0x20, 0x13, 0xb1, 0xf7, 0x63, 0xd9, 0x7a, 0x55, - 0x3a, 0x3f, 0x2d, 0x89, 0xe2, 0x33, 0x28, 0xc8, 0xf7, 0x8c, 0x06, 0x9b, 0xcf, 0xc1, 0x14, 0x9b, - 0xd2, 0xf5, 0x6f, 0x0f, 0x12, 0x45, 0x73, 0xaa, 0xcf, 0xf3, 0x8c, 0x9a, 0xdc, 0x7c, 0x72, 0x13, - 0x5b, 0xab, 0xb7, 0xb2, 0xf5, 0x9a, 0x04, 0x7e, 0x9c, 0x18, 0x21, 0xf0, 0x7f, 0x01, 0x79, 0xc9, - 0x2c, 0x17, 0x13, 0x1d, 0x5e, 0x58, 0xfe, 0x66, 0x04, 0x0d, 0x4f, 0x0e, 0xc3, 0xf6, 0x77, 0x5b, - 0xb6, 0x76, 0x39, 0xca, 0x8f, 0x89, 0xa2, 0x96, 0xac, 0x7c, 0x19, 0x54, 0x58, 0x0f, 0x84, 0xcb, - 0xf5, 0x88, 0xbf, 0xf2, 0x02, 0x1b, 0x8f, 0x56, 0x63, 0x7c, 0x7c, 0x5c, 0xd4, 0xaa, 0x58, 0xf4, - 0x7a, 0x90, 0x9b, 0x94, 0x73, 0x5f, 0x7f, 0x9c, 0x1b, 0xa1, 0x1b, 0x3b, 0x55, 0x38, 0xa1, 0x5b, - 0xdd, 0x6d, 0xb2, 0x37, 0xbd, 0x4b, 0x2e, 0xb1, 0x16, 0xef, 0xbe, 0x0c, 0x1a, 0xd3, 0x02, 0xd7, - 0x5b, 0xd5, 0x28, 0x2f, 0x2f, 0x47, 0x49, 0x49, 0x09, 0xee, 0xdd, 0xbb, 0x87, 0xce, 0xb2, 0x2f, - 0x0c, 0xaf, 0x05, 0x11, 0x23, 0x44, 0xae, 0x3e, 0x23, 0x9c, 0xa4, 0x9b, 0x07, 0xdf, 0x0e, 0x46, - 0x59, 0x7f, 0x19, 0x03, 0x2d, 0xcb, 0x11, 0x82, 0x94, 0xb4, 0x9b, 0x7e, 0xf3, 0xfd, 0x59, 0xe5, - 0xd4, 0xaf, 0xd5, 0x6a, 0x6c, 0xcb, 0x34, 0x82, 0x6e, 0x29, 0x5b, 0xe0, 0xec, 0xec, 0x8c, 0xa0, - 0xa0, 0x20, 0x6c, 0xd8, 0xb0, 0x01, 0xdd, 0xd7, 0x37, 0x31, 0x90, 0xee, 0xef, 0xef, 0xa0, 0x99, - 0x50, 0x61, 0xba, 0xdd, 0x75, 0x01, 0x50, 0x0c, 0x57, 0x6c, 0x9b, 0x69, 0x34, 0x42, 0x72, 0x5b, - 0x32, 0x92, 0x5a, 0x93, 0xd8, 0xda, 0xf6, 0x1c, 0x0f, 0xd2, 0x2d, 0x0a, 0x46, 0x47, 0x47, 0x8f, - 0x77, 0x74, 0x74, 0x20, 0x3c, 0x3c, 0x1c, 0x55, 0x77, 0x3a, 0x31, 0x36, 0x3e, 0x81, 0x82, 0x82, - 0x02, 0x84, 0x86, 0x86, 0xa2, 0xb3, 0xb3, 0x13, 0x8e, 0x8e, 0x8e, 0x18, 0x78, 0xdc, 0x04, 0xf5, - 0x60, 0x25, 0xf2, 0xf2, 0xf2, 0x10, 0x13, 0x13, 0x03, 0xd5, 0x50, 0x03, 0x81, 0xb9, 0xcc, 0xcf, - 0x88, 0xef, 0x5d, 0x96, 0x6b, 0xd4, 0xa7, 0xbc, 0xbf, 0x1c, 0xfb, 0x6e, 0xed, 0x63, 0xeb, 0xd5, - 0x49, 0xbc, 0x56, 0x71, 0xed, 0x7c, 0x7e, 0x63, 0x63, 0x23, 0x3c, 0x3d, 0x3d, 0x71, 0xe0, 0xc0, - 0x01, 0xb8, 0xba, 0xba, 0x22, 0x20, 0x20, 0x80, 0x65, 0x93, 0x99, 0x99, 0x89, 0x9e, 0x9e, 0x1e, - 0x84, 0x84, 0x84, 0x40, 0x22, 0x91, 0x60, 0xc7, 0x8e, 0x1d, 0x2c, 0x64, 0x32, 0x19, 0x82, 0x83, - 0x83, 0xf1, 0xb4, 0xef, 0x16, 0x01, 0x2d, 0x32, 0x82, 0x68, 0xe3, 0xa4, 0x3a, 0x50, 0x3d, 0xe8, - 0xe6, 0xca, 0x67, 0x4a, 0xa6, 0x13, 0x5d, 0x3b, 0x1f, 0xe7, 0x47, 0xf6, 0x26, 0x7b, 0xf8, 0xd4, - 0xd4, 0xd4, 0xf4, 0x52, 0x40, 0x65, 0x65, 0x25, 0xd3, 0x25, 0x23, 0x23, 0x03, 0x6d, 0x6d, 0x6d, - 0x0c, 0xd2, 0xdf, 0xdf, 0x8f, 0xa1, 0xa1, 0x21, 0xd4, 0xd6, 0xd6, 0x42, 0xa1, 0x50, 0x40, 0xa3, - 0xd1, 0x20, 0x37, 0x37, 0x17, 0x5b, 0xb6, 0x6c, 0x81, 0xba, 0x3d, 0xf4, 0xdf, 0x8c, 0x68, 0x97, - 0xa6, 0x0d, 0x74, 0xb6, 0xdd, 0x98, 0xfa, 0x5c, 0x11, 0xeb, 0x08, 0x53, 0x62, 0xd9, 0xc7, 0x1f, - 0x8c, 0x8d, 0x8d, 0xf9, 0xa7, 0xa5, 0xa5, 0xc1, 0xdf, 0xdf, 0x9f, 0x01, 0x1e, 0x3c, 0x78, 0x60, - 0x82, 0xf4, 0xf5, 0xf5, 0xe1, 0xf9, 0xf3, 0xe7, 0xd4, 0x79, 0xd0, 0x6a, 0xb5, 0xe8, 0xea, 0xea, - 0xc2, 0x9a, 0x35, 0x6b, 0xd0, 0x7e, 0xbf, 0x68, 0xae, 0x46, 0x74, 0x24, 0x38, 0x26, 0xf2, 0xea, - 0xf9, 0xa0, 0xe5, 0x79, 0x56, 0xd8, 0x9f, 0xbe, 0x49, 0x45, 0x21, 0x24, 0x6e, 0x53, 0x7d, 0x12, - 0x13, 0x13, 0x4d, 0x90, 0x8b, 0x17, 0x2f, 0xc2, 0xdd, 0xdd, 0x9d, 0xe9, 0x43, 0xcb, 0xd5, 0xd4, - 0x44, 0x34, 0x52, 0xab, 0xa1, 0x52, 0xa9, 0xb0, 0x6b, 0xd7, 0x2e, 0x92, 0x9d, 0x1c, 0xda, 0xc1, - 0x02, 0xf4, 0xd5, 0x1e, 0xd6, 0xcd, 0xcc, 0x20, 0x8b, 0xf3, 0x2b, 0x7f, 0x16, 0x4e, 0xcf, 0x07, - 0x6d, 0x90, 0x4b, 0xf0, 0xf8, 0xf1, 0x63, 0x44, 0x44, 0x44, 0x60, 0xdb, 0xb6, 0x6d, 0x70, 0x70, - 0x70, 0x40, 0x43, 0x43, 0x03, 0x83, 0x54, 0x54, 0x54, 0xc0, 0xdb, 0xc7, 0x07, 0xd2, 0x0b, 0xed, - 0x58, 0xbe, 0xb7, 0x0c, 0xd9, 0xd9, 0xd9, 0xf5, 0xde, 0xde, 0xde, 0xac, 0x84, 0x4f, 0x9f, 0x3e, - 0x45, 0x61, 0x61, 0x21, 0xc4, 0x62, 0x31, 0xd3, 0x31, 0x32, 0x32, 0x12, 0x33, 0x1d, 0x81, 0x6f, - 0xb1, 0xb9, 0x38, 0x17, 0x42, 0x63, 0x6f, 0xfe, 0x66, 0xc3, 0xdd, 0xbb, 0x77, 0xe1, 0xeb, 0xeb, - 0xcb, 0xee, 0x4a, 0x7d, 0x7d, 0x3d, 0x83, 0xd0, 0x52, 0x9d, 0x3c, 0x79, 0x12, 0x31, 0x09, 0xe7, - 0x4d, 0x9d, 0x81, 0x64, 0xf2, 0x55, 0x60, 0x60, 0x20, 0xaa, 0xaa, 0xaa, 0x30, 0x30, 0x30, 0xc0, - 0x0e, 0x48, 0xdd, 0x48, 0x35, 0xa5, 0xc0, 0x05, 0x67, 0xd0, 0x6c, 0x04, 0x5d, 0xf0, 0x53, 0x2b, - 0x95, 0xc4, 0x18, 0x4e, 0x4e, 0xcc, 0x55, 0xa7, 0x4e, 0x9d, 0x62, 0x10, 0x7a, 0x6a, 0xea, 0xb6, - 0x08, 0xe9, 0x11, 0x04, 0x64, 0xe9, 0x40, 0xba, 0x3a, 0xdd, 0x3c, 0xde, 0xcb, 0xcb, 0x0b, 0xf4, - 0x7b, 0x0a, 0xa1, 0xc0, 0x3d, 0x7b, 0xf6, 0xc0, 0xcd, 0xcd, 0x8d, 0x95, 0x57, 0xe0, 0x1a, 0xc1, - 0x59, 0xd3, 0x19, 0x64, 0x55, 0x6c, 0x85, 0xac, 0xae, 0x2c, 0x54, 0x0d, 0x54, 0xc1, 0xb9, 0xd2, - 0x99, 0x81, 0x7c, 0x7f, 0xb0, 0xd1, 0x74, 0xf4, 0x34, 0x9d, 0x20, 0x8e, 0x53, 0x14, 0x15, 0x15, - 0xa9, 0x3c, 0x3c, 0x3c, 0x58, 0x07, 0x78, 0xf6, 0xec, 0x19, 0x06, 0x07, 0x07, 0xe1, 0xe7, 0xe7, - 0x87, 0x48, 0xa9, 0x14, 0x29, 0x3f, 0x9d, 0xc3, 0xce, 0x9d, 0x3b, 0x99, 0xa5, 0x29, 0x84, 0x6a, - 0x48, 0x33, 0x3e, 0x7c, 0xf8, 0x30, 0xba, 0xeb, 0x53, 0xf0, 0xf0, 0xc6, 0x4e, 0x9d, 0x40, 0x2c, - 0xb5, 0xd8, 0x4a, 0x67, 0x10, 0x6d, 0xa0, 0xb3, 0x0f, 0x05, 0xce, 0xcc, 0x20, 0x0d, 0xa9, 0xac, - 0x19, 0x2d, 0x2f, 0xb9, 0xb0, 0x61, 0xa9, 0xa9, 0xa9, 0x38, 0x74, 0xe8, 0x10, 0x88, 0x31, 0x98, - 0xbb, 0xa8, 0x16, 0x59, 0x59, 0x59, 0x88, 0x8b, 0x8b, 0xc3, 0xe5, 0xcb, 0x97, 0xf1, 0xe8, 0xd1, - 0x23, 0x06, 0xa1, 0x77, 0x8e, 0x66, 0xf2, 0xd7, 0xd5, 0x72, 0x32, 0xfc, 0x6c, 0x8c, 0xae, 0x13, - 0xcb, 0x2c, 0x12, 0x56, 0xa5, 0xf1, 0x06, 0xbb, 0x32, 0x3b, 0x0c, 0x6a, 0x07, 0xa1, 0x9f, 0xd6, - 0x23, 0xe4, 0x4e, 0x88, 0x71, 0x06, 0x45, 0x73, 0xf5, 0xb3, 0x17, 0x9a, 0x38, 0x49, 0x4e, 0xbb, - 0x00, 0x2d, 0x1f, 0x85, 0x4c, 0x4c, 0x4c, 0x60, 0x64, 0x64, 0x04, 0xc3, 0xc3, 0xc3, 0x4c, 0x93, - 0xde, 0xde, 0x5e, 0x06, 0xa9, 0xab, 0xab, 0x63, 0x59, 0x1f, 0x3b, 0x76, 0x8c, 0x5d, 0x05, 0x6d, - 0x4f, 0x9c, 0x11, 0x24, 0x3a, 0xc2, 0x9b, 0x66, 0xd0, 0xf2, 0xd2, 0xe5, 0xb0, 0x2f, 0xb3, 0x9f, - 0x99, 0x41, 0xc2, 0x69, 0xd2, 0x2d, 0xd2, 0x29, 0x84, 0x64, 0x10, 0x94, 0x9f, 0x9f, 0xcf, 0x6a, - 0xfd, 0xe4, 0xc9, 0x13, 0x06, 0xa3, 0xc2, 0x97, 0x96, 0x96, 0xb2, 0x3b, 0x43, 0x21, 0xd4, 0x34, - 0x49, 0x49, 0x49, 0xac, 0x3b, 0xd0, 0xde, 0x97, 0x93, 0x93, 0xc3, 0x6c, 0x7f, 0xe3, 0xfa, 0x55, - 0xb4, 0x15, 0x7f, 0xf8, 0x82, 0xcd, 0xa0, 0x15, 0xbf, 0x08, 0x61, 0x2d, 0x17, 0xce, 0x31, 0xc2, - 0xda, 0x04, 0xe1, 0x38, 0xe9, 0x16, 0x01, 0x14, 0x44, 0x4e, 0xff, 0x11, 0x39, 0x79, 0x5b, 0x58, - 0x58, 0x18, 0x33, 0x46, 0x04, 0xb1, 0x6b, 0x5e, 0x5e, 0x3e, 0x3b, 0xf1, 0xf6, 0xed, 0x3b, 0x58, - 0x26, 0xbb, 0x77, 0xef, 0x06, 0xfd, 0xbd, 0xe6, 0x5a, 0x09, 0x12, 0xe2, 0xe3, 0x60, 0x67, 0x67, - 0x47, 0xca, 0x7a, 0x01, 0x53, 0x0f, 0x0f, 0xce, 0x94, 0x2e, 0x9a, 0x4b, 0x21, 0x93, 0x55, 0x29, - 0x8e, 0xe2, 0x26, 0x08, 0x54, 0xe3, 0x74, 0x82, 0x1f, 0xb5, 0x4f, 0xe5, 0xf5, 0xa2, 0x23, 0xf4, - 0xcf, 0xc8, 0x92, 0x15, 0xb3, 0xa5, 0x23, 0xb7, 0x7e, 0xf1, 0xf5, 0x86, 0x5e, 0xc3, 0xa5, 0xd2, - 0x1a, 0xec, 0xbf, 0x64, 0x40, 0x68, 0xae, 0x01, 0xb7, 0x9b, 0x07, 0xb0, 0x6e, 0xdd, 0x3a, 0xa6, - 0xc9, 0xfa, 0xf5, 0xeb, 0xd1, 0x76, 0x3b, 0x7e, 0x5a, 0xdf, 0xb8, 0x14, 0xfa, 0x0e, 0x3f, 0x74, - 0xb5, 0xfc, 0x89, 0xa9, 0xee, 0x43, 0x0b, 0x4f, 0x58, 0x4f, 0xa9, 0x85, 0x05, 0xd1, 0xcc, 0x4f, - 0x24, 0xe3, 0x8e, 0x93, 0x6c, 0xae, 0x78, 0x85, 0x59, 0xbe, 0xf3, 0xf2, 0xef, 0xef, 0xfb, 0x5e, - 0x56, 0x9b, 0x7b, 0x28, 0x0c, 0x66, 0xee, 0xc6, 0xf8, 0x51, 0xde, 0x32, 0xed, 0x43, 0x2e, 0x2d, - 0x3d, 0xfd, 0xc6, 0x8d, 0x1b, 0xd1, 0x5d, 0xed, 0xa7, 0x6f, 0x2e, 0x30, 0xd3, 0x19, 0xc3, 0x5c, - 0x67, 0x5a, 0xcb, 0x05, 0xf8, 0x07, 0xfc, 0x4b, 0xc4, 0xf7, 0xc2, 0x63, 0xf9, 0xc0, 0x00, 0x00, - 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x04, 0x1f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x6d, 0x68, 0x5b, + 0x55, 0x18, 0xc7, 0x6f, 0x07, 0xbe, 0x7d, 0x16, 0x3f, 0x29, 0x26, 0xe7, 0xdc, 0x98, 0x38, 0xbb, + 0xa6, 0x79, 0xbb, 0x79, 0x59, 0x8a, 0x6d, 0x73, 0x93, 0xb2, 0x0d, 0x07, 0x9b, 0xa2, 0xfd, 0xa0, + 0xe0, 0x94, 0x51, 0xd8, 0x07, 0x3f, 0xe8, 0xa0, 0xcb, 0x5b, 0x25, 0x58, 0x14, 0x8b, 0xa3, 0xdd, + 0x0b, 0x56, 0x6b, 0xd5, 0x56, 0xed, 0xd4, 0xa6, 0xa3, 0xae, 0xea, 0xb2, 0xa9, 0x34, 0xe8, 0x70, + 0xa8, 0x10, 0xd8, 0x9c, 0x4d, 0xb7, 0xa9, 0xd0, 0x56, 0x19, 0x6e, 0xba, 0xd9, 0x97, 0x35, 0x49, + 0x4d, 0x6e, 0xee, 0xe3, 0x39, 0xe7, 0xee, 0xc6, 0xbc, 0x4d, 0xdb, 0x9a, 0x0b, 0x7f, 0xce, 0xc3, + 0x4d, 0xf2, 0xfc, 0x72, 0xce, 0xf3, 0xdc, 0xff, 0x73, 0x39, 0xae, 0xec, 0x12, 0x43, 0x7c, 0xa7, + 0x18, 0x42, 0xc3, 0x5e, 0x3f, 0xea, 0xf0, 0x74, 0x22, 0xbb, 0xeb, 0xd9, 0x7b, 0xee, 0xe0, 0x56, + 0x71, 0x25, 0x06, 0xb8, 0x5b, 0xa6, 0xa2, 0x5c, 0x2a, 0x39, 0x56, 0xb7, 0x52, 0xae, 0xa9, 0x68, + 0x5d, 0xaa, 0xe2, 0x07, 0xad, 0x21, 0xf4, 0x83, 0xa3, 0x0f, 0x83, 0x6b, 0x3f, 0x5e, 0x6e, 0x8e, + 0xa0, 0x45, 0x6f, 0x00, 0xe7, 0xc4, 0x30, 0x9a, 0x6b, 0xe9, 0xd2, 0x8e, 0xfb, 0x02, 0xbc, 0xfb, + 0x66, 0xa0, 0x64, 0x94, 0xbb, 0x95, 0x80, 0x20, 0x7b, 0x56, 0x0f, 0xb9, 0x32, 0x91, 0xcf, 0xe4, + 0x92, 0x2f, 0x47, 0x22, 0xdc, 0x06, 0x6f, 0x00, 0xad, 0xe8, 0xc7, 0x74, 0xa0, 0x3b, 0xa6, 0xe8, + 0xbe, 0x71, 0x1d, 0xd4, 0x8f, 0xe8, 0x80, 0x40, 0xd3, 0x5e, 0x3f, 0x7e, 0xe4, 0xbf, 0x40, 0xf2, + 0xd4, 0x46, 0x80, 0xa9, 0x07, 0x4a, 0x54, 0x01, 0x12, 0x03, 0x58, 0xef, 0x09, 0xa3, 0x65, 0x0a, + 0x30, 0x4c, 0x18, 0xc0, 0x7e, 0xc2, 0x5e, 0x00, 0x92, 0xfb, 0x29, 0xaf, 0xff, 0x5e, 0xbc, 0x6a, + 0xd0, 0xfc, 0xc7, 0x00, 0x49, 0x53, 0x75, 0x90, 0x77, 0x1f, 0x7a, 0xcc, 0xfd, 0x12, 0x5e, 0xa4, + 0x89, 0xb7, 0xc5, 0xb7, 0xc1, 0xb9, 0xf9, 0x73, 0x0c, 0x62, 0x20, 0x3b, 0x14, 0x03, 0x28, 0xc3, + 0x79, 0x47, 0xf3, 0x9c, 0x2f, 0x5a, 0xa1, 0x3a, 0xdf, 0xd8, 0x42, 0x05, 0x28, 0x77, 0x05, 0x60, + 0xda, 0x52, 0x1d, 0xe4, 0x09, 0x6a, 0x5f, 0x16, 0x0e, 0x63, 0x89, 0x26, 0xdf, 0x9b, 0xd8, 0x0b, + 0xa3, 0xb3, 0xa3, 0x0c, 0xd4, 0x30, 0xcc, 0x43, 0x6b, 0x18, 0x9d, 0xe5, 0xbc, 0x51, 0xd8, 0x7e, + 0x30, 0x03, 0x3b, 0x5e, 0xcd, 0x16, 0xb4, 0x65, 0xff, 0x12, 0x6c, 0x68, 0x3b, 0x9a, 0x5e, 0x13, + 0x88, 0x24, 0xfb, 0xda, 0xf8, 0x36, 0xcf, 0x92, 0x0f, 0xfe, 0x34, 0x08, 0x91, 0xef, 0x23, 0x2c, + 0xb6, 0xf6, 0x63, 0xd9, 0x1b, 0xc4, 0xaf, 0x51, 0xd0, 0xc3, 0xfd, 0x12, 0x3c, 0x3a, 0x00, 0x05, + 0x3d, 0x74, 0x20, 0xbd, 0x76, 0x90, 0x27, 0x84, 0xe6, 0xef, 0xff, 0x50, 0xa9, 0xc9, 0xe9, 0xdf, + 0x4f, 0x43, 0xfb, 0xa9, 0x76, 0x16, 0x6f, 0xee, 0xc1, 0xd7, 0x49, 0x23, 0x3c, 0x5d, 0x13, 0xd0, + 0xd6, 0x80, 0xee, 0x2e, 0x52, 0x87, 0xbf, 0x74, 0x1f, 0x29, 0xa0, 0xab, 0x2b, 0x57, 0xc1, 0xf4, + 0xa9, 0x89, 0xc5, 0x2d, 0xcf, 0xe3, 0x25, 0x4f, 0x50, 0x63, 0x29, 0x06, 0x8d, 0x9f, 0x59, 0x27, + 0xc8, 0xe7, 0x47, 0x6d, 0x0f, 0x76, 0xa3, 0x05, 0x9a, 0xb8, 0xe9, 0xb3, 0x26, 0x98, 0x59, 0x9e, + 0x29, 0xb4, 0x37, 0x7d, 0x96, 0x5a, 0x22, 0xda, 0xdb, 0x8b, 0x41, 0x4b, 0x99, 0x75, 0x82, 0x48, + 0x23, 0xec, 0x73, 0x1e, 0xe0, 0x57, 0x68, 0xf2, 0x8e, 0x6f, 0x3b, 0x20, 0x76, 0x29, 0xc6, 0x40, + 0xf5, 0x23, 0x3c, 0x90, 0x23, 0x9d, 0x51, 0xda, 0xb2, 0x16, 0xa0, 0x30, 0x9a, 0x30, 0x0d, 0x2a, + 0x8d, 0xd0, 0x77, 0xbe, 0x0f, 0x7a, 0xa7, 0x7b, 0x59, 0x6c, 0x1a, 0xc0, 0x40, 0xdc, 0xe2, 0x68, + 0xed, 0x40, 0x41, 0xfc, 0x6b, 0xfd, 0x11, 0xa5, 0x3e, 0x27, 0x2f, 0x9d, 0x84, 0xdd, 0xdf, 0xec, + 0x66, 0xb1, 0xb3, 0x17, 0x67, 0xc8, 0x83, 0xfc, 0x5c, 0x4d, 0x40, 0xd4, 0x38, 0x69, 0x1d, 0x68, + 0x3d, 0x68, 0xf2, 0xc4, 0xb5, 0x04, 0xab, 0x13, 0x8d, 0x9b, 0xbb, 0xf1, 0x82, 0x18, 0xd4, 0xb4, + 0xd2, 0xef, 0xbd, 0xfb, 0xc5, 0x2c, 0x7c, 0x75, 0x51, 0x86, 0x53, 0x3f, 0x02, 0x64, 0x25, 0x60, + 0x6b, 0xfc, 0xbc, 0x04, 0xef, 0xc7, 0x7f, 0x91, 0x20, 0x2f, 0x1d, 0x99, 0x9f, 0x7d, 0x4f, 0x71, + 0x04, 0x2a, 0x99, 0xfc, 0x93, 0x85, 0xe3, 0x2c, 0xa6, 0xf7, 0x95, 0xdd, 0x10, 0x97, 0xa6, 0x06, + 0xaa, 0xda, 0x4d, 0xc1, 0xe7, 0x8e, 0x31, 0x47, 0xc8, 0x8a, 0x81, 0xbb, 0xef, 0x54, 0x41, 0x3b, + 0xdb, 0x77, 0x81, 0x4d, 0x70, 0x80, 0xc3, 0xe1, 0x00, 0xab, 0xcd, 0xce, 0x62, 0xab, 0x4d, 0x00, + 0x8b, 0xc5, 0x22, 0xd9, 0xed, 0x56, 0x70, 0x10, 0x59, 0xad, 0x66, 0xb2, 0xda, 0x58, 0xbc, 0xeb, + 0x89, 0xed, 0xff, 0x80, 0xe8, 0x48, 0x70, 0xbd, 0x82, 0x97, 0xcb, 0x41, 0x1b, 0x3f, 0xe0, 0x41, + 0x0c, 0xe1, 0x3f, 0xd4, 0xe3, 0xa5, 0x20, 0xbb, 0x73, 0x33, 0x7c, 0x79, 0x21, 0xcf, 0x76, 0x64, + 0x77, 0xb8, 0x60, 0x32, 0x99, 0x85, 0xe1, 0xd8, 0x45, 0xc9, 0xed, 0x76, 0xa7, 0xd5, 0x1d, 0xb9, + 0x9c, 0x02, 0xe4, 0xaf, 0x4d, 0x14, 0xe2, 0x02, 0x48, 0x0c, 0x69, 0xdf, 0xb2, 0xbc, 0xce, 0xcb, + 0xe5, 0xa0, 0xc6, 0x37, 0x49, 0xc7, 0x75, 0xe1, 0x78, 0x35, 0xd0, 0x95, 0xa5, 0x75, 0x80, 0x3c, + 0x21, 0x9c, 0x6c, 0x78, 0xa7, 0x14, 0x42, 0x25, 0x1c, 0x42, 0x92, 0xe8, 0x47, 0x2f, 0x14, 0x83, + 0x4c, 0x26, 0x33, 0x3b, 0x2e, 0x2a, 0xa3, 0xd1, 0xc8, 0x56, 0x8b, 0x55, 0x60, 0xb1, 0x7a, 0x74, + 0x46, 0x63, 0x03, 0x5b, 0xa9, 0xcc, 0x66, 0x93, 0x02, 0xaa, 0x36, 0x83, 0x54, 0x35, 0xbd, 0x88, + 0x17, 0x7d, 0x7e, 0xcd, 0xce, 0x6a, 0x3b, 0xa2, 0x8d, 0xb0, 0xa6, 0x1d, 0xb5, 0x76, 0x22, 0x03, + 0x9d, 0x41, 0xfa, 0x09, 0x3d, 0x0c, 0xfd, 0x3c, 0x04, 0xf1, 0xdf, 0xe2, 0xd0, 0xfc, 0x79, 0xb3, + 0x32, 0x83, 0x42, 0x28, 0xdd, 0x16, 0xd6, 0xa0, 0x9b, 0x81, 0x04, 0xbb, 0x13, 0x26, 0xa7, 0x73, + 0x30, 0x7c, 0xa2, 0x14, 0xe4, 0x74, 0xd8, 0x40, 0xfe, 0xb3, 0x0c, 0x24, 0xfa, 0xb5, 0xed, 0x74, + 0x06, 0x51, 0x03, 0x55, 0x2f, 0x0a, 0xbc, 0x31, 0x83, 0xd2, 0x24, 0x7f, 0x5d, 0x6d, 0x40, 0x01, + 0x6d, 0x8f, 0xf5, 0x30, 0xce, 0xdb, 0x62, 0x36, 0xb8, 0x9c, 0xb9, 0x0c, 0x92, 0x2c, 0xc1, 0x9e, + 0xef, 0xf6, 0x28, 0x33, 0x28, 0x84, 0xce, 0x14, 0xbb, 0xfb, 0xff, 0x02, 0x91, 0xae, 0x2a, 0xcc, + 0xa0, 0x4d, 0x9f, 0x6c, 0x02, 0x21, 0x26, 0xdc, 0x98, 0x41, 0xbc, 0x4c, 0xdc, 0xa2, 0x7f, 0x35, + 0xa0, 0xa1, 0xd8, 0x05, 0x0a, 0x4a, 0xfd, 0x3b, 0x88, 0xcc, 0x20, 0xf3, 0x1b, 0x3c, 0x18, 0xa2, + 0x7c, 0x49, 0x23, 0xb8, 0x7b, 0xf8, 0xeb, 0xc4, 0x2d, 0x9e, 0xaa, 0x19, 0x88, 0xbc, 0xc3, 0x1d, + 0x24, 0x93, 0x35, 0x21, 0x06, 0x51, 0x8a, 0x16, 0x9f, 0x76, 0x9a, 0x70, 0x08, 0x4b, 0x9e, 0x2e, + 0xfa, 0x32, 0xa2, 0x31, 0x97, 0x83, 0x54, 0x67, 0x28, 0x69, 0x6f, 0xe2, 0x0c, 0x8d, 0x8d, 0x8d, + 0xb2, 0xbd, 0xa8, 0xa5, 0xd5, 0xf6, 0x7e, 0xf2, 0xf1, 0x22, 0x67, 0x50, 0xaf, 0x2d, 0x7e, 0xad, + 0x96, 0xd4, 0x6c, 0x87, 0x27, 0x80, 0xba, 0xc9, 0x6e, 0x8e, 0x6f, 0x7d, 0x46, 0x77, 0x5b, 0x39, + 0x68, 0x64, 0x72, 0x4e, 0x2e, 0x17, 0xf1, 0xba, 0x9c, 0xea, 0x75, 0xf3, 0x73, 0x23, 0x72, 0x85, + 0xc8, 0xfd, 0xbf, 0x01, 0xf5, 0x7c, 0x68, 0xbb, 0xcd, 0x94, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE library_table_xpm[1] = {{ png, sizeof( png ), "library_table_xpm" }}; diff --git a/bitmaps_png/cpp_26/move_zone.cpp b/bitmaps_png/cpp_26/move_zone.cpp deleted file mode 100644 index 3b5264a..0000000 --- a/bitmaps_png/cpp_26/move_zone.cpp +++ /dev/null @@ -1,67 +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, 0x03, 0x20, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x6f, 0x48, 0x13, - 0x61, 0x1c, 0xc7, 0x9f, 0xa8, 0xde, 0x89, 0x41, 0x2f, 0xec, 0xee, 0x36, 0xe7, 0x2c, 0x50, 0xc1, - 0x20, 0xc2, 0x7c, 0x13, 0x51, 0x6a, 0x6e, 0xb7, 0x99, 0x95, 0x53, 0x87, 0xae, 0xa2, 0x7a, 0x63, - 0x41, 0x6a, 0x21, 0x2b, 0x33, 0xa2, 0x79, 0x37, 0xb1, 0x22, 0x7a, 0xe5, 0x8b, 0xac, 0x40, 0xfc, - 0x33, 0xff, 0xec, 0xb6, 0xd2, 0x9c, 0x63, 0xf9, 0x2f, 0xff, 0x67, 0xd9, 0x3f, 0xf2, 0x4f, 0x84, - 0x20, 0x94, 0xbe, 0x8c, 0xac, 0x20, 0x4b, 0x4a, 0xe8, 0xfa, 0xde, 0xb9, 0x99, 0x90, 0xa2, 0xdb, - 0xac, 0x83, 0x0f, 0xcf, 0x3d, 0xcf, 0xdd, 0xfd, 0x3e, 0xf7, 0x7b, 0x9e, 0xdf, 0xb3, 0x1d, 0x21, - 0xff, 0xf5, 0xe0, 0x88, 0x8a, 0xf0, 0xc4, 0xec, 0x37, 0x16, 0xc0, 0x91, 0xd0, 0xd5, 0x8b, 0x2c, - 0x24, 0x17, 0x0f, 0xb4, 0x93, 0x62, 0x72, 0xdf, 0x4f, 0xfa, 0xf1, 0x5c, 0x82, 0xbf, 0xa2, 0x07, - 0xa0, 0xca, 0x8b, 0x0d, 0x34, 0xcb, 0xc1, 0xfe, 0x8c, 0xfd, 0x4d, 0x31, 0x69, 0x0b, 0x4c, 0xc4, - 0xcb, 0x01, 0x5a, 0x41, 0x35, 0x38, 0x85, 0xfe, 0x45, 0x39, 0x53, 0x6e, 0x19, 0x61, 0x10, 0xa2, - 0xf6, 0x50, 0x3e, 0x94, 0xe5, 0x38, 0xee, 0x1a, 0x78, 0x01, 0x3c, 0x96, 0x52, 0x4b, 0x22, 0xae, - 0xd9, 0xa5, 0x6b, 0x40, 0x7a, 0x89, 0x87, 0xde, 0x17, 0x0a, 0x58, 0xe4, 0x01, 0xb7, 0x11, 0xfc, - 0x26, 0x10, 0xc1, 0x04, 0xf8, 0x0a, 0x66, 0xf2, 0xb8, 0xbc, 0x18, 0x62, 0x25, 0x71, 0x32, 0x3c, - 0x29, 0x00, 0x9e, 0x60, 0x44, 0x4f, 0x41, 0x2a, 0x02, 0xbf, 0x07, 0x2f, 0xa5, 0x61, 0x9e, 0xe7, - 0x35, 0x5e, 0xa9, 0x8f, 0xb9, 0x22, 0xae, 0x68, 0x2b, 0x44, 0x9d, 0x81, 0x8b, 0x8a, 0xc9, 0x63, - 0x04, 0x38, 0x8a, 0x60, 0xa3, 0x60, 0xaa, 0xa4, 0xa4, 0x24, 0x1a, 0x6d, 0x91, 0x57, 0x30, 0x04, - 0x9a, 0xbc, 0xe7, 0x65, 0xb8, 0x3f, 0x07, 0x82, 0x96, 0x40, 0x33, 0x72, 0x49, 0xd3, 0xc7, 0x59, - 0xb9, 0x93, 0x08, 0xf6, 0x6b, 0x51, 0x16, 0xe3, 0x51, 0xd6, 0xa8, 0x1d, 0xe4, 0x2a, 0x89, 0xc2, - 0x79, 0x27, 0x98, 0xcd, 0xe7, 0xf2, 0x95, 0xb8, 0xb7, 0x23, 0xf0, 0x62, 0xe0, 0x88, 0x1b, 0x94, - 0x9b, 0x39, 0xf3, 0x1e, 0x04, 0x2c, 0x01, 0x67, 0x23, 0xac, 0x11, 0x3b, 0x31, 0x36, 0x00, 0x1a, - 0x31, 0x95, 0xac, 0x57, 0xce, 0xe3, 0x99, 0x73, 0x10, 0x3d, 0x0f, 0x66, 0x1f, 0x35, 0x7a, 0xd7, - 0xa0, 0x01, 0x81, 0x9a, 0xd0, 0x76, 0xa1, 0x5f, 0x2b, 0xb7, 0xa5, 0x64, 0x3b, 0x24, 0xaf, 0xc0, - 0xb4, 0x91, 0x33, 0x6e, 0xc6, 0xd8, 0xa4, 0x24, 0xd2, 0xd5, 0x86, 0xc7, 0xb3, 0x02, 0x65, 0x0e, - 0x64, 0xc3, 0x2e, 0x45, 0x9d, 0x54, 0xe6, 0xc8, 0x4a, 0x5a, 0x47, 0x11, 0x6d, 0x3e, 0xfa, 0x85, - 0x31, 0xe5, 0x9b, 0x72, 0x52, 0x5b, 0x14, 0x93, 0xe9, 0xbd, 0xaa, 0xcf, 0xac, 0x93, 0xb1, 0xae, - 0x85, 0x48, 0xaa, 0xb2, 0xee, 0x90, 0xeb, 0x21, 0xb1, 0xde, 0xca, 0x7c, 0xa7, 0xaf, 0x51, 0xee, - 0x3b, 0xe0, 0x52, 0x4c, 0x9a, 0x46, 0x23, 0x45, 0xd3, 0x58, 0xa4, 0x68, 0xe8, 0x0b, 0x9f, 0xd6, - 0x3b, 0x18, 0x4b, 0xf0, 0xa2, 0xf9, 0xac, 0x6a, 0x91, 0x8d, 0xf9, 0x0a, 0x7f, 0x59, 0x34, 0x54, - 0xc6, 0xba, 0x75, 0x02, 0xdd, 0x93, 0x31, 0xa0, 0x9a, 0xcd, 0x86, 0x8c, 0xb5, 0x33, 0x13, 0xac, - 0x40, 0xdf, 0x4b, 0xaa, 0x0a, 0xdb, 0xb6, 0xdc, 0xaf, 0xf7, 0x19, 0xac, 0xc3, 0x80, 0xbc, 0xf3, - 0x57, 0x82, 0x23, 0x6f, 0xf7, 0xde, 0x8d, 0x3c, 0x64, 0xac, 0xd8, 0x35, 0x82, 0xac, 0x62, 0xf6, - 0x57, 0x52, 0xf1, 0xe9, 0xfd, 0xaa, 0x19, 0xd3, 0x08, 0x44, 0x4e, 0xa6, 0x42, 0x0a, 0xa7, 0xb1, - 0x31, 0x26, 0x9d, 0x83, 0x29, 0x5a, 0x4a, 0x14, 0xb2, 0xb0, 0xf3, 0x57, 0x20, 0xfa, 0x56, 0xe8, - 0xb1, 0x14, 0x97, 0x62, 0x8a, 0x75, 0x30, 0x83, 0xc9, 0xd5, 0x5b, 0x92, 0x35, 0x35, 0x54, 0xee, - 0x82, 0xa8, 0x9e, 0x6e, 0x95, 0xc6, 0xb4, 0x36, 0xea, 0x46, 0xaa, 0x5b, 0x31, 0xa3, 0x5d, 0x52, - 0xb6, 0x8a, 0x43, 0xeb, 0xa0, 0xe3, 0x52, 0x9a, 0x15, 0x53, 0xd9, 0xa3, 0x6a, 0x31, 0xf3, 0x49, - 0x84, 0x98, 0x31, 0xa8, 0x92, 0xc9, 0x7a, 0xad, 0x96, 0xd7, 0xc8, 0xd7, 0x97, 0xc8, 0x1e, 0x56, - 0x8b, 0x87, 0xbb, 0xc2, 0x3f, 0x21, 0xcb, 0x42, 0xff, 0x45, 0x02, 0x75, 0x3e, 0xed, 0x51, 0xf8, - 0xb4, 0x14, 0x34, 0x6b, 0x38, 0x12, 0xc1, 0xe6, 0xf1, 0x15, 0x43, 0xf6, 0xe2, 0xb1, 0x31, 0xb5, - 0x68, 0x7c, 0xa6, 0x9a, 0xc3, 0x14, 0xb6, 0x05, 0x94, 0x15, 0x16, 0xff, 0x12, 0x64, 0x1f, 0x75, - 0x02, 0x33, 0xae, 0x17, 0x98, 0x32, 0xb6, 0x81, 0x11, 0x30, 0x75, 0xdf, 0xe5, 0xa9, 0xb3, 0xd3, - 0x6f, 0xe4, 0x31, 0x3b, 0xdd, 0x61, 0xe8, 0x51, 0xce, 0xe9, 0x9d, 0xb4, 0x27, 0xee, 0x0e, 0xd9, - 0x18, 0xf0, 0x3f, 0xbf, 0xce, 0x41, 0x5d, 0xd0, 0xda, 0x29, 0x97, 0x74, 0xbe, 0x54, 0x31, 0xb0, - 0x75, 0xd4, 0x71, 0xc8, 0xba, 0x13, 0xba, 0xc9, 0x86, 0xa0, 0x3f, 0x33, 0x12, 0x6d, 0x4c, 0x74, - 0x72, 0x0d, 0x73, 0x44, 0x53, 0x4b, 0xf1, 0x10, 0x7d, 0x93, 0x44, 0xda, 0x06, 0xba, 0x4f, 0x5b, - 0x4f, 0x9d, 0x48, 0xb2, 0x85, 0xed, 0x36, 0x3a, 0xc8, 0xfa, 0x35, 0xfb, 0xa6, 0xd1, 0x0a, 0x8a, - 0x82, 0x83, 0x1e, 0xe5, 0x17, 0xdf, 0x3a, 0x19, 0x7a, 0x55, 0x3f, 0x75, 0x76, 0xba, 0x6d, 0x4d, - 0x25, 0x0b, 0xd3, 0xe8, 0x54, 0x9c, 0x4e, 0xeb, 0x52, 0x7e, 0xc8, 0x1c, 0x8a, 0xf8, 0xa1, 0x73, - 0x32, 0x02, 0x11, 0xc9, 0xba, 0x7f, 0xf6, 0xb5, 0xa6, 0x47, 0x35, 0xb2, 0x02, 0xe3, 0xfe, 0x27, - 0x99, 0xf8, 0x7b, 0xfc, 0x06, 0x1d, 0x0a, 0x05, 0xa9, 0x58, 0x12, 0x74, 0x3b, 0x00, 0x00, 0x00, - 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; - -const BITMAP_OPAQUE move_zone_xpm[1] = {{ png, sizeof( png ), "move_zone_xpm" }}; - -//EOF diff --git a/bitmaps_png/sources/library_table.svg b/bitmaps_png/sources/library_table.svg index 6d15c72..ae75154 100644 --- a/bitmaps_png/sources/library_table.svg +++ b/bitmaps_png/sources/library_table.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -37,15 +36,15 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="717" + inkscape:window-width="1920" + inkscape:window-height="1054" id="namedview164" showgrid="true" - inkscape:zoom="9.8333331" - inkscape:cx="-6.2708642" - inkscape:cy="5.0026912" + inkscape:zoom="27.812866" + inkscape:cx="4.5228891" + inkscape:cy="6.3158472" inkscape:window-x="0" - inkscape:window-y="1080" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg2" inkscape:snap-to-guides="false" @@ -59,63 +58,13 @@ snapvisiblegridlinesonly="true" /> </sodipodi:namedview> <defs - id="defs4"> - <linearGradient - id="linearGradient4067" - y2="39.685001" - gradientUnits="userSpaceOnUse" - x2="34.534" - gradientTransform="matrix(1.2419,0,0,1.2419,36.866,-2.4533)" - y1="12.285" - x1="14.463"> - <stop - stop-color="#c9c9c9" - offset="0" - id="stop4069" /> - <stop - stop-color="#f8f8f8" - offset="0.44999999" - id="stop4071" /> - <stop - stop-color="#e2e2e2" - offset="0.66666645" - id="stop4073" /> - <stop - stop-color="#b0b0b0" - offset="0.95000005" - id="stop4075" /> - <stop - stop-color="#c9c9c9" - offset="1" - id="stop4077" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4067" - id="linearGradient4065-6" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.41988577,0,0,0.39843198,7.8117183,8.6700884)" - x1="8.6861582" - y1="9.6206512" - x2="37.265358" - y2="35.973965" /> - <linearGradient - y2="35.973965" - x2="37.265358" - y1="9.6206512" - x1="8.6861582" - gradientTransform="matrix(0.44317725,0,0,0.4205334,7.1871633,8.053144)" - gradientUnits="userSpaceOnUse" - id="linearGradient3178" - xlink:href="#linearGradient4067" - inkscape:collect="always" /> - </defs> + id="defs4" /> <rect style="opacity:1;fill:#ffd42a;fill-opacity:1;fill-rule:nonzero;stroke:#d4aa00;stroke-width:1.03579581;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect4298" width="6.0397334" height="24.979227" - x="19.546684" + x="19.495834" y="0.57575929" /> <rect style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" @@ -129,21 +78,23 @@ id="rect4298-3" width="5.9002724" height="21.007425" - x="11.58192" + x="11.518362" y="4.5346904" /> <rect + style="opacity:0.63899997;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1" + id="rect4229-9" + width="15.069407" + height="13.007339" + x="11.00592" + y="13.001397" + ry="0" /> + <rect style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect4300-56" width="0.920017" height="8.2753372" x="14.077197" y="8.429553" /> - <circle - style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.0999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path4208" - cx="22.558912" - cy="21.779465" - r="1.4022287" /> <rect style="opacity:1;fill:#24b024;fill-opacity:1;fill-rule:nonzero;stroke:#447821;stroke-width:1.01576376;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect4298-7" @@ -168,25 +119,37 @@ transform="matrix(0.99865271,-0.05189193,0.0500435,0.99874704,0,0)" rx="1.455725" ry="1.4720935" /> - <circle - style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.0999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path4208-6" - cx="14.541045" - cy="21.887325" - r="1.4022287" /> - <g - id="g4323" - transform="translate(0.61016952,0.5084746)"> - <path - sodipodi:nodetypes="ccccccccccccsccccccccsccccccccsccccccccscccccsssscc" - inkscape:connector-curvature="0" - id="path4079" - d="m 16.163478,9.0773048 c -0.180194,0.01172 -0.355335,0.03818 -0.532326,0.0574 l -0.01216,0 -0.423461,2.1927272 c -0.690163,0.149147 -1.339483,0.402267 -1.923649,0.746194 l -1.224661,-0.836317 -0.67462,-0.460698 c -0.513744,0.378239 -0.980642,0.819445 -1.3914017,1.297386 l 1.3186927,1.825329 c -0.400388,0.580621 -0.701509,1.243603 -0.871079,1.940128 -2.9e-5,0.0032 -2.4e-5,0.01099 0,0.01145 l -2.2986767,0.344407 c -0.04202,0.325716 -0.06048,0.662322 -0.06048,0.998792 0,0.275265 0.008,0.546859 0.0363,0.815109 l 2.2986747,0.390322 c 0.163484,0.757472 0.474059,1.464871 0.907393,2.089392 l -1.3670887,1.779443 c 0.3915197,0.461226 0.8435517,0.881161 1.3308137,1.251319 l 1.93573,-1.262818 c 0.6765,0.409502 1.431706,0.69667 2.250287,0.838034 l 0.36295,2.169733 c 0.257909,0.02228 0.522376,0.02296 0.786371,0.02296 0.372697,0 0.728689,-0.01334 1.088849,-0.0574 l 0.435542,-2.215654 c 0.777233,-0.183536 1.507352,-0.501932 2.141381,-0.929875 l 1.86314,1.285778 c 0.48316,-0.390069 0.92501,-0.838438 1.30662,-1.320238 l -1.355012,-1.859785 c 0.366957,-0.601377 0.621214,-1.264876 0.750096,-1.974588 l 2.286485,-0.344221 c 0.02004,-0.226359 0.02419,-0.445952 0.02419,-0.677282 0,-0.401971 -0.04924,-0.796118 -0.108873,-1.182475 l -2.322872,-0.401828 c -0.182034,-0.637822 -0.480721,-1.232917 -0.859001,-1.767948 l 1.367091,-1.779409 C 22.805172,11.571476 22.322014,11.117045 21.7893,10.731458 l -1.972045,1.285778 c -0.566781,-0.318081 -1.17673,-0.562144 -1.838944,-0.700273 L 17.61555,9.1358088 c -0.330624,-0.03688 -0.663573,-0.05742 -1.00426,-0.05742 -0.0921,0 -0.186869,-0.0029 -0.278262,0 -0.04455,0.0014 -0.08864,-0.0025 -0.133085,0 -0.01201,6.52e-4 -0.02429,-7.46e-4 -0.0363,0 z m 0.314556,5.5791742 c 0.0442,-0.0021 0.08833,0 0.133086,0 1.432093,0 2.601158,1.109295 2.601158,2.468253 0,1.358919 -1.169026,2.456755 -2.601158,2.456755 -1.432092,0 -2.589041,-1.097836 -2.589041,-2.456755 2e-6,-1.316452 1.085791,-2.402274 2.455978,-2.468253 z" - style="color:#000000;fill:url(#linearGradient3178);fill-opacity:1;stroke:#f2f2f2;stroke-width:1.89984787;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - style="color:#000000;fill:url(#linearGradient4065-6);fill-opacity:1;stroke:#333333;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 16.31628,9.6404238 c -0.170724,0.0111 -0.33666,0.03617 -0.504349,0.05438 l -0.01152,0 -0.401204,2.0774902 c -0.653893,0.141308 -1.269088,0.381125 -1.822552,0.706976 l -1.799463,-1.228849 c -0.486744,0.35836 -0.929104,0.776379 -1.318278,1.229201 l 1.24939,1.729398 c -0.379345,0.550106 -0.664641,1.178245 -0.825299,1.838164 -2.7e-5,0.003 -2.3e-5,0.01041 0,0.01085 L 8.7051333,16.38434 c -0.03981,0.308598 -0.0573,0.627513 -0.0573,0.9463 0,0.260798 0.0076,0.518118 0.03439,0.772269 l 2.1778697,0.36981 c 0.154892,0.717662 0.449145,1.387883 0.859704,1.979582 l -1.295242,1.685923 c 0.370945,0.436986 0.79922,0.834851 1.260874,1.185555 l 1.833996,-1.196449 c 0.640946,0.38798 1.356462,0.660056 2.132022,0.79399 l 0.343875,2.055701 c 0.244354,0.02111 0.494922,0.02175 0.745042,0.02175 0.35311,0 0.690393,-0.01264 1.031624,-0.05438 l 0.412652,-2.099208 c 0.736385,-0.17389 1.428132,-0.475553 2.028839,-0.881005 l 1.765222,1.218203 c 0.457767,-0.369569 0.876395,-0.794373 1.237949,-1.250852 l -1.283798,-1.762043 c 0.347671,-0.569771 0.588566,-1.198399 0.710674,-1.870812 l 2.166317,-0.32613 c 0.01899,-0.214464 0.02292,-0.422516 0.02292,-0.641688 0,-0.380845 -0.04665,-0.754277 -0.103151,-1.120329 l -2.200793,-0.380708 c -0.172467,-0.604301 -0.455456,-1.16812 -0.813856,-1.675032 l 1.295243,-1.685891 C 22.608915,12.003515 22.15115,11.572967 21.646433,11.207645 l -1.868403,1.218203 c -0.536993,-0.301364 -1.114886,-0.5326 -1.742297,-0.66347 L 17.692037,9.6958528 c -0.313248,-0.03494 -0.628698,-0.0544 -0.95148,-0.0544 -0.08726,0 -0.177048,-0.0027 -0.263638,0 -0.04221,0.0013 -0.08398,-0.0024 -0.126091,0 -0.01138,6.18e-4 -0.02301,-7.06e-4 -0.03439,0 z m 0.298024,5.2859602 c 0.04188,-0.002 0.08369,0 0.126092,0 1.356828,0 2.464452,1.050995 2.464452,2.338532 0,1.2875 -1.107587,2.327638 -2.464452,2.327638 -1.356828,0 -2.452972,-1.040138 -2.452972,-2.327638 1e-6,-1.247265 1.028726,-2.276021 2.326902,-2.338532 z" - id="path215" - inkscape:connector-curvature="0" /> - </g> + <path + style="opacity:0.95;fill:none;fill-rule:evenodd;stroke:#2d2d2d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 18.439048,24.725186 0.0084,-10.033295" + id="path4153-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <rect + style="opacity:0.95;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2d2d2d;stroke-width:0.99229139;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1" + id="rect4182" + width="11.98762" + height="9.9877882" + x="12.510304" + y="14.511487" + rx="0" + ry="0.29865727" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#2d2d2d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.95" + d="m 21.503647,24.637697 0.0084,-10.033296" + id="path4153-7-5" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#2d2d2d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.95" + d="m 24.65781,17.512918 -12.364591,-0.0071" + id="path4153-7-6" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#2d2d2d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.95" + d="m 15.504276,24.914952 0.0084,-10.033295" + id="path4153-7-2" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> </svg> diff --git a/bitmaps_png/sources/move_zone.svg b/bitmaps_png/sources/move_zone.svg deleted file mode 100644 index c9adba4..0000000 --- a/bitmaps_png/sources/move_zone.svg +++ /dev/null @@ -1,169 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - version="1.1" - width="48" - height="48" - id="svg2"> - <metadata - id="metadata66"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs4"> - <filter - x="-0.12029" - y="-0.12927" - width="1.2406" - height="1.2585" - color-interpolation-filters="sRGB" - id="c"> - <feGaussianBlur - id="feGaussianBlur7" - stdDeviation="1.6250782" /> - </filter> - <linearGradient - x1="39.181999" - y1="32.207001" - x2="41.355" - y2="36.848" - id="d" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4411,0,0,2.9984,-102.04,-72.032)"> - <stop - id="stop10" - style="stop-color:#ffffff;stop-opacity:1" - offset="0" /> - <stop - id="stop12" - style="stop-color:#afadff;stop-opacity:1" - offset="1" /> - </linearGradient> - <mask - id="t"> - <rect - width="25.032" - height="26.091999" - x="-4.6403999" - y="-3.7337" - id="rect3322" - style="fill:#ffffff;fill-rule:evenodd" /> - </mask> - <mask - id="s"> - <rect - width="25.032" - height="26.091999" - x="-4.6403999" - y="-3.7337" - id="rect3319" - style="fill:#ffffff;fill-rule:evenodd" /> - </mask> - <mask - id="u"> - <rect - width="25.032" - height="26.091999" - x="-4.6403999" - y="-3.7337" - id="rect3316" - style="fill:#ffffff;fill-rule:evenodd" /> - </mask> - <mask - id="r"> - <rect - width="25.032" - height="26.091999" - x="-4.6403999" - y="-3.7337" - id="rect3313" - style="fill:#ffffff;fill-rule:evenodd" /> - </mask> - <mask - id="v"> - <rect - width="25.032" - height="26.091999" - x="-4.6403999" - y="-3.7337" - id="rect3310" - style="fill:#ffffff;fill-rule:evenodd" /> - </mask> - <mask - id="q"> - <rect - width="25.032" - height="26.091999" - x="-4.6403999" - y="-3.7337" - id="rect3307" - style="fill:#ffffff;fill-rule:evenodd" /> - </mask> - <mask - id="x"> - <rect - width="25.032" - height="26.091999" - x="-4.6403999" - y="-3.7337" - id="rect3304" - style="fill:#ffffff;fill-rule:evenodd" /> - </mask> - <mask - id="w"> - <rect - width="25.032" - height="26.091999" - x="-4.6403999" - y="-3.7337" - id="rect3301" - style="fill:#ffffff;fill-rule:evenodd" /> - </mask> - </defs> - <g - transform="translate(3.5,3.5)" - id="g3063"> - <path - d="m 0,0 0,26 20.5,0 -5.5,-11.5 0.0625,0 C 13.8522,16.592433 11.591084,18 9,18 5.1340066,18 2,14.865993 2,11 2,7.1340066 5.1340066,4 9,4 c 2.591084,0 4.8522,1.4075669 6.0625,3.5 L 20,7.5 26,20 26,0 z" - id="rect3811" - style="fill:#008000;fill-opacity:0.62745098;stroke:#008000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <g - transform="matrix(1.6382539,0,0,1.5572263,1.2572207,0.36314149)" - id="g16"> - <rect - width="16" - height="16" - x="0" - y="0" - id="rect18" - style="fill-opacity:0" /> - </g> - <path - d="m 13,11 4.5,0 6,13" - id="path3765" - style="fill:none;stroke:#808080;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <path - d="m 12.5,10 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z" - transform="translate(0,1)" - id="path3815" - style="fill:none;stroke:#808080;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none" /> - </g> - <path - d="m 33.5,21.5 -5,5 3,0 0,5 -5,0 0,-3 -5,5 5,5 0,-3 5,0 0,5 -3,0 5,5 5,-5 -3,0 0,-5 5,0 0,3 5,-5 -5,-5 0,3 -5,0 0,-5 3,0 z" - id="path3045" - style="fill:#59d421;fill-opacity:1;stroke:#44a118;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> -</svg> diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp index 0d18c02..82b70f2 100644 --- a/cvpcb/menubar.cpp +++ b/cvpcb/menubar.cpp @@ -78,7 +78,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() wxMenu* preferencesMenu = new wxMenu; AddMenuItem( preferencesMenu, ID_CVPCB_LIB_TABLE_EDIT, - _( "Footprint &Libraries" ), _( "Configure footprint libraries" ), + _( "Manage Footprint &Libraries" ), _( "Manage footprint libraries" ), KiBitmap( library_table_xpm ) ); // Path configuration edit dialog. diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 1ead983..f6bcdc5 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -612,9 +612,9 @@ static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu AddMenuItem( aParentMenu, ID_EDIT_SYM_LIB_TABLE, - _( "Symbol Library &Table" ), - _( "Edit the symbol library table." ), - KiBitmap( library_xpm ) ); + _( "Manage Symbol Library" ), + _( "Manage the symbol library" ), + KiBitmap( library_table_xpm ) ); // Options (Preferences on WXMAC) #ifdef __WXMAC__ @@ -622,7 +622,7 @@ static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu #else AddMenuItem( aParentMenu, wxID_PREFERENCES, - _( "Schematic Editor &Options" ), + _( "General &Options" ), _( "Edit Eeschema preferences" ), KiBitmap( preference_xpm ) ); #endif // __WXMAC__ diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp index b726325..aaf9de5 100644 --- a/eeschema/menubar_libedit.cpp +++ b/eeschema/menubar_libedit.cpp @@ -241,14 +241,14 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( preferencesMenu, ID_EDIT_SYM_LIB_TABLE, - _( "Symbol Library &Table" ), + _( "Manage Symbol Library" ), _( "Edit the symbol library table." ), - KiBitmap( library_xpm ) ); + KiBitmap( library_table_xpm ) ); // Default values and options AddMenuItem( preferencesMenu, wxID_PREFERENCES, - _( "Component Editor &Options" ), + _( "General &Options" ), _( "Set Component Editor default values and options" ), KiBitmap( preference_xpm ) ); diff --git a/include/bitmaps.h b/include/bitmaps.h index 14a7dff..1dcbc19 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -288,7 +288,6 @@ EXTERN_BITMAP( move_polygon_xpm ) EXTERN_BITMAP( move_rectangle_xpm ) EXTERN_BITMAP( move_sheet_xpm ) EXTERN_BITMAP( move_target_xpm ) -EXTERN_BITMAP( move_zone_xpm ) EXTERN_BITMAP( move_xpm ) EXTERN_BITMAP( mw_add_gap_xpm ) EXTERN_BITMAP( mw_add_line_xpm ) diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index a473e68..93fae2b 100644 --- a/kicad/menubar.cpp +++ b/kicad/menubar.cpp @@ -371,38 +371,38 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // Menu Tools: wxMenu* toolsMenu = new wxMenu; - msg = AddHotkeyName( _( "Run Eeschema" ), kicad_Manager_Hokeys_Descr, HK_RUN_EESCHEMA ); + msg = AddHotkeyName( _( "Edit Schematic" ), kicad_Manager_Hokeys_Descr, HK_RUN_EESCHEMA ); AddMenuItem( toolsMenu, ID_TO_SCH, msg, KiBitmap( eeschema_xpm ) ); - msg = AddHotkeyName( _( "Run Library Editor" ), + msg = AddHotkeyName( _( "Edit Schematic Symbol" ), kicad_Manager_Hokeys_Descr, HK_RUN_LIBEDIT ); AddMenuItem( toolsMenu, ID_TO_SCH_LIB_EDITOR, msg, KiBitmap( libedit_xpm ) ); - msg = AddHotkeyName( _( "Run Pcbnew" ), + msg = AddHotkeyName( _( "Edit PCB" ), kicad_Manager_Hokeys_Descr, HK_RUN_PCBNEW ); AddMenuItem( toolsMenu, ID_TO_PCB, msg, KiBitmap( pcbnew_xpm ) ); - msg = AddHotkeyName( _( "Run Footprint Editor" ), + msg = AddHotkeyName( _( "Edit PCB Footprint" ), kicad_Manager_Hokeys_Descr, HK_RUN_FPEDITOR ); AddMenuItem( toolsMenu, ID_TO_PCB_FP_EDITOR, msg, KiBitmap( module_editor_xpm ) ); - msg = AddHotkeyName( _( "Run Gerbview" ), + msg = AddHotkeyName( _( "View GERBER" ), kicad_Manager_Hokeys_Descr, HK_RUN_GERBVIEW ); AddMenuItem( toolsMenu, ID_TO_GERBVIEW, msg, KiBitmap( icon_gerbview_small_xpm ) ); - msg = AddHotkeyName( _( "Run Bitmap2Component" ), + msg = AddHotkeyName( _( "Convert Bitmap to Footprint" ), kicad_Manager_Hokeys_Descr, HK_RUN_BM2COMPONENT ); AddMenuItem( toolsMenu, ID_TO_BITMAP_CONVERTER, msg, _( "Bitmap2Component - Convert bitmap images to Eeschema\n" "or Pcbnew elements" ), KiBitmap( image_xpm ) ); - msg = AddHotkeyName( _( "Run Pcb Calculator" ), kicad_Manager_Hokeys_Descr, HK_RUN_PCBCALCULATOR ); + msg = AddHotkeyName( _( "Run PCB Calculator" ), kicad_Manager_Hokeys_Descr, HK_RUN_PCBCALCULATOR ); AddMenuItem( toolsMenu, ID_TO_PCB_CALCULATOR, msg, _( "Pcb calculator - Calculator for components, track width, etc." ), KiBitmap( pcbcalculator_xpm ) ); - msg = AddHotkeyName( _( "Run Page Layout Editor" ), kicad_Manager_Hokeys_Descr, HK_RUN_PLEDITOR ); + msg = AddHotkeyName( _( "Edit Sheet Layout" ), kicad_Manager_Hokeys_Descr, HK_RUN_PLEDITOR ); AddMenuItem( toolsMenu, ID_TO_PL_EDITOR, msg, _( "Pl editor - Worksheet layout editor" ), KiBitmap( pagelayout_load_xpm ) ); diff --git a/pcbnew/help_common_strings.h b/pcbnew/help_common_strings.h index ca49199..c121b96 100644 --- a/pcbnew/help_common_strings.h +++ b/pcbnew/help_common_strings.h @@ -18,8 +18,8 @@ #define HELP_ZOOM_IN _( "Zoom in" ) #define HELP_ZOOM_OUT _( "Zoom out" ) -#define HELP_ZOOM_FIT _( "Zoom to fit the board on the screen" ) -#define HELP_ZOOM_REDRAW _( "Redraw the current screen" ) +#define HELP_ZOOM_FIT _( "Zoom to fit board on screen" ) +#define HELP_ZOOM_REDRAW _( "Redraw screen" ) #define HELP_SHOW_HIDE_LAYERMANAGER _( "Show/hide the layers manager toolbar" ) diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp index 022fdf8..5de1673 100644 --- a/pcbnew/menubar_modedit.cpp +++ b/pcbnew/menubar_modedit.cpp @@ -308,11 +308,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() wxMenu* prefs_menu = new wxMenu; AddMenuItem( prefs_menu, ID_PCB_LIB_WIZARD, - _( "&Footprint Libraries Wizard" ), _( "Add footprint libraries with wizard" ), + _( "&Footprint Library Wizard" ), _( "Add footprint libraries with wizard" ), KiBitmap( wizard_add_fplib_small_xpm ) ); AddMenuItem( prefs_menu, ID_PCB_LIB_TABLE_EDIT, - _( "Footprint Li&braries Manager" ), _( "Configure footprint libraries" ), + _( "Footprint Li&brary Table" ), _( "Configure footprint library table" ), KiBitmap( library_table_xpm ) ); // Path configuration edit dialog. diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index bcf54e4..f25482b 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -279,11 +279,11 @@ void prepareRouteMenu( wxMenu* aParentMenu ) void prepareLibraryMenu( wxMenu* aParentMenu ) { AddMenuItem( aParentMenu, ID_PCB_LIB_WIZARD, - _( "&Footprint Libraries Wizard" ), _( "Add footprint libraries using wizard" ), + _( "&Footprint Library Wizard" ), _( "Add footprint library using wizard" ), KiBitmap( wizard_add_fplib_small_xpm ) ); AddMenuItem( aParentMenu, ID_PCB_LIB_TABLE_EDIT, - _( "Footprint Li&braries Manager" ), _( "Configure footprint libraries" ), + _( "Footprint Li&brary Table" ), _( "Configure footprint library table" ), KiBitmap( library_table_xpm ) ); // Path configuration edit dialog. diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp index 9056426..7a5d274 100644 --- a/pcbnew/onrightclick.cpp +++ b/pcbnew/onrightclick.cpp @@ -761,7 +761,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu* msg = AddHotkeyName( _("Move Zone Exactly" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_EXACT, - msg, KiBitmap( move_zone_xpm ) ); + msg, KiBitmap( move_xpm ) ); msg = AddHotkeyName( _( "Edit Zone Properties" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); -- 2.7.4
_______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp