merge in testing

CHANGELOG.txt

@@ -4,6 +4,19 @@ KiCad ChangeLog 2011
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2011-Dec-19, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
+================================================================================
+Pcbnew:
+    Enhanced algorithms to calculate board connections:
+    - A track is seen connected to a pad if the track end is inside the pad shape.
+    - Pads inside pads are now seen connected, if the center of the pad is
+      *inside* the other pad.
+       (this is made to be sure a large copper area is shared by the 2 pads,
+       and to keep algorithm fast).
+    Algorithm to calculate pads connections is still very fast.
+    However some other functions (drag pads, track len calculation ...)
+    still need the track end exactly on the pad position.
+
 
 2011-Dec-13 UPDATE Dick Hollenbeck <dick@softplc.com>
 ================================================================================

CMakeLists.txt

@@ -78,7 +78,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     # Set default flags for Release build.
     set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG ")
     set(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s -static-libgcc")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s")
 
     # Set default flags for Debug build.
     set(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")

bitmaps_png/CMakeLists.txt

@@ -156,6 +156,7 @@ set( BMAPS_MID
     browse_files
     cancel_tool
     cancel
+    change_entry_orient
     create_cmp_file
     checked_ok
     component_select_unit
@@ -239,9 +240,10 @@ set( BMAPS_MID
     gbr_select_mode2
     gerber_file
     gerber_recent_files
+    gerber_open_dcode_file
     gerbview_drill_file
     gerbview_clear_layers
-    gerber_open_dcode_file
+    gerbview_open_recent_drill_files
     general_deletions
     general_ratsnest
     glabel2label
@@ -478,6 +480,7 @@ set( BMAPS_MID
     unzip
     update_module_board
     up
+    via
     via_sketch
     warning
     web_support

bitmaps_png/cpp_26/change_entry_orient.cpp

+
+/* 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, 0x45, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0xd6, 0xdb, 0x53, 0x1b,
+ 0x55, 0x1c, 0x07, 0xf0, 0x85, 0x96, 0x4d, 0x68, 0x02, 0x09, 0xe5, 0x52, 0xeb, 0x40, 0x99, 0xa9,
+ 0xd5, 0xb1, 0x40, 0x8a, 0x34, 0x85, 0xbd, 0xe4, 0x0a, 0x41, 0xd2, 0x4d, 0xc8, 0x86, 0x6c, 0xd8,
+ 0x92, 0x0b, 0x24, 0x54, 0xa0, 0x1d, 0x4a, 0x01, 0xdb, 0xa0, 0x63, 0x7d, 0x70, 0x3a, 0xe8, 0x8c,
+ 0x4f, 0x3e, 0xb5, 0x33, 0xb6, 0x85, 0x04, 0x8b, 0x15, 0x5a, 0x15, 0x98, 0x04, 0x9c, 0x0e, 0xa3,
+ 0x96, 0x7b, 0x47, 0x2c, 0x84, 0x4a, 0x8d, 0xd3, 0x07, 0x7d, 0xf2, 0x45, 0xeb, 0x1f, 0x11, 0xcf,
+ 0x59, 0x58, 0xd8, 0x8d, 0x09, 0x05, 0xc6, 0x87, 0xef, 0xcb, 0xee, 0x2f, 0xfb, 0xc9, 0xd9, 0xf3,
+ 0x3b, 0xe7, 0x2c, 0x72, 0x35, 0x2a, 0xa1, 0x41, 0xe6, 0xdf, 0x5d, 0xce, 0xfc, 0x50, 0xdf, 0x6a,
+ 0x57, 0x91, 0x2d, 0x8e, 0x32, 0x8c, 0xa2, 0xb2, 0xe3, 0xf1, 0x38, 0xb2, 0xdf, 0x20, 0xc8, 0xf5,
+ 0xf4, 0x83, 0xc4, 0x94, 0x19, 0xc5, 0x27, 0x9b, 0x10, 0x72, 0xba, 0x80, 0xbb, 0x16, 0x88, 0xa2,
+ 0xbf, 0x83, 0xc4, 0x61, 0x2e, 0x3f, 0x52, 0x3e, 0x24, 0xfc, 0xf5, 0x35, 0x98, 0xdb, 0xa1, 0x55,
+ 0xb3, 0xb5, 0x8a, 0xfd, 0x21, 0xf1, 0xb4, 0x0c, 0x62, 0xd2, 0x07, 0x72, 0x83, 0x0b, 0x1e, 0xee,
+ 0xe4, 0xae, 0x83, 0xd1, 0x2c, 0xf2, 0x10, 0x87, 0xcd, 0x28, 0xa7, 0x71, 0x9f, 0xd5, 0x04, 0xb1,
+ 0xb7, 0x1a, 0x8c, 0xca, 0x3d, 0x23, 0x64, 0xa4, 0x05, 0xe4, 0x26, 0x4a, 0x4e, 0xdc, 0x92, 0x90,
+ 0x13, 0xb7, 0xa5, 0xf8, 0xb8, 0x87, 0xbb, 0xf7, 0xde, 0xcf, 0xb2, 0x57, 0xfa, 0xa2, 0xe8, 0x6f,
+ 0x22, 0x6c, 0x56, 0xf1, 0x3d, 0xd6, 0x62, 0xa9, 0xdd, 0x0b, 0x06, 0x11, 0x94, 0x0c, 0x37, 0x67,
+ 0x10, 0x91, 0x9b, 0x52, 0xcd, 0xb7, 0x83, 0x72, 0xdd, 0xc8, 0xfd, 0x6c, 0xfd, 0xd0, 0xe7, 0x27,
+ 0x6d, 0x17, 0x4a, 0x4a, 0xd9, 0x52, 0x94, 0x2b, 0xea, 0x7d, 0x26, 0x3b, 0x02, 0x80, 0x98, 0x10,
+ 0xeb, 0x9a, 0x51, 0xfc, 0x20, 0xc4, 0xc0, 0x93, 0xd2, 0x52, 0x23, 0x48, 0x1a, 0x98, 0x0f, 0x2f,
+ 0x40, 0x6e, 0x48, 0x35, 0x63, 0x10, 0x79, 0xa0, 0x34, 0x0e, 0x84, 0xca, 0xcf, 0xb5, 0xd8, 0xf0,
+ 0x26, 0xc7, 0x49, 0x82, 0x65, 0x33, 0xb7, 0x8a, 0xfb, 0x7e, 0x91, 0x17, 0x00, 0xe0, 0x57, 0x11,
+ 0x36, 0xab, 0x78, 0xc4, 0x63, 0x2a, 0xab, 0x36, 0x27, 0x19, 0xb6, 0x81, 0x84, 0x13, 0x90, 0x60,
+ 0xe8, 0x54, 0xe3, 0x79, 0x1a, 0xf3, 0x32, 0xb8, 0x8e, 0x61, 0x8e, 0xb2, 0x2c, 0x7b, 0x40, 0xf4,
+ 0xa3, 0xee, 0x28, 0x92, 0x1f, 0x58, 0x45, 0x9f, 0x89, 0x5e, 0xe3, 0x5c, 0xf6, 0x0c, 0xe9, 0xa7,
+ 0xde, 0xd6, 0xb8, 0xec, 0x3a, 0x95, 0xd5, 0x2a, 0xc2, 0x38, 0x84, 0x88, 0xb8, 0x37, 0x10, 0xf8,
+ 0xba, 0xbe, 0x7a, 0xa0, 0xac, 0x1e, 0x04, 0x88, 0x8f, 0x26, 0xdd, 0x0e, 0xa2, 0xd2, 0x65, 0x2f,
+ 0x2a, 0x65, 0x59, 0x94, 0xab, 0x4d, 0xfc, 0x87, 0x81, 0x15, 0x24, 0x0f, 0x00, 0xeb, 0x09, 0xd8,
+ 0x1c, 0x8f, 0x95, 0x9a, 0xcd, 0x87, 0x21, 0xc0, 0x21, 0xe4, 0x94, 0x6b, 0x73, 0x24, 0x03, 0x72,
+ 0xfd, 0xc8, 0x7d, 0x65, 0x75, 0x70, 0x13, 0xa9, 0x27, 0xd4, 0xac, 0xed, 0x18, 0x8f, 0x24, 0x85,
+ 0x04, 0xd8, 0x53, 0x11, 0x36, 0x9f, 0x3d, 0x4f, 0x9c, 0x37, 0xd7, 0x41, 0xec, 0x4d, 0x93, 0x29,
+ 0x17, 0xc5, 0x26, 0x36, 0x10, 0x12, 0x20, 0xba, 0x51, 0x0e, 0x51, 0x39, 0x5b, 0xed, 0xc9, 0x90,
+ 0x94, 0x10, 0xcc, 0xb5, 0x65, 0x24, 0x17, 0x00, 0x6b, 0x42, 0xac, 0x7b, 0x2e, 0x6b, 0x11, 0x62,
+ 0xc5, 0xe6, 0xfe, 0x8f, 0x64, 0xda, 0x7b, 0x03, 0x52, 0xe2, 0x9b, 0x41, 0x88, 0x28, 0x8c, 0xc1,
+ 0x21, 0x15, 0xdb, 0x6a, 0x27, 0x9a, 0xed, 0x64, 0x05, 0x63, 0x29, 0x86, 0x5d, 0xf6, 0x9f, 0xb9,
+ 0xdc, 0xa9, 0x65, 0xaf, 0xc4, 0x90, 0xc3, 0x60, 0xce, 0xa2, 0x42, 0xac, 0xed, 0xbb, 0xc2, 0xe7,
+ 0x85, 0x96, 0x4f, 0xc3, 0x47, 0xeb, 0x3e, 0x9b, 0xcc, 0x31, 0x0c, 0x8e, 0x2b, 0x0c, 0x03, 0x5f,
+ 0xc0, 0x91, 0x70, 0x88, 0xc7, 0x52, 0x7c, 0x82, 0xa2, 0x24, 0x49, 0x3b, 0xf3, 0x65, 0xeb, 0xe3,
+ 0x83, 0x75, 0x24, 0xe7, 0x6a, 0x14, 0x5d, 0x15, 0x62, 0xbe, 0xf1, 0xd7, 0xff, 0x3e, 0x66, 0xfd,
+ 0x64, 0xae, 0x88, 0xea, 0x7f, 0x58, 0xce, 0xb8, 0x5b, 0x30, 0x77, 0xbd, 0x76, 0x27, 0x64, 0x57,
+ 0x10, 0x8f, 0x75, 0x2d, 0xe4, 0xfe, 0x21, 0xc4, 0xfc, 0x13, 0xc7, 0x5f, 0x9c, 0x69, 0x66, 0xfa,
+ 0x09, 0x2f, 0xdd, 0x75, 0xba, 0xb1, 0xae, 0xa2, 0x90, 0x20, 0x32, 0x77, 0x5c, 0xd0, 0xbb, 0x81,
+ 0x50, 0x7c, 0x8a, 0x51, 0x52, 0x43, 0x77, 0xda, 0xa7, 0x8b, 0x5e, 0x08, 0xb1, 0x4b, 0x3f, 0x2a,
+ 0x63, 0x9a, 0xb6, 0x3a, 0x3f, 0xee, 0xa6, 0x4d, 0x6a, 0x9b, 0x2d, 0x0f, 0x74, 0x62, 0xfa, 0xbe,
+ 0x21, 0x94, 0x98, 0x74, 0xc0, 0xcd, 0x11, 0xb6, 0x70, 0x3e, 0x75, 0x6b, 0xac, 0x63, 0xba, 0xf0,
+ 0x1f, 0x51, 0x83, 0x2c, 0xc8, 0x57, 0xf4, 0xed, 0xb5, 0x67, 0x49, 0x0f, 0xad, 0xaf, 0xa0, 0xa8,
+ 0xfc, 0x54, 0xd8, 0xcb, 0x90, 0x06, 0x1e, 0x91, 0xe9, 0x46, 0x46, 0xb3, 0x8d, 0xa1, 0xbb, 0x78,
+ 0xa7, 0xd3, 0xdb, 0xfb, 0x93, 0x2c, 0x96, 0x80, 0x3d, 0xd9, 0xc2, 0xd8, 0xe4, 0x58, 0x6a, 0x84,
+ 0x8c, 0xd8, 0x85, 0x08, 0x58, 0x27, 0x77, 0xcb, 0xd8, 0x36, 0x07, 0xee, 0x65, 0x34, 0xe6, 0x6b,
+ 0x95, 0xaa, 0xc0, 0xaa, 0x64, 0x59, 0x84, 0x2d, 0xca, 0x57, 0x75, 0x17, 0x4d, 0x14, 0xc4, 0x4e,
+ 0x39, 0xea, 0x0a, 0x12, 0xb1, 0xa4, 0x88, 0x04, 0x0f, 0xd3, 0x1c, 0x42, 0xf2, 0x48, 0x68, 0x98,
+ 0x47, 0x2a, 0x9d, 0xd6, 0xe3, 0x46, 0xa3, 0x51, 0xfa, 0xfe, 0x73, 0x24, 0x0b, 0x00, 0x4b, 0x42,
+ 0xac, 0x67, 0x49, 0x16, 0x35, 0x76, 0x26, 0xc7, 0x92, 0x20, 0x93, 0x36, 0x88, 0x48, 0xc8, 0xb1,
+ 0x3b, 0x1c, 0x62, 0x0c, 0x0e, 0x97, 0x36, 0xbe, 0xc3, 0xe0, 0x7e, 0x80, 0x78, 0x36, 0x10, 0xbe,
+ 0x16, 0x62, 0x89, 0xe7, 0x59, 0xcf, 0xa2, 0x6c, 0x0d, 0x62, 0x84, 0xdb, 0x61, 0x28, 0xa3, 0x4d,
+ 0x47, 0x78, 0x4c, 0x84, 0x1c, 0x20, 0x22, 0xf5, 0x62, 0x24, 0x04, 0x90, 0x0e, 0x06, 0xf3, 0x81,
+ 0x13, 0xb7, 0x89, 0x7a, 0xcd, 0xd8, 0xba, 0x8d, 0xf0, 0xb9, 0x14, 0x43, 0xe4, 0x81, 0x35, 0xc9,
+ 0x82, 0x10, 0xeb, 0x5d, 0x92, 0x3f, 0x35, 0x74, 0xd5, 0x58, 0x20, 0x86, 0x6d, 0x62, 0xdb, 0x08,
+ 0x19, 0xb6, 0x0a, 0x11, 0x85, 0x21, 0x34, 0x5c, 0xe2, 0x6c, 0x77, 0xf2, 0x08, 0xc1, 0xa6, 0x5e,
+ 0x27, 0x1c, 0x16, 0x95, 0xcc, 0x89, 0x46, 0xf6, 0x58, 0xbe, 0xae, 0xef, 0xae, 0xb6, 0x6e, 0x61,
+ 0xb0, 0xf0, 0x20, 0x16, 0xae, 0xde, 0x40, 0xc6, 0x01, 0x32, 0x3a, 0xc2, 0x21, 0xcc, 0x85, 0xc6,
+ 0xdd, 0x20, 0xdb, 0xe7, 0x19, 0x22, 0xeb, 0x8b, 0x4a, 0x66, 0x45, 0x0d, 0x32, 0x9f, 0xf5, 0xb8,
+ 0xca, 0x6d, 0xab, 0xc1, 0xcf, 0xd1, 0x9a, 0xcd, 0x05, 0x19, 0xf9, 0x58, 0xba, 0x85, 0x04, 0xbf,
+ 0xdc, 0x2b, 0xc2, 0xe7, 0xfa, 0x0a, 0x72, 0x28, 0x10, 0xcd, 0x98, 0xe1, 0xa1, 0x2b, 0x4f, 0xa4,
+ 0x7f, 0x61, 0x1e, 0xba, 0x9a, 0x60, 0x1b, 0xaa, 0xb8, 0x02, 0xa9, 0xf6, 0xeb, 0x0e, 0x0e, 0x01,
+ 0x73, 0x52, 0xd2, 0x74, 0xd1, 0xb9, 0x1f, 0x44, 0x88, 0x81, 0x06, 0x19, 0x04, 0xd0, 0x9f, 0x3d,
+ 0xcb, 0xd2, 0xcb, 0x1a, 0x17, 0xfd, 0x2a, 0xdc, 0x03, 0xe1, 0x29, 0x99, 0x8e, 0x79, 0xbd, 0x85,
+ 0x6f, 0x34, 0x74, 0xd9, 0xcb, 0x5d, 0x6e, 0xba, 0x0a, 0x9c, 0x37, 0xa7, 0x59, 0xf3, 0x89, 0xfd,
+ 0x20, 0xa9, 0xbe, 0x27, 0xb6, 0xba, 0x4e, 0xed, 0xb6, 0xe5, 0x01, 0xf9, 0x0c, 0xdc, 0xea, 0x21,
+ 0xa2, 0xb6, 0xa9, 0x0f, 0xfd, 0x1f, 0x88, 0x30, 0xff, 0x02, 0x94, 0x7c, 0x89, 0xd7, 0x2c, 0xef,
+ 0xcc, 0x31, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE change_entry_orient_xpm[1] = {{ png, sizeof( png ), "change_entry_orient_xpm" }};
+
+//EOF

bitmaps_png/cpp_26/via.cpp

+
+/* 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, 0x13, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x96, 0x5f, 0x4c, 0xd3,
+ 0x57, 0x14, 0xc7, 0x2f, 0xb4, 0xe0, 0x80, 0x2a, 0xfd, 0x03, 0x32, 0x05, 0x5b, 0x8a, 0x13, 0x06,
+ 0xb5, 0x53, 0x68, 0x69, 0x19, 0x3e, 0x68, 0xc6, 0xbf, 0x3a, 0xe8, 0x6a, 0x11, 0xda, 0x01, 0x41,
+ 0xec, 0x68, 0x29, 0x6d, 0x21, 0x41, 0x7d, 0xd1, 0xe8, 0x03, 0xf1, 0x85, 0x8c, 0x07, 0x89, 0x8b,
+ 0x89, 0x8a, 0x38, 0x5c, 0x34, 0x59, 0x9c, 0x89, 0x99, 0x31, 0x1a, 0x75, 0xc6, 0xed, 0x65, 0x84,
+ 0x2c, 0xcb, 0x0c, 0x66, 0x4b, 0xdc, 0xc3, 0xc6, 0xb6, 0xc4, 0x98, 0xf8, 0x07, 0x86, 0x62, 0x36,
+ 0x23, 0xe5, 0xee, 0x7b, 0x7e, 0xf9, 0xdd, 0xa6, 0x92, 0x6a, 0x06, 0x33, 0x3e, 0xec, 0xe1, 0x93,
+ 0xa6, 0xe7, 0x9e, 0x73, 0xbe, 0xf7, 0x9e, 0x7b, 0x7e, 0xe7, 0xf7, 0x63, 0x9c, 0x73, 0xf6, 0x3a,
+ 0x58, 0x9c, 0x33, 0x63, 0x49, 0x40, 0x01, 0x94, 0x20, 0x05, 0x2c, 0x93, 0x7f, 0xc9, 0x96, 0xfc,
+ 0x4a, 0x84, 0xe4, 0xe4, 0x2b, 0xcb, 0xca, 0xca, 0x1a, 0x1c, 0x0e, 0x47, 0x7f, 0x7d, 0x7d, 0xfd,
+ 0x71, 0xab, 0xd5, 0x7a, 0x40, 0xad, 0x56, 0xbb, 0x61, 0xaf, 0x00, 0xeb, 0xc0, 0x1b, 0xb4, 0x99,
+ 0x25, 0x09, 0x51, 0xa0, 0xd7, 0xeb, 0x5d, 0xdb, 0xd9, 0xd9, 0x79, 0x2d, 0x14, 0x0a, 0xcd, 0xf6,
+ 0xf4, 0xf4, 0xf0, 0x05, 0x44, 0x83, 0xc1, 0xe0, 0x64, 0x4d, 0x4d, 0xcd, 0x10, 0x7c, 0xeb, 0xc0,
+ 0x9b, 0xb4, 0xa9, 0x45, 0x09, 0x51, 0x39, 0x20, 0xb0, 0x2b, 0x1c, 0x0e, 0x3f, 0x59, 0x90, 0xfc,
+ 0x57, 0x30, 0x0e, 0x9e, 0xb3, 0xc3, 0x77, 0x4c, 0xaf, 0xd7, 0x07, 0x11, 0x67, 0x5e, 0x28, 0xf6,
+ 0x52, 0x21, 0x08, 0x9c, 0x8c, 0x4b, 0x34, 0x19, 0x89, 0x44, 0xb6, 0x03, 0x9d, 0xd8, 0x84, 0xc5,
+ 0x62, 0x49, 0x81, 0xdd, 0x0c, 0x86, 0xc1, 0x3c, 0xf9, 0x61, 0xfd, 0x91, 0xd1, 0x68, 0x8c, 0x60,
+ 0x3d, 0x2f, 0xfe, 0xde, 0xe2, 0x2f, 0xf9, 0x39, 0x50, 0xa6, 0x6d, 0x42, 0x04, 0xa5, 0x39, 0xea,
+ 0xf1, 0x78, 0x54, 0x71, 0xcd, 0x90, 0x06, 0xde, 0x02, 0x25, 0x80, 0xec, 0x4a, 0xf8, 0x6d, 0x01,
+ 0xbf, 0x93, 0x7f, 0x57, 0x57, 0xd7, 0x4d, 0x85, 0x42, 0xe1, 0x84, 0x3d, 0x23, 0xae, 0x3a, 0x2c,
+ 0x19, 0x68, 0x81, 0x4e, 0x60, 0xb3, 0xd9, 0x0a, 0xb1, 0xb3, 0x7b, 0x14, 0xe4, 0xf3, 0xf9, 0xbe,
+ 0xa2, 0x26, 0x90, 0xd7, 0xb2, 0x21, 0x51, 0x91, 0xe1, 0xd3, 0x1e, 0xce, 0x08, 0xe8, 0x46, 0x15,
+ 0x99, 0x0a, 0x3f, 0x6c, 0x1f, 0x82, 0x4a, 0xea, 0x40, 0x54, 0xa0, 0x1c, 0x31, 0xcf, 0x28, 0xce,
+ 0xed, 0x76, 0x7f, 0x0a, 0xdb, 0x06, 0xda, 0x98, 0x10, 0xa2, 0x4e, 0xd9, 0x06, 0xbc, 0x02, 0x97,
+ 0xcb, 0xf5, 0x85, 0x7c, 0x92, 0x29, 0xad, 0x56, 0x1b, 0x10, 0xf6, 0x8c, 0xb0, 0x6e, 0x54, 0x7d,
+ 0x24, 0xef, 0xa1, 0xe6, 0xc4, 0x1a, 0x2e, 0x71, 0x34, 0x6f, 0x76, 0xf9, 0xee, 0xec, 0x8b, 0x38,
+ 0x63, 0x3b, 0xd6, 0xd7, 0xd2, 0xa6, 0x7b, 0x7b, 0x7b, 0x0f, 0xc8, 0x25, 0x7c, 0xa2, 0x54, 0x2a,
+ 0xab, 0xc5, 0x5d, 0xb1, 0x67, 0x8c, 0x9d, 0x9b, 0x61, 0xec, 0xce, 0x34, 0x63, 0x77, 0xa7, 0x64,
+ 0x86, 0x5c, 0xae, 0xbf, 0xc9, 0xf9, 0x6c, 0x65, 0xe5, 0x63, 0x61, 0x1b, 0xcb, 0x4b, 0xb9, 0x4f,
+ 0xc9, 0xb5, 0xa0, 0x64, 0x74, 0x5d, 0xf4, 0x9d, 0xd1, 0xc2, 0xa8, 0x4e, 0x16, 0x4c, 0x73, 0xaf,
+ 0x38, 0x24, 0x77, 0x5c, 0x0a, 0x4e, 0xa5, 0xa2, 0x4e, 0xa4, 0x78, 0x93, 0xc9, 0xb4, 0x0b, 0xb6,
+ 0x54, 0x49, 0x28, 0xca, 0xd8, 0x77, 0xd2, 0x55, 0xc5, 0xb1, 0xd7, 0xef, 0x97, 0xee, 0xe6, 0x27,
+ 0x83, 0x21, 0x66, 0xdb, 0xd3, 0xa6, 0x91, 0x92, 0x16, 0xdd, 0xb0, 0xf1, 0x8a, 0x9f, 0x1d, 0x12,
+ 0xeb, 0xc7, 0x36, 0x49, 0xb6, 0xcc, 0x81, 0x55, 0xb7, 0x90, 0xb0, 0x0d, 0xac, 0xa0, 0x7b, 0x44,
+ 0xec, 0x04, 0xc5, 0xd7, 0xd6, 0xd6, 0x1e, 0xc7, 0xff, 0x4c, 0xe9, 0x6e, 0x17, 0x0a, 0x4d, 0xab,
+ 0x54, 0xb1, 0x76, 0x7d, 0x94, 0x9e, 0x2e, 0xd9, 0xa2, 0x49, 0x8c, 0x1b, 0x3e, 0xc9, 0x95, 0x92,
+ 0x96, 0xff, 0x58, 0x1d, 0x13, 0xb2, 0xdf, 0xae, 0xe3, 0xd9, 0xc3, 0xfa, 0x39, 0xcd, 0xf0, 0x9a,
+ 0x79, 0x45, 0x41, 0x6a, 0x0b, 0x9d, 0x88, 0x76, 0x8f, 0xb2, 0x9d, 0xa2, 0x78, 0x3c, 0x7f, 0x57,
+ 0xe8, 0x6a, 0x12, 0x9e, 0x68, 0x2e, 0x39, 0x99, 0xf7, 0x85, 0x42, 0x92, 0xd0, 0x64, 0x4e, 0x4e,
+ 0xcc, 0xde, 0x1e, 0xce, 0x92, 0x84, 0x4c, 0xdf, 0x56, 0xc6, 0x84, 0x36, 0x7e, 0xbf, 0x59, 0xb2,
+ 0xa9, 0x0f, 0xad, 0xfe, 0x0d, 0x09, 0x8b, 0x44, 0x3b, 0x23, 0xf6, 0x1b, 0x8a, 0x6f, 0x6c, 0x6c,
+ 0x1c, 0x11, 0xe2, 0x6c, 0x9e, 0xb1, 0x2f, 0x21, 0xf6, 0x47, 0x3c, 0x1f, 0x7b, 0x3c, 0x4f, 0xc9,
+ 0xf1, 0x52, 0x69, 0xe9, 0xec, 0x53, 0xdc, 0x1f, 0xd9, 0xae, 0xad, 0x4f, 0xbb, 0x47, 0x49, 0xb3,
+ 0x3e, 0xcb, 0xe7, 0x85, 0xd7, 0xad, 0xfc, 0xed, 0xaf, 0x6d, 0x7c, 0xe5, 0xe9, 0x02, 0x49, 0x48,
+ 0x15, 0xd0, 0x1e, 0x43, 0xc2, 0x74, 0x4a, 0xd8, 0xdc, 0xdc, 0xac, 0x40, 0xac, 0x34, 0x41, 0xaa,
+ 0xaa, 0xaa, 0x82, 0xb1, 0xae, 0x4b, 0xf4, 0x1c, 0xe1, 0xe8, 0x87, 0xc9, 0x31, 0x10, 0x08, 0xdc,
+ 0xc4, 0x7f, 0xa7, 0xfc, 0xac, 0x24, 0xe9, 0x4e, 0x1a, 0xce, 0x69, 0x46, 0xf4, 0x3c, 0xd6, 0x75,
+ 0x20, 0x67, 0xc4, 0xf8, 0x00, 0x6d, 0xbe, 0x5d, 0xec, 0xbc, 0xbb, 0xbb, 0xbb, 0x41, 0x2e, 0xfd,
+ 0x7c, 0x71, 0x71, 0xb1, 0x41, 0xcc, 0xbe, 0x84, 0x13, 0x01, 0x42, 0x76, 0x38, 0xce, 0x51, 0x80,
+ 0xd3, 0xe9, 0x3c, 0x26, 0x0f, 0xcd, 0x65, 0xb6, 0x1b, 0xd5, 0x3a, 0xcb, 0xc4, 0x7b, 0xbc, 0xe0,
+ 0xf2, 0x46, 0x9e, 0x7f, 0xd1, 0xcc, 0x4b, 0x7f, 0xd8, 0xc2, 0x4b, 0x4e, 0x97, 0x5f, 0xc2, 0x5a,
+ 0x03, 0x09, 0x75, 0x74, 0x74, 0xe8, 0x10, 0x7b, 0x47, 0x1e, 0x47, 0x57, 0xc5, 0x69, 0x5e, 0x3a,
+ 0x82, 0xe0, 0x3c, 0x20, 0x3f, 0x0f, 0x7f, 0x61, 0x4a, 0xef, 0x47, 0xd0, 0x66, 0x43, 0x6f, 0x91,
+ 0x51, 0xdc, 0x8f, 0x40, 0x16, 0x72, 0xc2, 0x27, 0x0b, 0x13, 0xe1, 0x2a, 0xc5, 0xa0, 0xc5, 0xa7,
+ 0x9b, 0x9a, 0x9a, 0x72, 0xff, 0xd5, 0xac, 0xeb, 0xef, 0xef, 0x4f, 0x45, 0xd0, 0x2d, 0x31, 0xa1,
+ 0x5b, 0x5b, 0x5b, 0xcf, 0xe7, 0x6c, 0x58, 0xe5, 0x4f, 0x24, 0x64, 0xb7, 0xdb, 0x0f, 0xa2, 0x64,
+ 0x77, 0x45, 0xb7, 0xa2, 0xe4, 0x9e, 0x45, 0x4d, 0xef, 0xbe, 0xbe, 0xbe, 0x7c, 0x3c, 0xe9, 0xd7,
+ 0x45, 0x82, 0x30, 0x06, 0xe6, 0x8e, 0xc1, 0x8f, 0x78, 0xd3, 0xa9, 0x36, 0xfe, 0xc1, 0x59, 0x2f,
+ 0x6f, 0x39, 0xd2, 0xc1, 0xfd, 0x7b, 0x02, 0x8f, 0xe3, 0x06, 0xef, 0x0c, 0x66, 0x64, 0xd7, 0x92,
+ 0x5f, 0x7c, 0x48, 0xe0, 0x03, 0x53, 0x09, 0xde, 0x45, 0x31, 0x50, 0xe2, 0x0b, 0x38, 0x55, 0xee,
+ 0x7f, 0x7e, 0xc3, 0xe2, 0x74, 0xea, 0xce, 0x7d, 0x81, 0x66, 0xf7, 0x99, 0x16, 0xde, 0x36, 0xb4,
+ 0x93, 0xef, 0x1c, 0xf0, 0x73, 0xcf, 0x89, 0x76, 0xbe, 0x75, 0xd0, 0x35, 0x61, 0x36, 0x9b, 0x23,
+ 0xa2, 0xeb, 0x5e, 0xc9, 0x37, 0xc3, 0xbb, 0xe3, 0x75, 0xda, 0x17, 0x34, 0x43, 0xc3, 0xff, 0x48,
+ 0xe8, 0x8c, 0xed, 0xf5, 0x08, 0x99, 0x3e, 0xb7, 0x5f, 0x80, 0xc8, 0xfb, 0x89, 0x3e, 0x48, 0x96,
+ 0x2c, 0x64, 0xf9, 0xa5, 0x3a, 0xb3, 0xe2, 0xb6, 0xe3, 0x4f, 0x30, 0x23, 0xb0, 0x8e, 0x57, 0x0d,
+ 0x42, 0x44, 0xf3, 0xa2, 0xcf, 0x2c, 0xc1, 0x3f, 0xcc, 0xc3, 0x66, 0x7a, 0x03, 0x39, 0xbc, 0xd6,
+ 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE via_xpm[1] = {{ png, sizeof( png ), "via_xpm" }};
+
+//EOF

bitmaps_png/sources/change_entry_orient.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="48"
+   width="48"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 "
+   sodipodi:docname="change_entry_orient.svg">
+  <metadata
+     id="metadata53">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="968"
+     id="namedview51"
+     showgrid="false"
+     inkscape:zoom="9.7321397"
+     inkscape:cx="8.2414503"
+     inkscape:cy="26.142558"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <mask
+       id="e">
+      <rect
+         transform="rotate(90)"
+         height="8.6868"
+         width="9.3725"
+         y="-72.949"
+         x="35.044"
+         fill="#fff"
+         id="rect7" />
+      <rect
+         transform="rotate(90)"
+         height="8.6868"
+         width="9.3725"
+         y="-87.48"
+         x="35.044"
+         fill="#fff"
+         id="rect9" />
+      <rect
+         transform="rotate(90)"
+         height="8.6868"
+         width="9.3725"
+         y="-102.01"
+         x="35.044"
+         fill="#fff"
+         id="rect11" />
+      <rect
+         transform="rotate(90)"
+         height="8.6868"
+         width="9.3725"
+         y="-116.54"
+         x="35.044"
+         fill="#fff"
+         id="rect13" />
+    </mask>
+    <mask
+       id="f">
+      <rect
+         transform="rotate(90)"
+         height="8.6868"
+         width="9.3725"
+         y="-72.949"
+         x="35.044"
+         fill="#fff"
+         id="rect16" />
+      <rect
+         transform="rotate(90)"
+         height="8.6868"
+         width="9.3725"
+         y="-87.48"
+         x="35.044"
+         fill="#fff"
+         id="rect18" />
+      <rect
+         transform="rotate(90)"
+         height="8.6868"
+         width="9.3725"
+         y="-102.01"
+         x="35.044"
+         fill="#fff"
+         id="rect20" />
+      <rect
+         transform="rotate(90)"
+         height="8.6868"
+         width="9.3725"
+         y="-116.54"
+         x="35.044"
+         fill="#fff"
+         id="rect22" />
+    </mask>
+    <filter
+       id="d"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         stdDeviation="0.76169817"
+         id="feGaussianBlur25" />
+    </filter>
+    <mask
+       id="e-1">
+      <rect
+         style="fill:#ffffff"
+         transform="matrix(0,1,-1,0,0,0)"
+         height="8.6868"
+         width="9.3725004"
+         y="-72.948997"
+         x="35.043999"
+         id="rect7-7" />
+      <rect
+         style="fill:#ffffff"
+         transform="matrix(0,1,-1,0,0,0)"
+         height="8.6868"
+         width="9.3725004"
+         y="-87.480003"
+         x="35.043999"
+         id="rect9-4" />
+      <rect
+         style="fill:#ffffff"
+         transform="matrix(0,1,-1,0,0,0)"
+         height="8.6868"
+         width="9.3725004"
+         y="-102.01"
+         x="35.043999"
+         id="rect11-0" />
+      <rect
+         style="fill:#ffffff"
+         transform="matrix(0,1,-1,0,0,0)"
+         height="8.6868"
+         width="9.3725004"
+         y="-116.54"
+         x="35.043999"
+         id="rect13-9" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter3840">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.77409508"
+         id="feGaussianBlur3842" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3840-8">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.77409508"
+         id="feGaussianBlur3842-2" />
+    </filter>
+  </defs>
+  <g
+     id="g3890"
+     transform="translate(34.422029,34.730287)">
+    <g
+       id="g35-5"
+       transform="matrix(0,2.9379,-2.1996,0,8.491481,-32.124217)">
+      <rect
+         style="fill-opacity:0"
+         id="rect37-5"
+         x="0"
+         y="0"
+         width="16"
+         height="16" />
+    </g>
+    <path
+       transform="matrix(0,0.91790986,-0.91920821,0,11.841319,-33.997331)"
+       inkscape:connector-curvature="0"
+       id="path3800-8-1"
+       d="m 7.8690809,3.4934004 41.1855461,40.6965116 0,0"
+       style="opacity:0.26068373;fill:none;stroke:#37574d;stroke-width:6.38199997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3840-8)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3800-7"
+       d="m 8.5224219,-31.309913 -38.1711689,38.464589 0,0"
+       style="opacity:0.57692309;fill:none;stroke:#0539b2;stroke-width:5.9735837;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     id="g3844">
+    <g
+       id="g35"
+       transform="matrix(2.9379,0,0,2.1996,2.1067,3.2221)">
+      <rect
+         id="rect37"
+         x="0"
+         y="0"
+         width="16"
+         height="16"
+         fill-opacity="0" />
+    </g>
+    <path
+       transform="matrix(0.91790986,0,0,0.91920821,0.23358571,-0.12773803)"
+       inkscape:connector-curvature="0"
+       id="path3800-8"
+       d="m 7.8690809,3.4934004 41.1855461,40.6965116 0,0"
+       style="opacity:0.26068373;fill:none;stroke:#37574d;stroke-width:6.38199997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3840)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3800"
+       d="m 2.9210036,3.1911591 38.4645894,38.1711689 0,0"
+       style="fill:none;stroke:#73ce06;stroke-width:5.9735837;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>

bitmaps_png/sources/lang_bg.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 0.24 0.24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 "
+   sodipodi:docname="lang_bg.svg">
+  <metadata
+     id="metadata14">
+    <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="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1123"
+     inkscape:window-height="807"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="11.244203"
+     inkscape:cx="26.61597"
+     inkscape:cy="26.235738"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <g
+     id="g2991"
+     transform="matrix(0.04798479,0,0,0.07959657,0,0.22089684)">
+    <rect
+       style="fill:#ffffff"
+       y="-2.76"
+       x="0"
+       id="rect4"
+       height="3"
+       width="5" />
+    <rect
+       style="fill:#00966e"
+       x="0"
+       id="rect6"
+       y="-1.76"
+       height="2"
+       width="5" />
+    <rect
+       style="fill:#d62612"
+       x="0"
+       id="rect8"
+       y="-0.75999999"
+       height="1"
+       width="5" />
+  </g>
+</svg>

bitmaps_png/sources/via.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="48"
+   width="48"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 "
+   sodipodi:docname="via_sketch.svg">
+  <metadata
+     id="metadata16">
+    <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="defs14">
+    <filter
+       inkscape:collect="always"
+       id="filter3808">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.79203718"
+         id="feGaussianBlur3810" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="968"
+     id="namedview12"
+     showgrid="false"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="false"
+     inkscape:zoom="10.873341"
+     inkscape:cx="10.68511"
+     inkscape:cy="22.398101"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <g
+     id="g3798"
+     style="opacity:0.38671875;filter:url(#filter3808)"
+     transform="translate(-90.843526,3.6539241)">
+    <rect
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-opacity:1"
+       id="rect4-4"
+       x="93.149178"
+       y="11.34338"
+       width="29.813433"
+       height="8.7306871"
+       ry="2.3031542"
+       rx="0" />
+    <rect
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-opacity:1"
+       id="rect6-8"
+       x="11.503523"
+       y="-123.2624"
+       width="30.819489"
+       height="8.5042381"
+       ry="2.243417"
+       rx="0"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.2720027;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path8-1"
+       d="m 134.31482,15.979044 a 15.30449,14.862257 0 1 1 -30.60898,0 15.30449,14.862257 0 1 1 30.60898,0 z" />
+    <path
+       style="fill:#000000;stroke:#000000;stroke-width:3.44060159;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path10-0"
+       d="m 124.433,15.872462 a 5.7326026,5.8850078 0 0 1 -11.4652,0 5.7326026,5.8850078 0 1 1 11.4652,0 z" />
+  </g>
+  <rect
+     rx="0"
+     ry="2.3031542"
+     height="8.7306871"
+     width="29.813433"
+     y="16.90716"
+     x="0.41774505"
+     id="rect4"
+     style="fill:#ff0000;fill-rule:evenodd" />
+  <rect
+     transform="matrix(0,1,-1,0,0,0)"
+     rx="0"
+     ry="2.243417"
+     height="8.5042381"
+     width="30.819489"
+     y="-30.530968"
+     x="17.067303"
+     id="rect6"
+     style="fill:#38d948;fill-rule:evenodd" />
+  <path
+     d="m 41.583387,21.542825 a 15.304489,14.862256 0 1 1 -30.608977,0 15.304489,14.862256 0 1 1 30.608977,0 z"
+     id="path8"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#6c6c6c;stroke-width:4;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+  <path
+     d="m 31.701569,21.436243 a 5.7326025,5.8850077 0 1 1 -11.465205,0 5.7326025,5.8850077 0 1 1 11.465205,0 z"
+     id="path10"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#119b1d;stroke-width:3.44060159" />
+</svg>

common/base_struct.cpp

@@ -70,7 +70,6 @@ EDA_ITEM::EDA_ITEM( const EDA_ITEM& base )
     m_Flags      = base.m_Flags;
     SetTimeStamp( base.m_TimeStamp );
     m_Status     = base.m_Status;
-    m_Selected   = base.m_Selected;
 }
 
 
@@ -86,7 +85,7 @@ void EDA_ITEM::InitVars()
     m_Flags     = 0;        // flags for editions and other
     SetTimeStamp( 0 );      // Time stamp used for logical links
     m_Status    = 0;
-    m_Selected  = 0;        // Used by block commands, and selective editing
+    m_forceVisible = false; // true to override the visibility setting of the item.
 }
 
 

common/block_commande.cpp

+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
+ * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
+ * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 /**
  * @file block_commande.cpp
  * @brief Common routines for managing on block commands.
@@ -181,7 +206,7 @@ bool EDA_DRAW_FRAME::HandleBlockBegin( wxDC* DC, int key, const wxPoint& startpo
     if( ( Block->m_Command != BLOCK_IDLE ) || ( Block->m_State != STATE_NO_BLOCK ) )
         return false;
 
-    Block->m_Flags   = 0;
+    Block->ClearFlags();
     Block->m_Command = (CmdBlockType) ReturnBlockCommand( key );
 
     if( Block->m_Command == 0 )
@@ -203,11 +228,11 @@ bool EDA_DRAW_FRAME::HandleBlockBegin( wxDC* DC, int key, const wxPoint& startpo
     case BLOCK_MIRROR_X:
     case BLOCK_MIRROR_Y:            /* mirror */
     case BLOCK_PRESELECT_MOVE:      /* Move with preselection list*/
-        Block->InitData( DrawPanel, startpos );
+        Block->InitData( m_canvas, startpos );
         break;
 
     case BLOCK_PASTE:
-        Block->InitData( DrawPanel, startpos );
+        Block->InitData( m_canvas, startpos );
         Block->m_BlockLastCursorPosition.x = 0;
         Block->m_BlockLastCursorPosition.y = 0;
         InitBlockPasteInfos();
@@ -216,11 +241,11 @@ bool EDA_DRAW_FRAME::HandleBlockBegin( wxDC* DC, int key, const wxPoint& startpo
         {
             DisplayError( this, wxT( "No Block to paste" ), 20 );
             GetScreen()->m_BlockLocate.m_Command = BLOCK_IDLE;
-            DrawPanel->m_mouseCaptureCallback = NULL;
+            m_canvas->m_mouseCaptureCallback = NULL;
             return true;
         }
 
-        if( !DrawPanel->IsMouseCaptured() )
+        if( !m_canvas->IsMouseCaptured() )
         {
             Block->m_ItemsSelection.ClearItemsList();
             DisplayError( this,
@@ -229,7 +254,7 @@ bool EDA_DRAW_FRAME::HandleBlockBegin( wxDC* DC, int key, const wxPoint& startpo
         }
 
         Block->m_State = STATE_BLOCK_MOVE;
-        DrawPanel->m_mouseCaptureCallback( DrawPanel, DC, startpos, false );
+        m_canvas->m_mouseCaptureCallback( m_canvas, DC, startpos, false );
         break;
 
     default:
@@ -298,7 +323,7 @@ void AbortBlockCurrentCommand( EDA_DRAW_PANEL* Panel, wxDC* DC )
             screen->m_BlockLocate.ClearItemsList();
     }
 
-    screen->m_BlockLocate.m_Flags = 0;
+    screen->m_BlockLocate.ClearFlags();
     screen->m_BlockLocate.m_State = STATE_NO_BLOCK;
     screen->m_BlockLocate.m_Command = BLOCK_ABORT;
     Panel->GetParent()->HandleBlockEnd( DC );

common/copy_to_clipboard.cpp

@@ -25,9 +25,9 @@ void EDA_DRAW_FRAME::CopyToClipboard( wxCommandEvent& event )
     if( event.GetId() == ID_GEN_COPY_BLOCK_TO_CLIPBOARD )
     {
         if( GetScreen()->IsBlockActive() )
-            DrawPanel->SetCursor( wxCursor( DrawPanel->GetDefaultCursor() ) );
+            m_canvas->SetCursor( wxCursor( m_canvas->GetDefaultCursor() ) );
 
-        DrawPanel->EndMouseCapture();
+        m_canvas->EndMouseCapture();
     }
 }
 
@@ -48,7 +48,7 @@ bool DrawPageOnClipboard( EDA_DRAW_FRAME* aFrame )
     int     ClipboardSizeX, ClipboardSizeY;
     bool    DrawBlock = false;
     wxRect  DrawArea;
-    BASE_SCREEN* screen = aFrame->DrawPanel->GetScreen();
+    BASE_SCREEN* screen = aFrame->GetCanvas()->GetScreen();
 
     /* scale is the ratio resolution/internal units */
     float   scale = 82.0 / aFrame->GetInternalUnits();
@@ -73,7 +73,7 @@ bool DrawPageOnClipboard( EDA_DRAW_FRAME* aFrame )
 
     wxMetafileDC dc;
 
-    EDA_RECT tmp = aFrame->DrawPanel->m_ClipBox;
+    EDA_RECT tmp = aFrame->GetCanvas()->m_ClipBox;
     GRResetPenAndBrush( &dc );
     const bool plotBlackAndWhite = false;
     GRForceBlackPen( plotBlackAndWhite );
@@ -81,10 +81,10 @@ bool DrawPageOnClipboard( EDA_DRAW_FRAME* aFrame )
     dc.SetUserScale( scale, scale );
     ClipboardSizeX = dc.MaxX() + 10;
     ClipboardSizeY = dc.MaxY() + 10;
-    aFrame->DrawPanel->m_ClipBox.SetX( 0 );
-    aFrame->DrawPanel->m_ClipBox.SetY( 0 );
-    aFrame->DrawPanel->m_ClipBox.SetWidth( 0x7FFFFF0 );
-    aFrame->DrawPanel->m_ClipBox.SetHeight( 0x7FFFFF0 );
+    aFrame->GetCanvas()->m_ClipBox.SetX( 0 );
+    aFrame->GetCanvas()->m_ClipBox.SetY( 0 );
+    aFrame->GetCanvas()->m_ClipBox.SetWidth( 0x7FFFFF0 );
+    aFrame->GetCanvas()->m_ClipBox.SetHeight( 0x7FFFFF0 );
 
     if( DrawBlock )
     {
@@ -94,7 +94,7 @@ bool DrawPageOnClipboard( EDA_DRAW_FRAME* aFrame )
     const int maskLayer = 0xFFFFFFFF;
     aFrame->PrintPage( &dc, maskLayer, false );
     screen->m_IsPrinting = false;
-    aFrame->DrawPanel->m_ClipBox = tmp;
+    aFrame->GetCanvas()->m_ClipBox = tmp;
     wxMetafile* mf = dc.Close();
 
     if( mf )

common/dialogs/dialog_page_settings.cpp

@@ -29,8 +29,8 @@ void EDA_DRAW_FRAME::Process_PageSettings( wxCommandEvent& event )
     DIALOG_PAGES_SETTINGS frame( this );
     int diag = frame.ShowModal();
 
-    if( DrawPanel && diag )
-        DrawPanel->Refresh();
+    if( m_canvas && diag )
+        m_canvas->Refresh();
 }
 
 
@@ -257,7 +257,7 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings( wxCommandEvent& event )
 #endif
 
     m_Screen->SetModify();
-    m_Parent->DrawPanel->Refresh();
+    m_Parent->GetCanvas()->Refresh();
 }
 
 

common/drawframe.cpp

@@ -94,7 +94,7 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* father, int idtype, const wxString& ti
     m_zoomSelectBox       = NULL;
     m_HotkeysZoomAndGridList = NULL;
 
-    DrawPanel             = NULL;
+    m_canvas              = NULL;
     m_messagePanel        = NULL;
     m_currentScreen       = NULL;
     m_toolId              = ID_NO_TOOL_SELECTED;
@@ -142,7 +142,7 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* father, int idtype, const wxString& ti
     m_FramePos.x   = m_FramePos.y = 0;
     m_FrameSize.y -= m_MsgFrameHeight;
 
-    DrawPanel = new EDA_DRAW_PANEL( this, -1, wxPoint( 0, 0 ), m_FrameSize );
+    m_canvas = new EDA_DRAW_PANEL( this, -1, wxPoint( 0, 0 ), m_FrameSize );
     m_messagePanel  = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_FrameSize.y ),
                                          wxSize( m_FrameSize.x, m_MsgFrameHeight ) );
 
@@ -182,8 +182,8 @@ void EDA_DRAW_FRAME::OnActivate( wxActivateEvent& event )
 {
     m_FrameIsActive = event.GetActive();
 
-    if( DrawPanel )
-        DrawPanel->m_CanStartBlock = -1;
+    if( m_canvas )
+        m_canvas->m_CanStartBlock = -1;
 
     event.Skip();   // required under wxMAC
 }
@@ -191,8 +191,8 @@ void EDA_DRAW_FRAME::OnActivate( wxActivateEvent& event )
 
 void EDA_DRAW_FRAME::OnMenuOpen( wxMenuEvent& event )
 {
-    if( DrawPanel )
-        DrawPanel->m_CanStartBlock = -1;
+    if( m_canvas )
+        m_canvas->m_CanStartBlock = -1;
 
     event.Skip();
 }
@@ -201,7 +201,7 @@ void EDA_DRAW_FRAME::OnMenuOpen( wxMenuEvent& event )
 void EDA_DRAW_FRAME::OnToggleGridState( wxCommandEvent& aEvent )
 {
     SetGridVisibility( !IsGridVisible() );
-    DrawPanel->Refresh();
+    m_canvas->Refresh();
 }
 
 
@@ -222,10 +222,10 @@ void EDA_DRAW_FRAME::OnSelectUnits( wxCommandEvent& aEvent )
 
 void EDA_DRAW_FRAME::OnToggleCrossHairStyle( wxCommandEvent& aEvent )
 {
-    INSTALL_UNBUFFERED_DC( dc, DrawPanel );
-    DrawPanel->CrossHairOff( &dc );
+    INSTALL_UNBUFFERED_DC( dc, m_canvas );
+    m_canvas->CrossHairOff( &dc );
     m_cursorShape = !m_cursorShape;
-    DrawPanel->CrossHairOn( &dc );
+    m_canvas->CrossHairOn( &dc );
 }
 
 
@@ -445,9 +445,9 @@ void EDA_DRAW_FRAME::SetToolID( int aId, int aCursor, const wxString& aToolMsg )
     // Keep default cursor in toolbars
     SetCursor( wxNullCursor );
 
-    // Change DrawPanel cursor if requested.
-    if( DrawPanel && aCursor >= 0 )
-        DrawPanel->SetCurrentCursor( aCursor );
+    // Change m_canvas cursor if requested.
+    if( m_canvas && aCursor >= 0 )
+        m_canvas->SetCurrentCursor( aCursor );
 
     DisplayToolMsg( aToolMsg );
 
@@ -486,7 +486,7 @@ int EDA_DRAW_FRAME::ReturnBlockCommand( int key )
 void EDA_DRAW_FRAME::InitBlockPasteInfos()
 {
     GetScreen()->m_BlockLocate.ClearItemsList();
-    DrawPanel->m_mouseCaptureCallback = NULL;
+    m_canvas->m_mouseCaptureCallback = NULL;
 }
 
 
@@ -508,7 +508,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition )
     BASE_SCREEN* screen = GetScreen();
     bool noRefresh = true;
 
-    if( screen == NULL || DrawPanel == NULL )
+    if( screen == NULL || m_canvas == NULL )
         return;
 
     double scalar = screen->GetScalingFactor();
@@ -518,7 +518,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition )
 
     // Calculate the portion of the drawing that can be displayed in the
     // client area at the current zoom level.
-    clientSize = DrawPanel->GetClientSize();
+    clientSize = m_canvas->GetClientSize();
 
     // The logical size of the client window.
     logicalClientSize.x = wxRound( (double) clientSize.x / scalar );
@@ -693,7 +693,7 @@ SetScrollbars(%d, %d, %d, %d, %d, %d)" ),
                 screen->m_ScrollbarNumber.x, screen->m_ScrollbarNumber.y,
                 screen->m_ScrollbarPos.x, screen->m_ScrollbarPos.y );
 
-    DrawPanel->SetScrollbars( screen->m_ScrollPixelsPerUnitX,
+    m_canvas->SetScrollbars( screen->m_ScrollPixelsPerUnitX,
                              screen->m_ScrollPixelsPerUnitY,
                              screen->m_ScrollbarNumber.x,
                              screen->m_ScrollbarNumber.y,

common/drawpanel.cpp

@@ -63,7 +63,7 @@ BEGIN_EVENT_TABLE( EDA_DRAW_PANEL, wxScrolledWindow )
     EVT_MOUSEWHEEL( EDA_DRAW_PANEL::OnMouseWheel )
     EVT_MOUSE_EVENTS( EDA_DRAW_PANEL::OnMouseEvent )
     EVT_CHAR( EDA_DRAW_PANEL::OnKeyEvent )
-    EVT_CHAR_HOOK( EDA_DRAW_PANEL::OnKeyEvent )
+    EVT_CHAR_HOOK( EDA_DRAW_PANEL::OnCharHook )
     EVT_PAINT( EDA_DRAW_PANEL::OnPaint )
     EVT_ERASE_BACKGROUND( EDA_DRAW_PANEL::OnEraseBackground )
     EVT_SCROLLWIN( EDA_DRAW_PANEL::OnScroll )
@@ -421,15 +421,15 @@ void EDA_DRAW_PANEL::SetClipBox( wxDC& aDC, const wxRect* aRect )
     clipBox.Inflate( CLIP_BOX_PADDING );
 
     // Convert from device units to drawing units.
-    m_ClipBox.m_Pos = wxPoint( aDC.DeviceToLogicalX( clipBox.x ),
-                               aDC.DeviceToLogicalY( clipBox.y ) );
-    m_ClipBox.m_Size = wxSize( aDC.DeviceToLogicalXRel( clipBox.width ),
-                               aDC.DeviceToLogicalYRel( clipBox.height ) );
+    m_ClipBox.SetOrigin( wxPoint( aDC.DeviceToLogicalX( clipBox.x ),
+                                  aDC.DeviceToLogicalY( clipBox.y ) ) );
+    m_ClipBox.SetSize( wxSize( aDC.DeviceToLogicalXRel( clipBox.width ),
+                               aDC.DeviceToLogicalYRel( clipBox.height ) ) );
 
     wxLogTrace( KICAD_TRACE_COORDS,
                 wxT( "Device clip box=(%d, %d, %d, %d), Logical clip box=(%d, %d, %d, %d)" ),
                 clipBox.x, clipBox.y, clipBox.width, clipBox.height,
-                m_ClipBox.m_Pos.x, m_ClipBox.m_Pos.y, m_ClipBox.m_Size.x, m_ClipBox.m_Size.y );
+                m_ClipBox.GetX(), m_ClipBox.GetY(), m_ClipBox.GetWidth(), m_ClipBox.GetHeight() );
 }
 
 
@@ -574,7 +574,7 @@ void EDA_DRAW_PANEL::DrawGrid( wxDC* aDC )
     screenGridSize.x = aDC->LogicalToDeviceXRel( wxRound( gridSize.x ) );
     screenGridSize.y = aDC->LogicalToDeviceYRel( wxRound( gridSize.y ) );
 
-    org = m_ClipBox.m_Pos;
+    org = m_ClipBox.GetPosition();
 
     if( screenGridSize.x < MIN_GRID_SIZE || screenGridSize.y < MIN_GRID_SIZE )
     {
@@ -668,7 +668,7 @@ void EDA_DRAW_PANEL::DrawGrid( wxDC* aDC )
     for( double x = (double) org.x; x <= right; x += gridSize.x )
     {
         aDC->Blit( scaleDC.LogicalToDeviceX( wxRound( x ) ),
-                   scaleDC.LogicalToDeviceY( m_ClipBox.m_Pos.y ),
+                   scaleDC.LogicalToDeviceY( m_ClipBox.GetY() ),
                    1, tmpBM.GetHeight(), &tmpDC, 0, 0, wxCOPY, true );
     }
 #endif
@@ -1107,6 +1107,12 @@ void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event )
 }
 
 
+
+void EDA_DRAW_PANEL::OnCharHook( wxKeyEvent& event )
+{
+    event.Skip();
+}
+
 void EDA_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event )
 {
     int localkey;
@@ -1116,14 +1122,8 @@ void EDA_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event )
 
     switch( localkey )
     {
-    case WXK_CONTROL:
-    case WXK_CAPITAL:
-    case WXK_SHIFT:
-    case WXK_NUMLOCK:
-    case WXK_LBUTTON:
-    case WXK_RBUTTON:
-    case WXK_ALT:
-        return;
+        default:
+            break;
 
     case WXK_ESCAPE:
         m_AbortRequest = true;
@@ -1132,7 +1132,6 @@ void EDA_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event )
             EndMouseCapture();
         else
             EndMouseCapture( ID_NO_TOOL_SELECTED, m_defaultCursor, wxEmptyString );
-
         break;
     }
 

common/drawtxt.cpp

@@ -204,7 +204,7 @@ static int overbar_position( int size_v, int thickness )
 /**
  * Function DrawGraphicText
  * Draw a graphic text (like module texts)
- *  @param aPanel = the current DrawPanel. NULL if draw within a 3D GL Canvas
+ *  @param aPanel = the current m_canvas. NULL if draw within a 3D GL Canvas
  *  @param aDC = the current Device Context. NULL if draw within a 3D GL Canvas
  *  @param aPos = text position (according to h_justify, v_justify)
  *  @param aColor (enum EDA_Colors) = text color

common/sch_item_struct.cpp

@@ -100,13 +100,13 @@ void SCH_ITEM::Place( SCH_EDIT_FRAME* aFrame, wxDC* aDC )
     m_Flags = 0;
     screen->SetModify();
     screen->SetCurItem( NULL );
-    aFrame->DrawPanel->SetMouseCapture( NULL, NULL );
-    aFrame->DrawPanel->EndMouseCapture();
+    aFrame->GetCanvas()->SetMouseCapture( NULL, NULL );
+    aFrame->GetCanvas()->EndMouseCapture();
 
     if( aDC )
     {
-        EDA_CROSS_HAIR_MANAGER( aFrame->DrawPanel, aDC );  // Erase schematic cursor
-        Draw( aFrame->DrawPanel, aDC, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
+        EDA_CROSS_HAIR_MANAGER( aFrame->GetCanvas(), aDC );  // Erase schematic cursor
+        Draw( aFrame->GetCanvas(), aDC, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
     }
 }
 

common/zoom.cpp

@@ -22,10 +22,10 @@ void EDA_DRAW_FRAME::RedrawScreen( const wxPoint& aCenterPoint, bool aWarpPointe
 
     // Move the mouse cursor to the on grid graphic cursor position
     if( aWarpPointer )
-        DrawPanel->MoveCursorToCrossHair();
+        m_canvas->MoveCursorToCrossHair();
 
-    DrawPanel->Refresh();
-    DrawPanel->Update();
+    m_canvas->Refresh();
+    m_canvas->Update();
  }
 
 
@@ -55,7 +55,7 @@ void EDA_DRAW_FRAME::Window_Zoom( EDA_RECT& Rect )
 
     /* Compute the best zoom */
     Rect.Normalize();
-    size = DrawPanel->GetClientSize();
+    size = m_canvas->GetClientSize();
 
     // Use ceil to at least show the full rect
     scalex    = (double) Rect.GetSize().x / size.x;
@@ -73,7 +73,7 @@ void EDA_DRAW_FRAME::Window_Zoom( EDA_RECT& Rect )
  */
 void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
 {
-    if( DrawPanel == NULL )
+    if( m_canvas == NULL )
         return;
 
     int          i;
@@ -105,7 +105,7 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
         break;
 
     case ID_ZOOM_REDRAW:
-        DrawPanel->Refresh();
+        m_canvas->Refresh();
         break;
 
     case ID_POPUP_ZOOM_CENTER:
@@ -121,7 +121,7 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
         break;
 
     case ID_POPUP_CANCEL:
-        DrawPanel->MoveCursorToCrossHair();
+        m_canvas->MoveCursorToCrossHair();
         break;
 
     default:
@@ -149,7 +149,7 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
     int         maxZoomIds;
     int         zoom;
     wxString    msg;
-    BASE_SCREEN * screen = DrawPanel->GetScreen();
+    BASE_SCREEN * screen = m_canvas->GetScreen();
 
     msg = AddHotkeyName( _( "Center" ), m_HotkeysZoomAndGridList, HK_ZOOM_CENTER );
     AddMenuItem( MasterMenu, ID_POPUP_ZOOM_CENTER, msg, KiBitmap( zoom_center_on_screen_xpm ) );

cvpcb/class_DisplayFootprintsFrame.cpp

@@ -128,7 +128,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father,
         m_auimgr.AddPane( m_drawToolBar,
                           wxAuiPaneInfo( vert ).Name( wxT( "m_drawToolBar" ) ).Right() );
 
-    m_auimgr.AddPane( DrawPanel,
+    m_auimgr.AddPane( m_canvas,
                       wxAuiPaneInfo().Name( wxT( "DisplayFrame" ) ).CentrePane() );
 
     m_auimgr.AddPane( m_messagePanel,
@@ -313,7 +313,7 @@ void DISPLAY_FOOTPRINTS_FRAME::OnSelectOptionToolbar( wxCommandEvent& event )
         if( m_DisplayModText > 2 )
             m_DisplayModText = 0;
 
-        DrawPanel->Refresh( );
+        m_canvas->Refresh( );
         break;
 
     case ID_TB_OPTIONS_SHOW_MODULE_EDGE_SKETCH:
@@ -322,7 +322,7 @@ void DISPLAY_FOOTPRINTS_FRAME::OnSelectOptionToolbar( wxCommandEvent& event )
         if( m_DisplayModEdge > 2 )
             m_DisplayModEdge = 0;
 
-        DrawPanel->Refresh();
+        m_canvas->Refresh();
         break;
 
     default:
@@ -381,25 +381,25 @@ void DISPLAY_FOOTPRINTS_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPositi
     case WXK_NUMPAD8:       /* cursor moved up */
     case WXK_UP:
         pos.y -= wxRound( gridSize.y );
-        DrawPanel->MoveCursor( pos );
+        m_canvas->MoveCursor( pos );
         break;
 
     case WXK_NUMPAD2:       /* cursor moved down */
     case WXK_DOWN:
         pos.y += wxRound( gridSize.y );
-        DrawPanel->MoveCursor( pos );
+        m_canvas->MoveCursor( pos );
         break;
 
     case WXK_NUMPAD4:       /*  cursor moved left */
     case WXK_LEFT:
         pos.x -= wxRound( gridSize.x );
-        DrawPanel->MoveCursor( pos );
+        m_canvas->MoveCursor( pos );
         break;
 
     case WXK_NUMPAD6:      /*  cursor moved right */
     case WXK_RIGHT:
         pos.x += wxRound( gridSize.x );
-        DrawPanel->MoveCursor( pos );
+        m_canvas->MoveCursor( pos );
         break;
     }
 
@@ -409,13 +409,13 @@ void DISPLAY_FOOTPRINTS_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPositi
     {
         pos = screen->GetCrossHairPosition();
         screen->SetCrossHairPosition( oldpos );
-        DrawPanel->CrossHairOff( aDC );
+        m_canvas->CrossHairOff( aDC );
         screen->SetCrossHairPosition( pos );
-        DrawPanel->CrossHairOn( aDC );
+        m_canvas->CrossHairOn( aDC );
 
-        if( DrawPanel->IsMouseCaptured() )
+        if( m_canvas->IsMouseCaptured() )
         {
-            DrawPanel->m_mouseCaptureCallback( DrawPanel, aDC, aPosition, 0 );
+            m_canvas->m_mouseCaptureCallback( m_canvas, aDC, aPosition, 0 );
         }
     }
 

cvpcb/cvframe.cpp

@@ -500,36 +500,47 @@ void CVPCB_MAINFRAME::OnLeftDClick( wxListEvent& event )
 }
 
 
+/* Called when clicking on a component in component list window
+ * * Updates the filtered foorprint list, if the filtered list option is selected
+ * * Updates the current selected footprint in footprint list
+ * * Updates the footprint shown in footprint display window (if opened)
+ */
 void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event )
 {
-    int selection;
+    #define REDRAW_LIST true
+    #define SELECT_FULL_LIST true
+    int selection = -1;
 
     if( !m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST ) )
-    {
-        m_FootprintList->SetActiveFootprintList( true, true );
-        return;
-    }
+        m_FootprintList->SetActiveFootprintList( SELECT_FULL_LIST, REDRAW_LIST );
 
+    else
+    {
         selection = m_ListCmp->GetSelection();
 
         if( selection < 0 )
-    {
-        m_FootprintList->SetActiveFootprintList( true, true );
-        return;
-    }
+            m_FootprintList->SetActiveFootprintList( SELECT_FULL_LIST, REDRAW_LIST );
 
-    if( &m_components[ selection ] == NULL )
+        else
         {
-        m_FootprintList->SetActiveFootprintList( true, true );
-        return;
+            if( &m_components[ selection ] == NULL )
+                m_FootprintList->SetActiveFootprintList( SELECT_FULL_LIST, REDRAW_LIST );
+            else
+                m_FootprintList->SetFootprintFilteredList( &m_components[ selection ],
+                                                           m_footprints );
+        }
     }
 
-    m_FootprintList->SetFootprintFilteredList( &m_components[ selection ], m_footprints );
+    selection = m_ListCmp->GetSelection();
+
+    if( selection < 0 )
+        return;
 
     // Preview of the already assigned footprint.
     // Find the footprint that was already choosen for this component and select it.
     wxString module = *(&m_components[ selection ].m_Module);
 
+    bool found = false;
     for( int ii = 0; ii < m_FootprintList->GetCount(); ii++ )
     {
         wxString footprintName;
@@ -539,11 +550,24 @@ void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event )
         footprintName = msg.AfterFirst( wxChar( ' ' ) );
 
         if( module.Cmp( footprintName ) == 0 )
+        {
             m_FootprintList->SetSelection( ii, true );
-        else
+            found = true;
+            break;
+        }
+    }
+    if( ! found )
+    {
+        int ii = m_FootprintList->GetSelection();
+        if ( ii >= 0 )
             m_FootprintList->SetSelection( ii, false );
+        if( m_DisplayFootprintFrame )
+        {
+            CreateScreenCmp();
+        }
     }
 
+
     SendMessageToEESCHEMA();
     DisplayStatus();
 }

cvpcb/cvpcb_mainframe.h

@@ -54,6 +54,14 @@ public:
 
     void             OnLeftClick( wxListEvent& event );
     void             OnLeftDClick( wxListEvent& event );
+
+    /**
+     * Function OnSelectComponent
+     * Called when clicking on a component in component list window
+     * * Updates the filtered foorprint list, if the filtered list option is selected
+     * * Updates the current selected footprint in footprint list
+     * * Updates the footprint shown in footprint display window (if opened)
+     */
     void             OnSelectComponent( wxListEvent& event );
 
     void             OnQuit( wxCommandEvent& event );

cvpcb/dialogs/dialog_display_options.cpp

@@ -68,7 +68,7 @@ void DIALOG_FOOTPRINTS_DISPLAY_OPTIONS::UpdateObjectSettings( void )
     m_Parent->m_DisplayModText = m_TextDisplayOption->GetSelection();
     m_Parent->m_DisplayPadNum  = m_IsShowPadNum->GetValue();
     m_Parent->m_DisplayPadFill = m_IsShowPadFill->GetValue();
-    m_Parent->DrawPanel->Refresh();
+    m_Parent->GetCanvas()->Refresh();
 }
 
 

cvpcb/setvisu.cpp

@@ -83,14 +83,24 @@ void CVPCB_MAINFRAME::CreateScreenCmp()
             m_DisplayFootprintFrame->GetBoard()->m_Modules.PushBack( mod );
 
         m_DisplayFootprintFrame->Zoom_Automatique( false );
-        m_DisplayFootprintFrame->DrawPanel->Refresh();
-        m_DisplayFootprintFrame->UpdateStatusBar();    /* Display new cursor coordinates and zoom value */
+        m_DisplayFootprintFrame->GetCanvas()->Refresh();
+
+        // Display new cursor coordinates and zoom value:
+        m_DisplayFootprintFrame->UpdateStatusBar();
 
         if( m_DisplayFootprintFrame->m_Draw3DFrame )
             m_DisplayFootprintFrame->m_Draw3DFrame->NewDisplay();
     }
-    else if( !IsNew )
+    else if( !IsNew )   // No footprint to display. Erase old footprint, if any
+    {
+        if( m_DisplayFootprintFrame->GetBoard()->m_Modules.GetCount() )
         {
+            m_DisplayFootprintFrame->GetBoard()->m_Modules.DeleteAll();
+            m_DisplayFootprintFrame->Zoom_Automatique( false );
+            m_DisplayFootprintFrame->SetStatusText( wxEmptyString, 0 );
+            m_DisplayFootprintFrame->UpdateStatusBar();
+        }
+
         m_DisplayFootprintFrame->Refresh();
 
         if( m_DisplayFootprintFrame->m_Draw3DFrame )
@@ -98,8 +108,6 @@ void CVPCB_MAINFRAME::CreateScreenCmp()
     }
 }
 
-
-
 /*
  * Draws the current highlighted footprint.
  */
@@ -108,15 +116,15 @@ void DISPLAY_FOOTPRINTS_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg )
     if( !GetBoard() )
         return;
 
-    DrawPanel->DrawBackGround( DC );
-    GetBoard()->Draw( DrawPanel, DC, GR_COPY );
+    m_canvas->DrawBackGround( DC );
+    GetBoard()->Draw( m_canvas, DC, GR_COPY );
 
     MODULE* Module = GetBoard()->m_Modules;
 
     if ( Module )
         Module->DisplayInfo( this );
 
-    DrawPanel->DrawCrossHair( DC );
+    m_canvas->DrawCrossHair( DC );
 }
 
 
@@ -131,21 +139,3 @@ void BOARD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, int aDrawMode, const wxPoin
         m_Modules->Draw( aPanel, aDC, GR_COPY );
     }
 }
-
-/* dummy_functions:
- *
- *  These functions are used in some classes.
- *  they are useful in Pcbnew, but have no meaning or are never used
- *  in CvPcb or GerbView.
- *  but they must exist because they appear in some classes.
- *  Do nothing in CvPcb.
- */
-TRACK* MarkTrace( BOARD* aPcb,
-                  TRACK* aStartSegm,
-                  int*   aSegmCount,
-                  int*   aTrackLen,
-                  int*   aLenDie,
-                  bool   aReorder )
-{
-    return NULL;
-}

demos/ecc83/ecc83-pp.pro

-update=03/12/2010 17:27:41
-last_client=pcbnew
+update=07/03/2011 07:10:15
+last_client=cvpcb
 [general]
 version=1
 RootSch=ecc83-pp.sch
@@ -65,14 +65,6 @@ LibName22=display
 LibName23=cypress
 LibName24=siliconi
 LibName25=contrib
-[cvpcb]
-version=1
-NetITyp=0
-NetIExt=.net
-PkgIExt=.pkg
-NetType=0
-[cvpcb/libraries]
-EquName1=devcms
 [pcbnew]
 version=1
 PadDrlX=760
@@ -92,8 +84,7 @@ TxtLar=120
 MSegLar=150
 LastNetListRead=
 [pcbnew/libraries]
-LibDir=
-LibName1=supports
+LibName1=dip_sockets
 LibName2=valves
 LibName3=connect
 LibName4=discret
@@ -101,3 +92,9 @@ LibName5=pin_array
 LibName6=divers
 LibName7=libcms
 LibName8=display
+LibDir=
+[cvpcb]
+version=1
+NetIExt=.net
+[cvpcb/libraries]
+EquName1=devcms

demos/ecc83/ecc83-pp_v2.sch

-EESchema Schematic File Version 2  date 30/12/2010 18:27:52
-LIBS:power
-LIBS:device
-LIBS:valves
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:contrib
-LIBS:ecc83-pp_v2-cache
-EELAYER 25  0
+EESchema Schematic File Version 2
+LIBS:power,device,valves,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,microchip,analog_switches,motorola,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib
+EELAYER 23  0
 EELAYER END
 $Descr A4 11700 8267
 Sheet 1 1
 Title "ECC Push-Pull"
-Date "30 dec 2010"
+Date "11 dec 2006"
 Rev "0.1"
 Comp ""
 Comment1 ""
@@ -42,6 +17,7 @@ Wire Wire Line
 	6050 4450 6150 4450
 Wire Wire Line
 	5750 3850 5750 4050
+Connection ~ 4450 4500
 Wire Wire Line
 	4450 5400 4450 4450
 Wire Wire Line
@@ -101,9 +77,9 @@ $Comp
 L ECC83 U1
 U 3 1 48B4F266
 P 9950 5700
-F 0 "U1" H 10080 6010 50  0000 C CNN
-F 1 "ECC83" H 10300 5400 50  0000 C CNN
-F 2 "VALVE-NOVAL_P" H 10220 5300 50  0001 C CNN
+F 0 "U1" H 10080 6010 50  0000 C C
+F 1 "ECC81_83" H 10300 5400 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 10220 5300 50  0001 C C
 	3    9950 5700
 	1    0    0    -1  
 $EndComp
@@ -111,9 +87,9 @@ $Comp
 L ECC83 U1
 U 2 1 48B4F263
 P 4950 4450
-F 0 "U1" H 5080 4760 50  0000 C CNN
-F 1 "ECC83" H 5150 4100 50  0000 C CNN
-F 2 "VALVE-NOVAL_P" H 5220 4050 50  0001 C CNN
+F 0 "U1" H 5080 4760 50  0000 C C
+F 1 "ECC83" H 5150 4100 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 5220 4050 50  0001 C C
 	2    4950 4450
 	1    0    0    -1  
 $EndComp
@@ -121,9 +97,9 @@ $Comp
 L ECC83 U1
 U 1 1 48B4F256
 P 5750 4450
-F 0 "U1" H 5880 4760 50  0000 C CNN
-F 1 "ECC83" H 5500 4150 50  0000 C CNN
-F 2 "VALVE-NOVAL_P" H 6020 4050 50  0001 C CNN
+F 0 "U1" H 5880 4760 50  0000 C C
+F 1 "ECC83" H 5500 4150 50  0000 C C
+F 2 "VALVE-NOVAL_P" H 6020 4050 50  0001 C C
 	1    5750 4450
 	-1   0    0    -1  
 $EndComp
@@ -131,8 +107,8 @@ $Comp
 L GND #PWR01
 U 1 1 457DBAF8
 P 6950 5150
-F 0 "#PWR01" H 6950 5150 30  0001 C CNN
-F 1 "GND" H 6950 5080 30  0001 C CNN
+F 0 "#PWR01" H 6950 5150 30  0001 C C
+F 1 "GND" H 6950 5080 30  0001 C C
 	1    6950 5150
 	1    0    0    -1  
 $EndComp
@@ -140,8 +116,8 @@ $Comp
 L GND #PWR02
 U 1 1 457DBAF5
 P 6700 5900
-F 0 "#PWR02" H 6700 5900 30  0001 C CNN
-F 1 "GND" H 6700 5830 30  0001 C CNN
+F 0 "#PWR02" H 6700 5900 30  0001 C C
+F 1 "GND" H 6700 5830 30  0001 C C
 	1    6700 5900
 	1    0    0    -1  
 $EndComp
@@ -149,8 +125,8 @@ $Comp
 L GND #PWR03
 U 1 1 457DBAF1
 P 4850 5900
-F 0 "#PWR03" H 4850 5900 30  0001 C CNN
-F 1 "GND" H 4850 5830 30  0001 C CNN
+F 0 "#PWR03" H 4850 5900 30  0001 C C
+F 1 "GND" H 4850 5830 30  0001 C C
 	1    4850 5900
 	1    0    0    -1  
 $EndComp
@@ -158,8 +134,8 @@ $Comp
 L GND #PWR04
 U 1 1 457DBAEF
 P 4450 5900
-F 0 "#PWR04" H 4450 5900 30  0001 C CNN
-F 1 "GND" H 4450 5830 30  0001 C CNN
+F 0 "#PWR04" H 4450 5900 30  0001 C C
+F 1 "GND" H 4450 5830 30  0001 C C
 	1    4450 5900
 	1    0    0    -1  
 $EndComp
@@ -167,8 +143,8 @@ $Comp
 L PWR_FLAG #FLG05
 U 1 1 457DBAC0
 P 4100 5250
-F 0 "#FLG05" H 4100 5520 30  0001 C CNN
-F 1 "PWR_FLAG" H 4100 5480 30  0000 C CNN
+F 0 "#FLG05" H 4100 5520 30  0001 C C
+F 1 "PWR_FLAG" H 4100 5480 30  0000 C C
 	1    4100 5250
 	0    -1   -1   0   
 $EndComp
@@ -176,8 +152,8 @@ $Comp
 L CONN_2 P4
 U 1 1 456A8ACC
 P 9950 6700
-F 0 "P4" V 9900 6700 40  0000 C CNN
-F 1 "CONN_2" V 10000 6700 40  0000 C CNN
+F 0 "P4" V 9900 6700 40  0000 C C
+F 1 "CONN_2" V 10000 6700 40  0000 C C
 	1    9950 6700
 	0    1    1    0   
 $EndComp
@@ -185,8 +161,8 @@ $Comp
 L C C1
 U 1 1 4549F4BE
 P 6700 4050
-F 0 "C1" H 6750 4150 50  0000 L CNN
-F 1 "10uF" H 6450 4150 50  0000 L CNN
+F 0 "C1" H 6750 4150 50  0000 L C
+F 1 "10uF" H 6450 4150 50  0000 L C
 	1    6700 4050
 	1    0    0    -1  
 $EndComp
@@ -194,8 +170,8 @@ $Comp
 L GND #PWR06
 U 1 1 4549F4B9
 P 4150 5300
-F 0 "#PWR06" H 4150 5300 30  0001 C CNN
-F 1 "GND" H 4150 5230 30  0001 C CNN
+F 0 "#PWR06" H 4150 5300 30  0001 C C
+F 1 "GND" H 4150 5230 30  0001 C C
 	1    4150 5300
 	1    0    0    -1  
 $EndComp
@@ -203,8 +179,8 @@ $Comp
 L GND #PWR07
 U 1 1 4549F4B3
 P 6950 4350
-F 0 "#PWR07" H 6950 4350 30  0001 C CNN
-F 1 "GND" H 6950 4280 30  0001 C CNN
+F 0 "#PWR07" H 6950 4350 30  0001 C C
+F 1 "GND" H 6950 4280 30  0001 C C
 	1    6950 4350
 	1    0    0    -1  
 $EndComp
@@ -212,8 +188,8 @@ $Comp
 L CONN_2 P3
 U 1 1 4549F4A5
 P 7300 3950
-F 0 "P3" V 7250 3950 40  0000 C CNN
-F 1 "POWER" V 7350 3950 40  0000 C CNN
+F 0 "P3" V 7250 3950 40  0000 C C
+F 1 "POWER" V 7350 3950 40  0000 C C
 	1    7300 3950
 	1    0    0    -1  
 $EndComp
@@ -221,8 +197,8 @@ $Comp
 L CONN_2 P2
 U 1 1 4549F46C
 P 7300 4900
-F 0 "P2" V 7250 4900 40  0000 C CNN
-F 1 "OUT" V 7350 4900 40  0000 C CNN
+F 0 "P2" V 7250 4900 40  0000 C C
+F 1 "OUT" V 7350 4900 40  0000 C C
 	1    7300 4900
 	1    0    0    -1  
 $EndComp
@@ -230,8 +206,8 @@ $Comp
 L CONN_2 P1
 U 1 1 4549F464
 P 3800 4900
-F 0 "P1" V 3750 4900 40  0000 C CNN
-F 1 "IN" V 3850 4900 40  0000 C CNN
+F 0 "P1" V 3750 4900 40  0000 C C
+F 1 "IN" V 3850 4900 40  0000 C C
 	1    3800 4900
 	-1   0    0    1   
 $EndComp
@@ -239,8 +215,8 @@ $Comp
 L C C2
 U 1 1 4549F3BE
 P 6500 4800
-F 0 "C2" H 6550 4900 50  0000 L CNN
-F 1 "680nF" H 6550 4700 50  0000 L CNN
+F 0 "C2" H 6550 4900 50  0000 L C
+F 1 "680nF" H 6550 4700 50  0000 L C
 	1    6500 4800
 	0    1    1    0   
 $EndComp
@@ -248,8 +224,8 @@ $Comp
 L R R3
 U 1 1 4549F3AD
 P 6700 5650
-F 0 "R3" V 6780 5650 50  0000 C CNN
-F 1 "100K" V 6700 5650 50  0000 C CNN
+F 0 "R3" V 6780 5650 50  0000 C C
+F 1 "100K" V 6700 5650 50  0000 C C
 	1    6700 5650
 	1    0    0    -1  
 $EndComp
@@ -257,8 +233,8 @@ $Comp
 L R R4
 U 1 1 4549F3A2
 P 4450 5650
-F 0 "R4" V 4530 5650 50  0000 C CNN
-F 1 "47K" V 4450 5650 50  0000 C CNN
+F 0 "R4" V 4530 5650 50  0000 C C
+F 1 "47K" V 4450 5650 50  0000 C C
 	1    4450 5650
 	1    0    0    -1  
 $EndComp
@@ -266,8 +242,8 @@ $Comp
 L R R2
 U 1 1 4549F39D
 P 4850 5650
-F 0 "R2" V 4930 5650 50  0000 C CNN
-F 1 "1.5K" V 4850 5650 50  0000 C CNN
+F 0 "R2" V 4930 5650 50  0000 C C
+F 1 "1.5K" V 4850 5650 50  0000 C C
 	1    4850 5650
 	1    0    0    -1  
 $EndComp
@@ -275,8 +251,8 @@ $Comp
 L R R1
 U 1 1 4549F38A
 P 6300 4250
-F 0 "R1" V 6380 4250 50  0000 C CNN
-F 1 "1.5K" V 6300 4250 50  0000 C CNN
+F 0 "R1" V 6380 4250 50  0000 C C
+F 1 "1.5K" V 6300 4250 50  0000 C C
 	1    6300 4250
 	1    0    0    -1  
 $EndComp

demos/interf_u/interf_u-cache.lib

-EESchema-LIBRARY Version 2.3  Date: 02/02/2011 07:13:37
+EESchema-LIBRARY Version 2.3  Date: 18/12/2011 10:04:44
+#encoding utf-8
 #
 # 4003APG120
 #
@@ -350,8 +351,8 @@ $FPLIST
  C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 10  -100 -30  100 -30 N
-P 2 0 1 10  -100 30  100 30 N
+P 2 0 1 20  -100 -30  100 -30 N
+P 2 0 1 20  -100 30  100 30 N
 X ~ 1 0 200 170 D 40 40 1 1 P
 X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
@@ -582,12 +583,11 @@ ENDDEF
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
 DRAW
 X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
 ENDDRAW
 ENDDEF
 #

demos/sonde xilinx/sonde xilinx.net

-# EESchema Netlist Version 1.1 created  3/5/2007-08:10:32
-(
- ( 3EBF81A7 $noname  C4 100pF {Lib=C}
-  (    1 N-000001 )
-  (    2 GND )
- )
- ( 3EBF819B $noname  R13 100 {Lib=R}
-  (    1 TMS-PROG_1 )
-  (    2 N-000001 )
- )
- ( 3EBF7DBD $noname  U1 74LS125 {Lib=74LS125}
-  (    1 N-000041 )
-  (    2 GND )
-  (    3 N-000026 )
-  (    4 N-000028 )
-  (    5 N-000040 )
-  (    6 N-000024 )
-  (    7 GND )
-  (    8 N-000023 )
-  (    9 N-000039 )
-  (   10 N-000028 )
-  (   11 N-000001 )
-  (   12 N-000003 )
-  (   13 N-000028 )
-  (   14 VCC )
- )
- ( 3ECDE5C8 $noname  J2 DB9MALE {Lib=DB9}
-  (    1 PWR(3,3-5V)_1 )
-  (    2 TD0-DONE/P_1 )
-  (    3 TDI-DIN_1 )
-  (    4 TCK-CCLK_1 )
-  (    5 TMS-PROG_1 )
-  (    6 GND )
-  (    7 GND )
-  (    8 GND )
-  (    9 GND )
- )
- ( 3EBF830C $noname  P1 CONN_6 {Lib=CONN_6}
-  (    1 PWR(3,3-5V)_1 )
-  (    2 GND )
-  (    3 TD0-DONE/P_1 )
-  (    4 TDI-DIN_1 )
-  (    5 TCK-CCLK_1 )
-  (    6 TMS-PROG_1 )
- )
- ( 3EBF82C6 $noname  C1 1uF {Lib=CP}
-  (    1 VCC )
-  (    2 GND )
- )
- ( 3EBF81A7 $noname  C5 100pF {Lib=C}
-  (    1 N-000023 )
-  (    2 GND )
- )
- ( 3EBF819B $noname  R12 100 {Lib=R}
-  (    1 TCK-CCLK_1 )
-  (    2 N-000023 )
- )
- ( 3EBF81A7 $noname  C2 100pF {Lib=C}
-  (    1 N-000024 )
-  (    2 GND )
- )
- ( 3EBF819B $noname  R11 100 {Lib=R}
-  (    1 TDI-DIN_1 )
-  (    2 N-000024 )
- )
- ( 3EBF81A7 $noname  C3 100pF {Lib=C}
-  (    1 N-000026 )
-  (    2 GND )
- )
- ( 3EBF819B $noname  R14 100 {Lib=R}
-  (    1 TD0-DONE/P_1 )
-  (    2 N-000026 )
- )
- ( 3EBF818E $noname  R5 1K {Lib=R}
-  (    1 VCC )
-  (    2 GND )
- )
- ( 3EBF8187 $noname  R2 5,1K {Lib=R}
-  (    1 VCC )
-  (    2 N-000026 )
- )
- ( 3EBF8176 $noname  D2 BAT46 {Lib=DIODESCH}
-  (    1 PWR(3,3-5V)_1 )
-  (    2 VCC )
- )
- ( 3EBF815E $noname  D1 BAT46 {Lib=DIODESCH}
-  (    1 VCC )
-  (    2 N-000025 )
- )
- ( 3EBF7EEC $noname  U2 74LS125 {Lib=74LS125}
-  (    1 GND )
-  (    2 N-000026 )
-  (    3 N-000042 )
-  (    4 GND )
-  (    5 GND )
-  (    6  ? )
-  (    7 GND )
-  (    8  ? )
-  (    9 GND )
-  (   10 GND )
-  (   11  ? )
-  (   12 GND )
-  (   13 GND )
-  (   14 VCC )
- )
- ( 3EBF7D33 $noname  R9 100 {Lib=R}
-  (    1 N-000003 )
-  (    2 TMS/PROG(D2)_1 )
- )
- ( 3EBF7D31 $noname  R10 100 {Lib=R}
-  (    1 N-000039 )
-  (    2 CLK(D1)_1 )
- )
- ( 3EBF7D33 $noname  R8 100 {Lib=R}
-  (    1 N-000028 )
-  (    2 CTRL(D3)_1 )
- )
- ( 3EBF7D31 $noname  R7 100 {Lib=R}
-  (    1 N-000040 )
-  (    2 TDI/DIN(D0)_1 )
- )
- ( 3EBF7D26 $noname  R6 100 {Lib=R}
-  (    1 N-000041 )
-  (    2 TD0/PROG(D4)_1 )
- )
- ( 3EBF7D22 $noname  R4 47 {Lib=R}
-  (    1 N-000042 )
-  (    2 DONE(/SELECT)_1 )
- )
- ( 3EBF7D16 $noname  R1 100 {Lib=R}
-  (    1 N-000025 )
-  (    2 VCC_SENSE(/ERROR)_1 )
- )
- ( 3EBF7D04 $noname  J1 DB25MALE {Lib=DB25}
-  (    1  ? )
-  (    2 TDI/DIN(D0)_1 )
-  (    3 CLK(D1)_1 )
-  (    4 TMS/PROG(D2)_1 )
-  (    5 CTRL(D3)_1 )
-  (    6 TD0/PROG(D4)_1 )
-  (    7  ? )
-  (    8 N-000027 )
-  (    9  ? )
-  (   10  ? )
-  (   11 N-000027 )
-  (   12 N-000027 )
-  (   13 DONE(/SELECT)_1 )
-  (   14  ? )
-  (   15 VCC_SENSE(/ERROR)_1 )
-  (   16  ? )
-  (   17  ? )
-  (   18  ? )
-  (   19  ? )
-  (   20 GND )
-  (   21  ? )
-  (   22  ? )
-  (   23  ? )
-  (   24  ? )
-  (   25 GND )
+( { EESchema Netlist Version 1.1  11/02/2011 10:40:30
+eeschema (2011-02-09 BZR 2801)-testing}
+ ( 4D527316 $noname R11 100
+  ( 1 exists in 40exists in 40 )
+  ( 2 exists in 35exists in 35 )
+ )
+ ( 3EBF81A7 $noname C4 100pF
+  ( 1 exists in 34exists in 34 )
+  ( 2 exists in 1exists in 1 )
+ )
+ ( 4D528082 $noname R13 100
+  ( 1 exists in 42exists in 42 )
+  ( 2 exists in 34exists in 34 )
+ )
+ ( 3EBF7DBD $noname U1 74LS125
+  ( 1 exists in 31exists in 31 )
+  ( 2 exists in 1exists in 1 )
+  ( 3 exists in 38exists in 38 )
+  ( 4 exists in 33exists in 33 )
+  ( 5 exists in 16exists in 16 )
+  ( 6 exists in 35exists in 35 )
+  ( 7 exists in 1exists in 1 )
+  ( 8 exists in 36exists in 36 )
+  ( 9 exists in 30exists in 30 )
+  ( 10 exists in 33exists in 33 )
+  ( 11 exists in 34exists in 34 )
+  ( 12 exists in 32exists in 32 )
+  ( 13 exists in 33exists in 33 )
+  ( 14 exists in 5exists in 5 )
+ )
+ ( 3ECDE5C8 $noname J2 DB9MALE
+  ( 1 exists in 37exists in 37 )
+  ( 2 exists in 39exists in 39 )
+  ( 3 exists in 40exists in 40 )
+  ( 4 exists in 41exists in 41 )
+  ( 5 exists in 42exists in 42 )
+  ( 6 exists in 1exists in 1 )
+  ( 7 exists in 1exists in 1 )
+  ( 8 exists in 1exists in 1 )
+  ( 9 exists in 1exists in 1 )
+ )
+ ( 3EBF830C $noname P1 CONN_6
+  ( 1 exists in 37exists in 37 )
+  ( 2 exists in 1exists in 1 )
+  ( 3 exists in 39exists in 39 )
+  ( 4 exists in 40exists in 40 )
+  ( 5 exists in 41exists in 41 )
+  ( 6 exists in 42exists in 42 )
+ )
+ ( 3EBF82C6 $noname C1 1uF
+  ( 1 exists in 5exists in 5 )
+  ( 2 exists in 1exists in 1 )
+ )
+ ( 4D528086 $noname C5 100pF
+  ( 1 exists in 36exists in 36 )
+  ( 2 exists in 1exists in 1 )
+ )
+ ( 4D528083 $noname R12 100
+  ( 1 exists in 41exists in 41 )
+  ( 2 exists in 36exists in 36 )
+ )
+ ( 4D528085 $noname C2 100pF
+  ( 1 exists in 35exists in 35 )
+  ( 2 exists in 1exists in 1 )
+ )
+ ( 4D528084 $noname C3 100pF
+  ( 1 exists in 38exists in 38 )
+  ( 2 exists in 1exists in 1 )
+ )
+ ( 3EBF819B $noname R14 100
+  ( 1 exists in 39exists in 39 )
+  ( 2 exists in 38exists in 38 )
+ )
+ ( 3EBF818E $noname R5 1K
+  ( 1 exists in 5exists in 5 )
+  ( 2 exists in 1exists in 1 )
+ )
+ ( 3EBF8187 $noname R2 5,1K
+  ( 1 exists in 5exists in 5 )
+  ( 2 exists in 38exists in 38 )
+ )
+ ( 3EBF8176 $noname D2 BAT46
+  ( 1 exists in 37exists in 37 )
+  ( 2 exists in 5exists in 5 )
+ )
+ ( 3EBF815E $noname D1 BAT46
+  ( 1 exists in 5exists in 5 )
+  ( 2 exists in 14exists in 14 )
+ )
+ ( 3EBF7EEC $noname U2 74LS125
+  ( 1 exists in 1exists in 1 )
+  ( 2 exists in 38exists in 38 )
+  ( 3 exists in 15exists in 15 )
+  ( 4 exists in 1exists in 1 )
+  ( 5 exists in 1exists in 1 )
+  ( 6 exists in 4exists in 4 )
+  ( 7 exists in 1exists in 1 )
+  ( 8 exists in 3exists in 3 )
+  ( 9 exists in 1exists in 1 )
+  ( 10 exists in 1exists in 1 )
+  ( 11 exists in 2exists in 2 )
+  ( 12 exists in 1exists in 1 )
+  ( 13 exists in 1exists in 1 )
+  ( 14 exists in 5exists in 5 )
+ )
+ ( 3EBF7D33 $noname R9 100
+  ( 1 exists in 32exists in 32 )
+  ( 2 exists in 6exists in 6 )
+ )
+ ( 3EBF7D31 $noname R10 100
+  ( 1 exists in 30exists in 30 )
+  ( 2 exists in 12exists in 12 )
+ )
+ ( 4D528080 $noname R8 100
+  ( 1 exists in 33exists in 33 )
+  ( 2 exists in 11exists in 11 )
+ )
+ ( 4D52807F $noname R7 100
+  ( 1 exists in 16exists in 16 )
+  ( 2 exists in 10exists in 10 )
+ )
+ ( 3EBF7D26 $noname R6 100
+  ( 1 exists in 31exists in 31 )
+  ( 2 exists in 9exists in 9 )
+ )
+ ( 3EBF7D22 $noname R4 47
+  ( 1 exists in 15exists in 15 )
+  ( 2 exists in 24exists in 24 )
+ )
+ ( 3EBF7D16 $noname R1 100
+  ( 1 exists in 14exists in 14 )
+  ( 2 exists in 7exists in 7 )
+ )
+ ( 3EBF7D04 $noname J1 DB25MALE
+  ( 1 exists in 13exists in 13 )
+  ( 2 exists in 10exists in 10 )
+  ( 3 exists in 12exists in 12 )
+  ( 4 exists in 6exists in 6 )
+  ( 5 exists in 11exists in 11 )
+  ( 6 exists in 9exists in 9 )
+  ( 7 exists in 29exists in 29 )
+  ( 8 exists in 8exists in 8 )
+  ( 9 exists in 28exists in 28 )
+  ( 10 exists in 27exists in 27 )
+  ( 11 exists in 8exists in 8 )
+  ( 12 exists in 8exists in 8 )
+  ( 13 exists in 24exists in 24 )
+  ( 14 exists in 22exists in 22 )
+  ( 15 exists in 7exists in 7 )
+  ( 16 exists in 20exists in 20 )
+  ( 17 exists in 19exists in 19 )
+  ( 18 exists in 18exists in 18 )
+  ( 19 exists in 17exists in 17 )
+  ( 20 exists in 1exists in 1 )
+  ( 21 exists in 26exists in 26 )
+  ( 22 exists in 25exists in 25 )
+  ( 23 exists in 23exists in 23 )
+  ( 24 exists in 21exists in 21 )
+  ( 25 exists in 1exists in 1 )
  )
 )
 *
-{ Allowed footprints by component:
-$component C4
- C?
- SM*
-$endlist
-$component R13
- R?
- SM0603
- SM0805
-$endlist
-$component J2
- DB9*
-$endlist
-$component C1
- CP*
- SM*
-$endlist
-$component C5
- C?
- SM*
-$endlist
-$component R12
- R?
- SM0603
- SM0805
-$endlist
-$component C2
- C?
- SM*
-$endlist
-$component R11
- R?
- SM0603
- SM0805
-$endlist
-$component C3
- C?
- SM*
-$endlist
-$component R14
- R?
- SM0603
- SM0805
-$endlist
-$component R5
- R?
- SM0603
- SM0805
-$endlist
-$component R2
- R?
- SM0603
- SM0805
-$endlist
-$component R9
- R?
- SM0603
- SM0805
-$endlist
-$component R10
- R?
- SM0603
- SM0805
-$endlist
-$component R8
- R?
- SM0603
- SM0805
-$endlist
-$component R7
- R?
- SM0603
- SM0805
-$endlist
-$component R6
- R?
- SM0603
- SM0805
-$endlist
-$component R4
- R?
- SM0603
- SM0805
-$endlist
-$component R1
- R?
- SM0603
- SM0805
-$endlist
-$component J1
- DB25*
-$endlist
-$endfootprintlist
-}
-{ Pin List by Nets
-Net 1 ""
- U1 11
- C4 1
- R13 2
-Net 2 "GND"
- C4 2
- U2 10
- J1 25
- C5 2
- U1 7
- J2 6
- J2 7
- J1 20
- J2 8
- J2 9
- U2 5
- U2 7
- U2 12
- U2 4
- U2 7
- R5 2
- U2 13
- C3 2
- U1 7
- C1 2
- U2 1
- U2 7
- P1 2
- U1 7
- U1 7
- U1 2
- U2 7
- U2 9
- C2 2
-Net 3 ""
- U1 12
- R9 1
-Net 4 "VCC"
- U2 14
- U1 14
- C1 1
- U1 14
- R5 1
- R2 1
- D2 2
- U2 14
- U2 14
- U1 14
- U2 14
- U1 14
- D1 1
-Net 18 "PWR(3,3-5V)_1"
- D2 1
- P1 1
- J2 1
-Net 19 "TMS-PROG_1"
- J2 5
- R13 1
- P1 6
-Net 20 "TCK-CCLK_1"
- P1 5
- J2 4
- R12 1
-Net 21 "TDI-DIN_1"
- J2 3
- R11 1
- P1 4
-Net 22 "TD0-DONE/P_1"
- J2 2
- P1 3
- R14 1
-Net 23 ""
- U1 8
- R12 2
- C5 1
-Net 24 ""
- C2 1
- R11 2
- U1 6
-Net 25 ""
- R1 1
- D1 2
-Net 26 ""
- R14 2
- C3 1
- U2 2
- U1 3
- R2 2
-Net 27 ""
- J1 12
- J1 8
- J1 11
-Net 28 ""
- U1 13
- U1 4
- U1 10
- R8 1
-Net 29 "VCC_SENSE(/ERROR)_1"
- J1 15
- R1 2
-Net 30 "TDI/DIN(D0)_1"
- R7 2
- J1 2
-Net 31 "CLK(D1)_1"
- J1 3
- R10 2
-Net 32 "CTRL(D3)_1"
- R8 2
- J1 5
-Net 33 "TD0/PROG(D4)_1"
- R6 2
- J1 6
-Net 34 "TMS/PROG(D2)_1"
- J1 4
- R9 2
-Net 35 "DONE(/SELECT)_1"
- R4 2
- J1 13
-Net 39 ""
- U1 9
- R10 1
-Net 40 ""
- R7 1
- U1 5
-Net 41 ""
- U1 1
- R6 1
-Net 42 ""
- R4 1
- U2 3
-}
-#End

demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib

+EESchema-LIBRARY Version 2.3  Date: 19/12/2011 12:55:30
+#encoding utf-8
+#
+# CONN_1
+#
+DEF ~CONN_1 P 0 30 N N 1 F N
+F0 "P" 80 0 40 H V L CNN
+F1 "CONN_1" 0 55 30 H I C CNN
+DRAW
+C 0 0 31 0 1 0 N
+P 2 0 1 0  -30 0  -50 0 N
+X 1 1 -150 0 100 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library

demos/test_pads_inside_pads/test_pads_inside_pads.cmp

+Cmp-Mod V01 Created by CvPcb (2011-12-09 BZR 3290)-testing date = 11/12/2011 20:34:04
+
+BeginCmp
+TimeStamp = /4EDF7CC5;
+Reference = P1;
+ValeurCmp = CONN_1;
+IdModule  = 1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /4EDF7CC0;
+Reference = P2;
+ValeurCmp = CONN_1;
+IdModule  = 1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /4EE5056C;
+Reference = P3;
+ValeurCmp = CONN_1;
+IdModule  = 1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /4EE5056D;
+Reference = P4;
+ValeurCmp = CONN_1;
+IdModule  = 1pin;
+EndCmp
+
+EndListe

demos/test_pads_inside_pads/test_pads_inside_pads.net

+# EESchema Netlist Version 1.1 created  19/12/2011 12:55:28
+(
+ ( /4EE5056D $noname  P4 CONN_1 {Lib=CONN_1}
+  (    1 /NET1 )
+ )
+ ( /4EE5056C $noname  P3 CONN_1 {Lib=CONN_1}
+  (    1 /NET1 )
+ )
+ ( /4EDF7CC5 $noname  P1 CONN_1 {Lib=CONN_1}
+  (    1 /NET2 )
+ )
+ ( /4EDF7CC0 $noname  P2 CONN_1 {Lib=CONN_1}
+  (    1 /NET2 )
+ )
+)
+*
+{ Pin List by Nets
+Net 1 "/NET1" "NET1"
+ P4 1
+ P3 1
+Net 2 "/NET2" "NET2"
+ P1 1
+ P2 1
+}
+#End

eeschema/annotate.cpp

@@ -148,7 +148,7 @@ void SCH_EDIT_FRAME::AnnotateComponents( bool              aAnnotateSchematic,
     m_CurrentSheet->UpdateAllScreenReferences();
     SetSheetNumberAndCount();
 
-    DrawPanel->Refresh( true );
+    m_canvas->Refresh( true );
 }
 
 

eeschema/dialogs/annotate_dialog.cpp

@@ -118,6 +118,7 @@ void DIALOG_ANNOTATE::OnApplyClick( wxCommandEvent& event )
         message = _( "Clear and annotate all of the components " );
     else
         message = _( "Annotate only the unannotated components " );
+
     if( GetLevel() )
         message += _( "on the entire schematic?" );
     else
@@ -125,13 +126,14 @@ void DIALOG_ANNOTATE::OnApplyClick( wxCommandEvent& event )
 
     message += _( "\n\nThis operation will change the current annotation and cannot be undone." );
     response = wxMessageBox( message, wxT( "" ), wxICON_EXCLAMATION | wxOK | wxCANCEL );
+
     if (response == wxCANCEL)
         return;
 
     m_Parent->AnnotateComponents( GetLevel(), (ANNOTATE_ORDER_T) GetSortOrder(),
                                   (ANNOTATE_OPTION_T) GetAnnotateAlgo(),
                                   GetResetItems() , true );
-    m_Parent->DrawPanel->Refresh();
+    m_Parent->GetCanvas()->Refresh();
 
     m_btnClear->Enable();
 }
@@ -150,12 +152,13 @@ void DIALOG_ANNOTATE::OnClearAnnotationCmpClick( wxCommandEvent& event )
         message += _( "the current sheet?" );
 
     message += _( "\n\nThis operation will clear the existing annotation and cannot be undone." );
-    response = wxMessageBox( message, wxT( "" ),
-                             wxICON_EXCLAMATION | wxOK | wxCANCEL );
+    response = wxMessageBox( message, wxT( "" ), wxICON_EXCLAMATION | wxOK | wxCANCEL );
+
     if (response == wxCANCEL)
         return;
+
     m_Parent->DeleteAnnotation( GetLevel() ? false : true );
-    m_Parent->DrawPanel->Refresh();
+    m_Parent->GetCanvas()->Refresh();
 
     m_btnClear->Enable(false);
 }

eeschema/dialogs/dialog_schematic_find_base.h

@@ -48,6 +48,7 @@ class DIALOG_SCH_FIND_BASE : public wxDialog
 		wxCheckBox* m_checkAllFields;
 		wxCheckBox* m_checkAllPins;
 		wxCheckBox* m_checkCurrentSheetOnly;
+		wxCheckBox* m_checkReplaceReferences;
 		wxCheckBox* m_checkNoWarpCursor;
 		wxButton* m_buttonFind;
 		wxButton* m_buttonReplace;