kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #30662
[PATCH] Field editor buttons
Attached is a patch set that simplifies the UI buttons for organising
component fields, both in the symbol editor and the schematic viewer.
Screenshot: http://i.imgur.com/YFjASPT.png
Cheers,
Oliver
From 1c614438b4aa4741f541f01b942c7ab8183b2787 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@xxxxxxxxx>
Date: Sun, 3 Sep 2017 17:24:30 +1000
Subject: [PATCH 1/3] Added build steps for previously unused bitmaps
- plus
- minus
- go_up
- go_down
---
bitmaps_png/CMakeLists.txt | 4 +++
bitmaps_png/cpp_26/go_down.cpp | 71 ++++++++++++++++++++++++++++++++++++++++++
bitmaps_png/cpp_26/go_up.cpp | 71 ++++++++++++++++++++++++++++++++++++++++++
bitmaps_png/cpp_26/minus.cpp | 33 ++++++++++++++++++++
bitmaps_png/cpp_26/plus.cpp | 49 +++++++++++++++++++++++++++++
include/bitmaps.h | 4 +++
6 files changed, 232 insertions(+)
create mode 100644 bitmaps_png/cpp_26/go_down.cpp
create mode 100644 bitmaps_png/cpp_26/go_up.cpp
create mode 100644 bitmaps_png/cpp_26/minus.cpp
create mode 100644 bitmaps_png/cpp_26/plus.cpp
diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index a646f19..a5db052 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -247,6 +247,8 @@ set( BMAPS_MID
glabel2label
glabel2text
gl_change
+ go_down
+ go_up
green
grid_select
grid_select_axis
@@ -319,6 +321,7 @@ set( BMAPS_MID
local_ratsnest
locked
measurement
+ minus
mirepcb
mirror_h
mirror_v
@@ -421,6 +424,7 @@ set( BMAPS_MID
plot_pdf
plot_ps
plot_svg
+ plus
polar_coord
post_compo
post_drill
diff --git a/bitmaps_png/cpp_26/go_down.cpp b/bitmaps_png/cpp_26/go_down.cpp
new file mode 100644
index 0000000..37d4afd
--- /dev/null
+++ b/bitmaps_png/cpp_26/go_down.cpp
@@ -0,0 +1,71 @@
+
+/* 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, 0x5f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x96, 0xcb, 0x4f, 0x13,
+ 0x41, 0x1c, 0xc7, 0x7f, 0x33, 0xfb, 0xa8, 0xb4, 0x55, 0x31, 0x60, 0x45, 0xc1, 0x80, 0xa0, 0x10,
+ 0x15, 0x5f, 0x31, 0x28, 0x2a, 0x91, 0x88, 0x3d, 0x78, 0xc4, 0x44, 0xa3, 0x17, 0x13, 0x6f, 0xfa,
+ 0x07, 0xe8, 0xcd, 0x44, 0xbd, 0x68, 0x38, 0x68, 0x3c, 0xe8, 0xdd, 0xc4, 0x78, 0xf2, 0xc2, 0xcd,
+ 0x28, 0x60, 0x8b, 0x50, 0xa1, 0x21, 0x08, 0xd1, 0xa0, 0x41, 0xd4, 0xf2, 0x86, 0xd2, 0x22, 0x55,
+ 0x4a, 0x1f, 0xbb, 0xf3, 0x70, 0x76, 0x59, 0x6a, 0x89, 0x50, 0x8a, 0x72, 0x32, 0xfe, 0x36, 0xdf,
+ 0x4c, 0xe7, 0xf5, 0xfb, 0xec, 0xfc, 0x66, 0xe7, 0x37, 0x05, 0xf8, 0xd7, 0x0c, 0x65, 0xea, 0xac,
+ 0xba, 0x0e, 0x05, 0x12, 0x97, 0x2b, 0x57, 0x72, 0x22, 0x31, 0x14, 0xf5, 0xdd, 0xd7, 0x3b, 0x33,
+ 0x8d, 0x91, 0x33, 0x75, 0xda, 0x14, 0xf5, 0xea, 0xc5, 0xba, 0x2b, 0x37, 0x39, 0x62, 0x40, 0x98,
+ 0x6e, 0x8a, 0x32, 0x02, 0x84, 0x6a, 0x40, 0x39, 0x01, 0x4a, 0x89, 0x59, 0x06, 0x02, 0x9f, 0x03,
+ 0x3e, 0xe8, 0x2f, 0xfd, 0x63, 0x90, 0x61, 0x76, 0xbb, 0x03, 0x86, 0x22, 0xef, 0x20, 0x49, 0x12,
+ 0xa0, 0xd3, 0x84, 0x28, 0x63, 0xa0, 0x2d, 0x94, 0xa2, 0x6d, 0x9d, 0xe2, 0x10, 0x63, 0xf2, 0xb4,
+ 0x95, 0xfc, 0xe0, 0xac, 0x63, 0x8c, 0x90, 0x15, 0x6b, 0xb4, 0xa8, 0x8d, 0x8b, 0x27, 0x1b, 0xcb,
+ 0x1a, 0xc4, 0x39, 0x87, 0x85, 0x47, 0x54, 0x52, 0x6d, 0x0b, 0xbf, 0xff, 0x1a, 0xc4, 0x0c, 0x80,
+ 0xe9, 0x8c, 0xa7, 0x60, 0x16, 0xda, 0xdc, 0x9f, 0xb5, 0x5b, 0x11, 0x67, 0xc2, 0x15, 0x13, 0x40,
+ 0x51, 0x9a, 0x32, 0x6b, 0x66, 0x69, 0xec, 0x59, 0xb6, 0xb6, 0xe8, 0x63, 0x38, 0x7e, 0x4d, 0xad,
+ 0x14, 0x4e, 0x0a, 0x52, 0x0d, 0x3a, 0xdd, 0x61, 0x60, 0x28, 0xa3, 0xf3, 0x10, 0x01, 0x00, 0xc4,
+ 0x01, 0x89, 0xd7, 0xd3, 0x58, 0x5c, 0xd4, 0xc8, 0x42, 0x08, 0xa5, 0xea, 0x6b, 0xb2, 0x3b, 0xb5,
+ 0x77, 0x62, 0xa8, 0x6d, 0x03, 0xf1, 0x79, 0x6f, 0x41, 0x62, 0x49, 0x90, 0x24, 0xc3, 0xd9, 0x33,
+ 0x55, 0xe7, 0x6f, 0x14, 0x6f, 0x2d, 0x57, 0x63, 0xda, 0x0f, 0xb1, 0x0a, 0x2a, 0x36, 0x9c, 0x9b,
+ 0x33, 0x91, 0xcc, 0x00, 0x0b, 0x00, 0xa2, 0x14, 0x62, 0xc9, 0x6f, 0x40, 0xa4, 0x18, 0x28, 0x58,
+ 0x12, 0xed, 0x14, 0x4a, 0x8a, 0x8b, 0x77, 0x6e, 0x76, 0xe5, 0x35, 0x19, 0x41, 0x74, 0x2a, 0x1b,
+ 0xa1, 0xfd, 0x6d, 0xf3, 0x48, 0x72, 0x6a, 0x66, 0xcf, 0x22, 0xdf, 0xe9, 0x95, 0xe1, 0x76, 0xfa,
+ 0x5a, 0xa9, 0x1c, 0xd9, 0x7d, 0xa0, 0xf4, 0xe8, 0x9e, 0xa9, 0xf8, 0x57, 0x3c, 0x4b, 0x42, 0x10,
+ 0xd1, 0x26, 0x80, 0x63, 0x71, 0x5e, 0x40, 0x83, 0x59, 0x12, 0x84, 0x1f, 0x42, 0x1c, 0xeb, 0xe2,
+ 0xa5, 0x10, 0x60, 0x09, 0x81, 0xce, 0xe3, 0x30, 0x19, 0x1b, 0x80, 0xe9, 0xe4, 0x10, 0x38, 0x6c,
+ 0x4e, 0x08, 0x07, 0x67, 0xc6, 0xc6, 0xa6, 0xc6, 0xdc, 0x6d, 0x0f, 0xe8, 0xc4, 0xb2, 0x20, 0xc3,
+ 0xbe, 0xd4, 0x26, 0x1b, 0xf1, 0x78, 0xa0, 0xb6, 0xaa, 0xe2, 0x54, 0x49, 0x44, 0x1b, 0x47, 0x1c,
+ 0x11, 0xd0, 0x78, 0x14, 0x82, 0x89, 0x01, 0x81, 0x9a, 0x03, 0x2c, 0x00, 0x92, 0x25, 0x03, 0x84,
+ 0xf1, 0xbc, 0xf2, 0x9d, 0xdb, 0x41, 0x9d, 0xdb, 0x32, 0xdd, 0xdb, 0xef, 0xbf, 0xec, 0x6b, 0xd0,
+ 0xfd, 0xbf, 0x65, 0x8f, 0xdf, 0x76, 0xcd, 0x0b, 0xdc, 0x5e, 0xf3, 0xfd, 0x59, 0x34, 0xfc, 0xad,
+ 0x7e, 0xdf, 0xae, 0xa3, 0xae, 0x70, 0x62, 0x10, 0x82, 0xf1, 0x4f, 0x22, 0xc8, 0x04, 0x24, 0x05,
+ 0x83, 0x2c, 0xf4, 0x0b, 0x24, 0x42, 0x29, 0x20, 0x76, 0x35, 0x17, 0xb6, 0xe1, 0x83, 0xd1, 0xf6,
+ 0xee, 0xa6, 0x5b, 0x6d, 0x77, 0xc9, 0xd3, 0x25, 0xd3, 0xd4, 0x52, 0x8d, 0x13, 0x5e, 0xd0, 0x9d,
+ 0xfb, 0x43, 0x8d, 0x88, 0x49, 0xe7, 0xf2, 0x5d, 0x9b, 0x72, 0xc3, 0x5a, 0x40, 0x00, 0x90, 0x09,
+ 0x9a, 0x87, 0xfd, 0x5a, 0x8d, 0x2c, 0xd9, 0xa0, 0xdc, 0x7e, 0x52, 0xf7, 0x74, 0x36, 0x3d, 0x79,
+ 0x75, 0x3b, 0x76, 0x63, 0xd9, 0x7c, 0xb8, 0x5c, 0xc7, 0x88, 0x0f, 0x66, 0x1d, 0x65, 0x93, 0x1e,
+ 0x7b, 0x4e, 0x5e, 0x7d, 0xbe, 0x6b, 0x83, 0x33, 0x0e, 0x11, 0x13, 0x90, 0x02, 0x9a, 0x20, 0x0c,
+ 0xe5, 0x8e, 0x5a, 0xee, 0x69, 0xf5, 0xb4, 0x3e, 0xd7, 0x66, 0x2e, 0x18, 0xd1, 0x58, 0x35, 0xc8,
+ 0xb0, 0xc1, 0x0e, 0x16, 0x74, 0x54, 0x06, 0x47, 0xca, 0x5c, 0x87, 0xdc, 0xf2, 0x7a, 0x2d, 0x47,
+ 0x47, 0x31, 0x90, 0x54, 0x0c, 0x8a, 0x90, 0xb1, 0x9a, 0x32, 0xc7, 0x09, 0xf0, 0xb7, 0xf5, 0xbe,
+ 0xff, 0x3c, 0x31, 0xee, 0x0e, 0xde, 0x81, 0x8c, 0xf9, 0x4e, 0x5a, 0xe9, 0xa0, 0x0d, 0xbe, 0xa6,
+ 0x7d, 0x52, 0xc5, 0x30, 0xde, 0xb7, 0xbd, 0xa6, 0x3a, 0x21, 0x87, 0x55, 0x86, 0x34, 0x33, 0xc7,
+ 0x15, 0xae, 0xdb, 0x0f, 0x03, 0xdd, 0xc1, 0xe1, 0xbe, 0xe1, 0x8f, 0xee, 0x9e, 0x06, 0x08, 0xaf,
+ 0x78, 0x95, 0x64, 0x91, 0x39, 0xe4, 0x80, 0x97, 0xf8, 0x51, 0xc9, 0xe8, 0xde, 0xc3, 0x3b, 0x4f,
+ 0x55, 0x7c, 0x67, 0xa3, 0x38, 0x57, 0x29, 0x84, 0xc8, 0x80, 0x1a, 0xea, 0x7c, 0xd3, 0x75, 0xa9,
+ 0xeb, 0x1e, 0xeb, 0x4f, 0xbb, 0xd7, 0x56, 0x15, 0x3a, 0xe3, 0x10, 0xdb, 0x84, 0x72, 0x8c, 0x5b,
+ 0xc2, 0x92, 0xe3, 0xab, 0x3f, 0xd9, 0xa2, 0x14, 0x85, 0x8e, 0x1d, 0xa9, 0xa8, 0x2b, 0xd2, 0x42,
+ 0xf6, 0x68, 0xf3, 0x8b, 0x96, 0x06, 0xff, 0x23, 0xe2, 0xb5, 0xc6, 0xaa, 0x96, 0x94, 0x34, 0x9f,
+ 0x2c, 0x13, 0x48, 0xb6, 0x06, 0x2b, 0x69, 0x93, 0x6d, 0xa6, 0x08, 0xd8, 0x46, 0x3f, 0xcc, 0x79,
+ 0x20, 0x6f, 0xe6, 0xf4, 0xfb, 0x9e, 0xbe, 0x97, 0x1d, 0x0f, 0x93, 0x8f, 0xad, 0xf9, 0xd8, 0x12,
+ 0x5a, 0xe2, 0xc6, 0x66, 0x99, 0xae, 0x72, 0x35, 0x0d, 0x28, 0xa7, 0xc9, 0x70, 0x2a, 0x39, 0x0b,
+ 0x20, 0x27, 0x3a, 0x69, 0xe6, 0x30, 0x23, 0x4c, 0xd4, 0x12, 0x49, 0x93, 0x6e, 0x95, 0x5a, 0xb6,
+ 0xff, 0x19, 0xb0, 0xe5, 0x5c, 0x5e, 0xe6, 0xad, 0xb9, 0x25, 0x66, 0x89, 0x58, 0x50, 0x06, 0xff,
+ 0x6d, 0x2d, 0xed, 0x27, 0xd4, 0x1e, 0x8d, 0x4f, 0xe3, 0xd3, 0xaf, 0x91, 0x00, 0x00, 0x00, 0x00,
+ 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE go_down_xpm[1] = {{ png, sizeof( png ), "go_down_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/go_up.cpp b/bitmaps_png/cpp_26/go_up.cpp
new file mode 100644
index 0000000..3494a9b
--- /dev/null
+++ b/bitmaps_png/cpp_26/go_up.cpp
@@ -0,0 +1,71 @@
+
+/* 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, 0x65, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x94, 0x4d, 0x4c, 0x5c,
+ 0x55, 0x14, 0xc7, 0x7f, 0xf7, 0xde, 0xf7, 0x86, 0xe1, 0x4b, 0x3e, 0x6a, 0x0b, 0x85, 0x96, 0x32,
+ 0x88, 0x81, 0x52, 0x0a, 0x06, 0x22, 0x6d, 0xa1, 0x50, 0x9a, 0x34, 0x6a, 0x9a, 0xa6, 0x89, 0x71,
+ 0x63, 0x62, 0xbb, 0x75, 0xe1, 0xc2, 0x68, 0x22, 0xa6, 0x89, 0x31, 0x99, 0x95, 0x5b, 0x13, 0x17,
+ 0x2e, 0x4d, 0x5c, 0xb9, 0x73, 0xa5, 0xd1, 0x68, 0x62, 0xb5, 0x62, 0x6c, 0x8c, 0xc4, 0xd8, 0xa6,
+ 0xad, 0x46, 0xc3, 0x77, 0x05, 0xb4, 0x65, 0x80, 0x96, 0x99, 0x79, 0x33, 0xf7, 0xdd, 0xe3, 0x62,
+ 0x1e, 0x64, 0x54, 0x28, 0xb4, 0xc5, 0x95, 0xde, 0xe4, 0xe4, 0xdd, 0xf3, 0xde, 0xb9, 0xf7, 0xf7,
+ 0xce, 0xbd, 0xff, 0x73, 0xe0, 0x3f, 0x3f, 0x8e, 0xbf, 0x1a, 0x6f, 0x79, 0x90, 0x75, 0xe6, 0x7e,
+ 0x82, 0x07, 0x47, 0xfc, 0x9e, 0xd6, 0xe6, 0x8e, 0x8b, 0xb5, 0x3d, 0xcb, 0x75, 0x13, 0x5f, 0xdb,
+ 0xcf, 0xff, 0x15, 0xd0, 0x93, 0x23, 0xd4, 0x1f, 0x6a, 0xe9, 0xfd, 0xb4, 0xa3, 0xfd, 0xd0, 0xbe,
+ 0xba, 0x5d, 0xcd, 0x9d, 0xd2, 0xf2, 0x6b, 0x6a, 0x6a, 0xd4, 0x8d, 0xed, 0x28, 0x68, 0x38, 0x49,
+ 0x7c, 0x7f, 0x6d, 0xcb, 0x97, 0x3d, 0x87, 0x8f, 0x1c, 0xbc, 0xb1, 0xf0, 0x0d, 0x3a, 0x26, 0x25,
+ 0xf5, 0x95, 0x2d, 0xc7, 0xbc, 0xf6, 0xd9, 0xef, 0xa6, 0x47, 0xdd, 0xe4, 0x76, 0xf6, 0xd0, 0xdb,
+ 0x88, 0x51, 0xa5, 0x7a, 0xf7, 0x87, 0x27, 0xfa, 0xce, 0x1c, 0x1e, 0x5f, 0xfc, 0x01, 0xa5, 0x34,
+ 0xb7, 0xee, 0xce, 0x10, 0xab, 0x91, 0x5d, 0x6d, 0x07, 0xba, 0xde, 0x1f, 0x7a, 0x8d, 0xc4, 0x8e,
+ 0x80, 0x4e, 0xbd, 0x51, 0xf1, 0xee, 0xd9, 0xa1, 0x17, 0x4e, 0x4d, 0xa5, 0xae, 0x68, 0x11, 0x41,
+ 0xa1, 0x00, 0xc5, 0xcc, 0xe2, 0x75, 0x1a, 0x9a, 0xea, 0x9b, 0xf6, 0xd6, 0xb7, 0x7e, 0x34, 0xfc,
+ 0x0a, 0xd5, 0x0f, 0x05, 0x3a, 0x7e, 0xc1, 0x7f, 0xf1, 0xcc, 0xd0, 0xb9, 0x73, 0x7f, 0x64, 0x26,
+ 0xfc, 0xbc, 0x0b, 0xfe, 0xf1, 0xfd, 0xc6, 0xfc, 0x28, 0xed, 0xed, 0xed, 0x1d, 0xe5, 0xbb, 0xf7,
+ 0x7c, 0x3c, 0x9c, 0xc4, 0x7b, 0x20, 0xd0, 0xe0, 0x88, 0x37, 0x70, 0xfa, 0xe8, 0xf3, 0x6f, 0x49,
+ 0x2c, 0xa8, 0x48, 0xe7, 0xef, 0x6c, 0x18, 0x23, 0x08, 0x57, 0xe6, 0xbf, 0xa0, 0xaf, 0x7b, 0xe0,
+ 0x48, 0x8c, 0xaa, 0x0f, 0xee, 0x5b, 0x0c, 0x47, 0x2f, 0xd0, 0xdc, 0xdf, 0xf9, 0xcc, 0x27, 0x4d,
+ 0xfb, 0x0f, 0xd4, 0x2d, 0xdc, 0x99, 0x24, 0x94, 0x90, 0x50, 0xf2, 0x38, 0x42, 0x9c, 0x58, 0x1c,
+ 0x96, 0xd0, 0x15, 0xcc, 0xba, 0x3c, 0xa9, 0xec, 0x9c, 0x7e, 0x22, 0x71, 0x32, 0x61, 0xda, 0xa6,
+ 0xe3, 0x13, 0x5f, 0xe5, 0x2f, 0x6e, 0x0b, 0x34, 0xf0, 0x3a, 0x95, 0x07, 0x9b, 0x7a, 0x2f, 0x1d,
+ 0xeb, 0x3e, 0x99, 0x98, 0x5d, 0xfa, 0x09, 0x51, 0x21, 0xa2, 0x6d, 0x64, 0x0e, 0x31, 0x16, 0x47,
+ 0x1e, 0x4b, 0x06, 0x47, 0x0e, 0x34, 0xd8, 0x30, 0x47, 0xda, 0xa6, 0xfc, 0xce, 0xc6, 0x81, 0x6e,
+ 0xd5, 0x3a, 0x31, 0x37, 0x35, 0xea, 0x7e, 0xbc, 0x37, 0x28, 0x89, 0xee, 0xab, 0x6c, 0xfe, 0xec,
+ 0xec, 0xd0, 0xf9, 0x9e, 0xe9, 0xe5, 0xeb, 0xaa, 0xb0, 0x79, 0x01, 0x84, 0x09, 0x11, 0x65, 0x09,
+ 0x64, 0x85, 0xb4, 0x4b, 0xe1, 0x54, 0x1e, 0x65, 0x14, 0x4a, 0x17, 0x2c, 0x67, 0xd3, 0x60, 0xc2,
+ 0x78, 0x63, 0x75, 0x5b, 0x7f, 0xec, 0xb1, 0xdf, 0x2e, 0x4f, 0x7f, 0xeb, 0xa6, 0x37, 0x05, 0x0d,
+ 0xf6, 0x99, 0x77, 0xba, 0x1e, 0xef, 0x7f, 0x4a, 0x2b, 0x3f, 0xeb, 0x53, 0x96, 0x8d, 0x49, 0xa9,
+ 0x6b, 0x7c, 0x34, 0xe1, 0xa7, 0xf2, 0x33, 0x58, 0x02, 0x96, 0xec, 0x4d, 0xb2, 0xb2, 0x82, 0x36,
+ 0xa0, 0x23, 0x40, 0x6d, 0x79, 0x03, 0x5d, 0x35, 0x4f, 0x07, 0x95, 0xec, 0x5d, 0x2d, 0xd5, 0x35,
+ 0x81, 0xaf, 0x63, 0xde, 0xfc, 0xd2, 0xdc, 0x73, 0xf5, 0xbd, 0xb9, 0xf7, 0x66, 0x2f, 0x93, 0x59,
+ 0xaf, 0x91, 0x62, 0x50, 0x6f, 0x92, 0xb2, 0xd2, 0x2c, 0x25, 0x00, 0x79, 0x47, 0x79, 0xdc, 0xf7,
+ 0x47, 0xce, 0x3f, 0xfb, 0xd2, 0xcb, 0x93, 0xab, 0xdf, 0xf3, 0x7b, 0xe6, 0x17, 0x2c, 0x01, 0x4a,
+ 0x81, 0x00, 0xe2, 0x04, 0x17, 0x42, 0x95, 0x5f, 0x47, 0x30, 0x53, 0xfd, 0xf3, 0xb5, 0x6b, 0x57,
+ 0x4f, 0xaf, 0x2b, 0xcc, 0x20, 0x97, 0x2a, 0xb2, 0x53, 0x24, 0x71, 0x6b, 0xef, 0xfe, 0x22, 0xc9,
+ 0xb1, 0x24, 0x69, 0x20, 0x1d, 0xb9, 0xa9, 0x13, 0x6f, 0xaa, 0x25, 0x21, 0xe4, 0x76, 0x6e, 0x1c,
+ 0xf1, 0x72, 0xf8, 0x46, 0x17, 0x74, 0x2a, 0x05, 0x50, 0x68, 0x05, 0x6d, 0x34, 0x5a, 0x2b, 0x37,
+ 0xfa, 0x76, 0x76, 0xfc, 0x5e, 0xaa, 0xf3, 0xb6, 0x2a, 0xb4, 0xd5, 0x70, 0x11, 0xab, 0x32, 0x18,
+ 0x5f, 0x61, 0x3c, 0x85, 0x32, 0x85, 0x94, 0x42, 0x2b, 0xa0, 0x1c, 0x46, 0x81, 0xd2, 0x6a, 0xcb,
+ 0xce, 0xe0, 0x6d, 0x55, 0xce, 0x19, 0xbb, 0x82, 0xd2, 0xa0, 0x8d, 0xc2, 0xf8, 0x1a, 0xe3, 0x2b,
+ 0x9c, 0x93, 0x42, 0x1d, 0x39, 0x85, 0x52, 0x8a, 0x87, 0x6e, 0x41, 0xe2, 0xd0, 0x48, 0x91, 0x2f,
+ 0x20, 0x2e, 0x3a, 0xba, 0xe2, 0xb2, 0x75, 0xa2, 0xb7, 0x6a, 0xd0, 0x1b, 0x65, 0x14, 0x03, 0x4a,
+ 0x80, 0x98, 0x5d, 0x95, 0x32, 0x91, 0xc2, 0xa5, 0x87, 0x56, 0x00, 0x87, 0x0b, 0x15, 0x20, 0x38,
+ 0x0b, 0x2e, 0x14, 0x9c, 0x06, 0x71, 0x18, 0x60, 0x0f, 0x90, 0x8b, 0x2c, 0x88, 0x9e, 0x9b, 0x82,
+ 0xd6, 0x20, 0x71, 0xa0, 0xc4, 0xe5, 0x50, 0xcb, 0xf3, 0xd9, 0xbb, 0x0d, 0xf1, 0x41, 0x74, 0x00,
+ 0x28, 0x51, 0x12, 0xe9, 0x4e, 0x81, 0x88, 0x53, 0xa2, 0xd0, 0xcc, 0x2c, 0x5e, 0xf5, 0x80, 0xb2,
+ 0x28, 0xab, 0xe2, 0x53, 0xca, 0x6d, 0x28, 0xef, 0xc8, 0x2f, 0x59, 0xcb, 0xe8, 0x91, 0x7d, 0x54,
+ 0xd5, 0x26, 0xbc, 0x46, 0x97, 0x23, 0xe6, 0x1c, 0x46, 0x42, 0xf1, 0x24, 0x5a, 0xa3, 0x40, 0x94,
+ 0x51, 0x56, 0x6b, 0xc2, 0xc0, 0xda, 0x95, 0x85, 0x31, 0x6e, 0x16, 0x65, 0x12, 0x44, 0x26, 0x9b,
+ 0x81, 0xfe, 0x5e, 0xcc, 0x5e, 0x94, 0xa5, 0x29, 0xfa, 0x5b, 0xb5, 0x7e, 0x39, 0xe0, 0x80, 0x30,
+ 0xb2, 0x1c, 0x60, 0xa3, 0xf9, 0xff, 0x63, 0xe7, 0xc6, 0x9f, 0x2e, 0xc7, 0x6e, 0xd8, 0x7a, 0x2e,
+ 0x03, 0xb9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE go_up_xpm[1] = {{ png, sizeof( png ), "go_up_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/minus.cpp b/bitmaps_png/cpp_26/minus.cpp
new file mode 100644
index 0000000..18e3091
--- /dev/null
+++ b/bitmaps_png/cpp_26/minus.cpp
@@ -0,0 +1,33 @@
+
+/* 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, 0x01, 0x03, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x92, 0x2d, 0x52, 0x03,
+ 0x41, 0x14, 0x84, 0xbf, 0x97, 0x0d, 0x84, 0xaa, 0xe0, 0xa0, 0x8a, 0x6b, 0x70, 0x02, 0x0c, 0x60,
+ 0x11, 0xdc, 0x80, 0x1b, 0xa0, 0x30, 0x1c, 0x82, 0x93, 0x20, 0x31, 0xb8, 0x08, 0x04, 0x96, 0x42,
+ 0xe4, 0x10, 0x08, 0x08, 0x95, 0x9f, 0xcd, 0xee, 0xeb, 0x46, 0x2c, 0x09, 0x54, 0x10, 0x91, 0x98,
+ 0xf9, 0xcc, 0x54, 0x4d, 0xcf, 0x74, 0x4f, 0xd7, 0x1b, 0x28, 0x14, 0x0a, 0x85, 0x7f, 0x23, 0x36,
+ 0x37, 0x4e, 0xaf, 0xef, 0x6f, 0xf6, 0x87, 0xbb, 0x27, 0x89, 0x06, 0x61, 0x76, 0x02, 0xaa, 0x7e,
+ 0x55, 0x2d, 0x56, 0xba, 0xe4, 0x68, 0xad, 0x81, 0x32, 0xe6, 0x55, 0x78, 0x09, 0xe0, 0xc0, 0x6b,
+ 0xdd, 0x30, 0xad, 0xf3, 0x65, 0x74, 0x77, 0x79, 0xfb, 0xdb, 0xb7, 0xbf, 0x19, 0x74, 0x74, 0x30,
+ 0x3c, 0xbf, 0xba, 0x38, 0x3e, 0x9b, 0xd7, 0xc9, 0xcf, 0x65, 0xaf, 0x57, 0x13, 0x48, 0x06, 0x77,
+ 0xa6, 0x02, 0x2c, 0x30, 0x46, 0x82, 0xaa, 0x0a, 0x1e, 0x46, 0xaf, 0x87, 0x9b, 0xbe, 0x7f, 0x82,
+ 0xd2, 0xe6, 0x6d, 0x52, 0xf3, 0x31, 0x6b, 0xe8, 0x45, 0x67, 0x06, 0x41, 0x9b, 0xc6, 0xee, 0x74,
+ 0x09, 0x52, 0x90, 0x69, 0x24, 0x93, 0x86, 0x36, 0xc1, 0x86, 0xbd, 0xdd, 0x1e, 0x8b, 0xd6, 0xb9,
+ 0x35, 0xa8, 0x69, 0x92, 0xc9, 0xac, 0xe1, 0x73, 0xd6, 0x20, 0xa2, 0x6b, 0xa1, 0x2e, 0x70, 0xf5,
+ 0x6a, 0xd9, 0x48, 0x81, 0x0c, 0x29, 0x77, 0xcd, 0x64, 0xec, 0x60, 0x99, 0x41, 0xbd, 0x4c, 0x6d,
+ 0x0d, 0x7a, 0x9f, 0x2e, 0x9e, 0x1f, 0x9f, 0xc6, 0xb1, 0x3a, 0x19, 0xc6, 0xfa, 0x9e, 0x80, 0xe9,
+ 0x5a, 0x01, 0xb4, 0x69, 0x61, 0xf7, 0xaa, 0x2a, 0x2c, 0x1b, 0x3b, 0xd6, 0x73, 0x9a, 0xd7, 0xed,
+ 0xb8, 0x7c, 0xff, 0x42, 0xa1, 0xb0, 0x9d, 0x2f, 0xc6, 0x75, 0xa7, 0x8d, 0xdc, 0xc1, 0xad, 0x6e,
+ 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE minus_xpm[1] = {{ png, sizeof( png ), "minus_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/plus.cpp b/bitmaps_png/cpp_26/plus.cpp
new file mode 100644
index 0000000..b060152
--- /dev/null
+++ b/bitmaps_png/cpp_26/plus.cpp
@@ -0,0 +1,49 @@
+
+/* 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, 0x01, 0xf9, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x95, 0xbf, 0x6b, 0x53,
+ 0x51, 0x14, 0xc7, 0x3f, 0xf7, 0xbd, 0x97, 0xe4, 0x45, 0x13, 0x1b, 0x04, 0x71, 0xa8, 0x83, 0x8b,
+ 0xa8, 0xf8, 0x63, 0x50, 0x8b, 0xd0, 0xa9, 0x1d, 0xc5, 0x1f, 0x93, 0x38, 0x0a, 0x82, 0x82, 0x8b,
+ 0xce, 0xfe, 0x1b, 0xe2, 0xd0, 0xa9, 0x8b, 0x83, 0x93, 0x0e, 0x2e, 0xe2, 0xa8, 0x60, 0x06, 0xa9,
+ 0x43, 0x15, 0xf1, 0x07, 0x2e, 0x16, 0xec, 0x22, 0x34, 0xe5, 0xb5, 0x69, 0x92, 0x97, 0xbc, 0x7b,
+ 0xbe, 0x0e, 0x79, 0x8d, 0x51, 0x10, 0x13, 0x6b, 0x05, 0xa1, 0x07, 0x0e, 0x17, 0xee, 0xbd, 0x87,
+ 0xcf, 0x39, 0xdf, 0xfb, 0xe3, 0xc0, 0x8e, 0xed, 0xd8, 0xbf, 0x36, 0x37, 0xea, 0xc6, 0xa9, 0x1b,
+ 0x0f, 0x8e, 0x4d, 0x9f, 0x98, 0x7c, 0x76, 0x70, 0xb2, 0x26, 0x9c, 0xdc, 0xe7, 0xe5, 0xc4, 0xd5,
+ 0x17, 0x97, 0x66, 0x5e, 0xcd, 0x5f, 0x7d, 0x3b, 0x4a, 0x7c, 0x34, 0x4e, 0x56, 0xc7, 0x0f, 0xed,
+ 0xdf, 0x5d, 0x8c, 0x4b, 0x65, 0x09, 0x2a, 0xe5, 0x72, 0xbb, 0xbe, 0xb8, 0x34, 0x72, 0x6c, 0x34,
+ 0x9e, 0x00, 0xc2, 0x9b, 0x00, 0x30, 0x69, 0xac, 0xc8, 0xe0, 0x4f, 0x15, 0x17, 0xa0, 0x30, 0x70,
+ 0xdb, 0x02, 0x32, 0x5c, 0x1f, 0x22, 0x06, 0x95, 0x6d, 0x49, 0xba, 0x99, 0xdb, 0x0f, 0x6f, 0x4e,
+ 0x54, 0x4b, 0x17, 0x86, 0x08, 0x05, 0xc3, 0xd7, 0xa2, 0x20, 0x08, 0x25, 0x90, 0x20, 0x74, 0x84,
+ 0xfb, 0x6a, 0x95, 0xbb, 0x17, 0xef, 0x3c, 0x6e, 0xa9, 0x5f, 0x20, 0x41, 0xe8, 0x48, 0x92, 0xee,
+ 0x93, 0xe7, 0xf7, 0x2e, 0xcf, 0x8d, 0x04, 0x2a, 0xc7, 0x85, 0x73, 0xb7, 0xae, 0x4c, 0x9d, 0x6f,
+ 0xa5, 0xfe, 0x87, 0xf3, 0xf0, 0x06, 0xab, 0xcd, 0x1e, 0x00, 0xb5, 0x89, 0x4a, 0xf1, 0xda, 0xa5,
+ 0xd3, 0xb3, 0x06, 0xc8, 0x40, 0x88, 0x42, 0xe8, 0x98, 0x7f, 0xb4, 0xe0, 0x81, 0xb9, 0x91, 0x2f,
+ 0x43, 0xa3, 0x99, 0xd2, 0x68, 0xf6, 0x70, 0x80, 0x70, 0x78, 0x2f, 0x2c, 0x97, 0xcc, 0x04, 0x8d,
+ 0x66, 0x0f, 0x6f, 0x22, 0xf3, 0xdf, 0xe7, 0xaa, 0xe5, 0x08, 0x39, 0xa7, 0x31, 0x6e, 0x9d, 0x58,
+ 0x6b, 0x65, 0x24, 0xad, 0x0c, 0x93, 0x90, 0x31, 0x80, 0xac, 0xac, 0xf7, 0x90, 0x60, 0xcf, 0xae,
+ 0x08, 0x70, 0x03, 0x88, 0x99, 0x30, 0x19, 0x26, 0x1b, 0xfd, 0x8c, 0x3a, 0x99, 0x7f, 0xfd, 0xf4,
+ 0xc5, 0xfb, 0xbd, 0x5e, 0x41, 0xe8, 0xcd, 0x07, 0x4e, 0x6a, 0x9b, 0x57, 0x74, 0xf2, 0xc8, 0x81,
+ 0x33, 0x52, 0x14, 0x4b, 0xd0, 0x4d, 0x3b, 0xe9, 0xbb, 0x4f, 0x5f, 0x16, 0xa3, 0x90, 0x6e, 0x2f,
+ 0x73, 0x05, 0xb3, 0xcc, 0x07, 0x2e, 0x6c, 0x67, 0x59, 0x56, 0xdf, 0xd2, 0xcf, 0x70, 0xea, 0xfa,
+ 0xfd, 0xa3, 0xb3, 0x67, 0x0f, 0xbf, 0xec, 0x28, 0xae, 0x22, 0x88, 0xd4, 0x59, 0xaf, 0x2f, 0x7c,
+ 0x9c, 0xde, 0x96, 0x9f, 0xc1, 0x36, 0x1f, 0x2b, 0x7d, 0x29, 0xff, 0xd6, 0x83, 0x75, 0x79, 0x22,
+ 0x45, 0x20, 0xee, 0xac, 0x2e, 0xc7, 0x52, 0x1f, 0x22, 0x39, 0xbc, 0xf7, 0x2e, 0x5d, 0xfb, 0x5a,
+ 0xca, 0xd7, 0xc3, 0xdf, 0xa9, 0xf3, 0xab, 0x8a, 0xc2, 0x9f, 0x3c, 0xea, 0x6e, 0xac, 0xc4, 0x66,
+ 0x46, 0xad, 0x1a, 0x61, 0x82, 0x24, 0x11, 0xbd, 0x76, 0x52, 0x04, 0x4a, 0x80, 0x07, 0xb2, 0x7c,
+ 0xf4, 0xe3, 0x80, 0x2c, 0xaf, 0x56, 0xb9, 0x9b, 0x4f, 0x1b, 0x8d, 0x37, 0x1f, 0x96, 0xea, 0x61,
+ 0x18, 0x80, 0x19, 0x26, 0x48, 0x37, 0xd6, 0x1a, 0x43, 0x7b, 0xb6, 0xd4, 0x26, 0x5c, 0x0e, 0xdc,
+ 0x74, 0x37, 0x14, 0x33, 0x48, 0x22, 0x77, 0xbf, 0xd3, 0x75, 0xff, 0x6f, 0xfb, 0x06, 0x54, 0x93,
+ 0x06, 0x42, 0xab, 0xa5, 0xc7, 0xf1, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
+ 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE plus_xpm[1] = {{ png, sizeof( png ), "plus_xpm" }};
+
+//EOF
diff --git a/include/bitmaps.h b/include/bitmaps.h
index a5de83b..dc1e490 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -178,6 +178,8 @@ EXTERN_BITMAP( general_ratsnest_xpm )
EXTERN_BITMAP( glabel2label_xpm )
EXTERN_BITMAP( glabel2text_xpm )
EXTERN_BITMAP( gl_change_xpm )
+EXTERN_BITMAP( go_down_xpm )
+EXTERN_BITMAP( go_up_xpm )
EXTERN_BITMAP( green_xpm )
EXTERN_BITMAP( grid_select_axis_xpm )
EXTERN_BITMAP( grid_select_xpm )
@@ -261,6 +263,7 @@ EXTERN_BITMAP( load_module_lib_xpm )
EXTERN_BITMAP( local_ratsnest_xpm )
EXTERN_BITMAP( locked_xpm )
EXTERN_BITMAP( measurement_xpm )
+EXTERN_BITMAP( minus_xpm )
EXTERN_BITMAP( mirepcb_xpm )
EXTERN_BITMAP( mirror_h_xpm )
EXTERN_BITMAP( mirror_v_xpm )
@@ -388,6 +391,7 @@ EXTERN_BITMAP( plot_hpg_xpm )
EXTERN_BITMAP( plot_pdf_xpm )
EXTERN_BITMAP( plot_ps_xpm )
EXTERN_BITMAP( plot_svg_xpm )
+EXTERN_BITMAP( plus_xpm )
EXTERN_BITMAP( polar_coord_xpm )
EXTERN_BITMAP( post_compo_xpm )
EXTERN_BITMAP( post_drill_xpm )
--
2.7.4
From 51f386d79c3c471ed97009a2d140e42a79eaa4bd Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@xxxxxxxxx>
Date: Mon, 4 Sep 2017 00:03:56 +1000
Subject: [PATCH 2/3] Altered text buttons to image buttons
- Used same tooltip messages
- Added "MoveFieldDown" button / function
---
.../dialogs/dialog_edit_libentry_fields_in_lib.cpp | 48 ++
.../dialog_edit_libentry_fields_in_lib_base.cpp | 42 +-
.../dialog_edit_libentry_fields_in_lib_base.fbp | 647 ++++++++++++---------
.../dialog_edit_libentry_fields_in_lib_base.h | 18 +-
4 files changed, 477 insertions(+), 278 deletions(-)
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
index 3e3eb9f..a7f66eb 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
@@ -44,6 +44,8 @@
#include <dialog_helpers.h>
#include <sch_validators.h>
+#include <bitmaps.h>
+
#include <dialog_edit_libentry_fields_in_lib_base.h>
#ifdef KICAD_SPICE
#include <dialog_spice_model.h>
@@ -82,6 +84,7 @@ private:
void deleteFieldButtonHandler( wxCommandEvent& event ) override;
void moveUpButtonHandler( wxCommandEvent& event ) override;
+ void moveDownButtonHandler( wxCommandEvent& event ) override;
void OnCancelButtonClick( wxCommandEvent& event ) override;
void OnOKButtonClick( wxCommandEvent& event ) override;
void showButtonHandler( wxCommandEvent& event ) override;
@@ -180,6 +183,12 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB(
#ifndef KICAD_SPICE
m_spiceFieldsButton->Show(false);
#endif
+
+ // Configure button logos
+ addFieldButton->SetBitmap( KiBitmap( plus_xpm ) );
+ deleteFieldButton->SetBitmap( KiBitmap( minus_xpm ) );
+ moveUpButton->SetBitmap( KiBitmap( go_up_xpm ) );
+ moveDownButton->SetBitmap( KiBitmap( go_down_xpm ) );
}
@@ -412,6 +421,44 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::deleteFieldButtonHandler( wxCommandEven
}
+void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::moveDownButtonHandler( wxCommandEvent& event )
+{
+ unsigned int fieldNdx = getSelectedFieldNdx();
+
+ // Ensure there is at least one field after this one
+ if( fieldNdx >= ( m_FieldsBuf.size() - 1 ) )
+ {
+ return;
+ }
+
+ // The first field which can be moved up is the second user field
+ // so any field which id < MANDATORY_FIELDS cannot be moved down
+ if( fieldNdx < MANDATORY_FIELDS )
+ return;
+
+ if( !copyPanelToSelectedField() )
+ return;
+
+ // swap the fieldNdx field with the one before it, in both the vector
+ // and in the fieldListCtrl
+ LIB_FIELD tmp = m_FieldsBuf[fieldNdx + 1];
+
+ m_FieldsBuf[fieldNdx + 1] = m_FieldsBuf[fieldNdx];
+ setRowItem( fieldNdx + 1, m_FieldsBuf[fieldNdx] );
+ m_FieldsBuf[fieldNdx + 1].SetId(fieldNdx + 1);
+
+ m_FieldsBuf[fieldNdx] = tmp;
+ setRowItem( fieldNdx, tmp );
+ m_FieldsBuf[fieldNdx].SetId(fieldNdx);
+
+ updateDisplay( );
+
+ m_skipCopyFromPanel = true;
+ setSelectedFieldNdx( fieldNdx + 1 );
+ m_skipCopyFromPanel = false;
+}
+
+
void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB:: moveUpButtonHandler( wxCommandEvent& event )
{
unsigned fieldNdx = getSelectedFieldNdx();
@@ -721,6 +768,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::copySelectedFieldToPanel()
// only user defined fields may be moved, and not the top most user defined
// field since it would be moving up into the fixed fields, > not >=
moveUpButton->Enable( fieldNdx > MANDATORY_FIELDS );
+ moveDownButton->Enable( ( fieldNdx >= MANDATORY_FIELDS ) && ( fieldNdx < ( m_FieldsBuf.size() - 1 ) ) );
// if fieldNdx == REFERENCE, VALUE, then disable delete button
deleteFieldButton->Enable( fieldNdx >= MANDATORY_FIELDS );
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp
index 6a77fb8..4325d58 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version May 6 2016)
+// C++ code generated with wxFormBuilder (version Mar 22 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -25,20 +25,34 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
fieldListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES );
bSizerFiledsList->Add( fieldListCtrl, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 );
- addFieldButton = new wxButton( this, wxID_ANY, _("Add Field"), wxDefaultPosition, wxDefaultSize, 0 );
- addFieldButton->SetToolTip( _("Add a new custom field") );
+ wxBoxSizer* bSizer8;
+ bSizer8 = new wxBoxSizer( wxHORIZONTAL );
+
+ moveUpButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ moveUpButton->SetToolTip( _("Move the selected optional fields up one position") );
+
+ bSizer8->Add( moveUpButton, 0, wxALL, 5 );
+
+ moveDownButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ moveDownButton->SetToolTip( _("Move Move the selected optional fields down one position down") );
- bSizerFiledsList->Add( addFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+ bSizer8->Add( moveDownButton, 0, wxALL, 5 );
- deleteFieldButton = new wxButton( this, wxID_ANY, _("Clear and Delete Field"), wxDefaultPosition, wxDefaultSize, 0 );
+
+ bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
deleteFieldButton->SetToolTip( _("Delete one of the optional fields") );
- bSizerFiledsList->Add( deleteFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+ bSizer8->Add( deleteFieldButton, 0, wxALL, 5 );
- moveUpButton = new wxButton( this, wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );
- moveUpButton->SetToolTip( _("Move the selected optional fields up one position") );
+ addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ addFieldButton->SetToolTip( _("Add a new custom field") );
+
+ bSizer8->Add( addFieldButton, 0, wxALL, 5 );
- bSizerFiledsList->Add( moveUpButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ bSizerFiledsList->Add( bSizer8, 0, wxEXPAND, 5 );
m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Edit Spice model"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerFiledsList->Add( m_spiceFieldsButton, 0, wxALL|wxEXPAND, 5 );
@@ -202,9 +216,10 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) );
fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this );
fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this );
- addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this );
- deleteFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this );
moveUpButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this );
+ moveDownButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveDownButtonHandler ), NULL, this );
+ deleteFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this );
+ addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this );
m_spiceFieldsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this );
m_show_datasheet_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this );
stdDialogButtonSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this );
@@ -218,9 +233,10 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::~DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BAS
this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) );
fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this );
fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this );
- addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this );
- deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this );
moveUpButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this );
+ moveDownButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveDownButtonHandler ), NULL, this );
+ deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this );
+ addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this );
m_spiceFieldsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this );
m_show_datasheet_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this );
stdDialogButtonSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this );
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp
index 50a1312..b6148af 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp
@@ -216,268 +216,397 @@
<event name="OnUpdateUI"></event>
</object>
</object>
- <object class="sizeritem" expanded="0">
- <property name="border">5</property>
- <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default">0</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Add Field</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">addFieldButton</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Add a new custom field</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">addFieldButtonHandler</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="0">
- <property name="border">5</property>
- <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default">0</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Clear and Delete Field</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">deleteFieldButton</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Delete one of the optional fields</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">deleteFieldButtonHandler</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="0">
+ <object class="sizeritem" expanded="1">
<property name="border">5</property>
- <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
+ <property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
- <object class="wxButton" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default">0</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Move Up</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
+ <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">moveUpButton</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Move the selected optional fields up one position</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">moveUpButtonHandler</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <property name="name">bSizer8</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="permission">none</property>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">MyButton</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">moveUpButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Move the selected optional fields up one position</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">moveUpButtonHandler</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">MyButton</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">moveDownButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Move Move the selected optional fields down one position down</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">moveDownButtonHandler</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="spacer" expanded="1">
+ <property name="height">0</property>
+ <property name="permission">protected</property>
+ <property name="width">0</property>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">MyButton</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">deleteFieldButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Delete one of the optional fields</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">deleteFieldButtonHandler</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">MyButton</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">addFieldButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Add a new custom field</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">addFieldButtonHandler</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
</object>
</object>
<object class="sizeritem" expanded="1">
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h
index 6ce8c99..ae9ef85 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version May 6 2016)
+// C++ code generated with wxFormBuilder (version Mar 22 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -20,6 +20,10 @@ class DIALOG_SHIM;
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/string.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/bmpbuttn.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/radiobox.h>
@@ -42,9 +46,10 @@ class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE : public DIALOG_SHIM
protected:
wxListCtrl* fieldListCtrl;
- wxButton* addFieldButton;
- wxButton* deleteFieldButton;
- wxButton* moveUpButton;
+ wxBitmapButton* moveUpButton;
+ wxBitmapButton* moveDownButton;
+ wxBitmapButton* deleteFieldButton;
+ wxBitmapButton* addFieldButton;
wxButton* m_spiceFieldsButton;
wxRadioBox* m_FieldHJustifyCtrl;
wxRadioBox* m_FieldVJustifyCtrl;
@@ -75,9 +80,10 @@ class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE : public DIALOG_SHIM
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
- virtual void addFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
- virtual void deleteFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void moveUpButtonHandler( wxCommandEvent& event ) { event.Skip(); }
+ virtual void moveDownButtonHandler( wxCommandEvent& event ) { event.Skip(); }
+ virtual void deleteFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
+ virtual void addFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void EditSpiceModel( wxCommandEvent& event ) { event.Skip(); }
virtual void showButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
--
2.7.4
From 72f4fe259359c023675cb95ca5a91274a5dc6d9f Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@xxxxxxxxx>
Date: Tue, 12 Sep 2017 17:43:51 +1000
Subject: [PATCH 3/3] Added button logos to DIALOG_EDIT_COMPONENT_IN_SCHEMATIC
dialog
---
.../dialogs/dialog_edit_component_in_schematic.cpp | 50 +-
.../dialog_edit_component_in_schematic_fbp.cpp | 42 +-
.../dialog_edit_component_in_schematic_fbp.fbp | 661 ++++++++++++---------
.../dialog_edit_component_in_schematic_fbp.h | 18 +-
4 files changed, 483 insertions(+), 288 deletions(-)
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 505b4a9..1574745 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -21,9 +21,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-/**
- * @file dialog_edit_component_in_schematic.cpp
- */
#include <wx/tooltip.h>
#include <wx/hyperlink.h>
@@ -46,6 +43,8 @@
#include <dialog_helpers.h>
#include <sch_validators.h>
+#include <bitmaps.h>
+
#include <dialog_edit_component_in_schematic_fbp.h>
#ifdef KICAD_SPICE
#include <dialog_spice_model.h>
@@ -130,6 +129,7 @@ private:
void addFieldButtonHandler( wxCommandEvent& event ) override;
void deleteFieldButtonHandler( wxCommandEvent& event ) override;
void moveUpButtonHandler( wxCommandEvent& event ) override;
+ void moveDownButtonHandler( wxCommandEvent& event ) override;
void showButtonHandler( wxCommandEvent& event ) override;
void OnTestChipName( wxCommandEvent& event ) override;
void OnSelectChipName( wxCommandEvent& event ) override;
@@ -223,6 +223,12 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow
wxToolTip::Enable( true );
stdDialogButtonSizerOK->SetDefault();
+ // Configure button logos
+ addFieldButton->SetBitmap( KiBitmap( plus_xpm ) );
+ deleteFieldButton->SetBitmap( KiBitmap( minus_xpm ) );
+ moveUpButton->SetBitmap( KiBitmap( go_up_xpm ) );
+ moveDownButton->SetBitmap( KiBitmap( go_down_xpm ) );
+
Fit();
}
@@ -637,6 +643,44 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::moveUpButtonHandler( wxCommandEvent& ev
}
+void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::moveDownButtonHandler( wxCommandEvent& event )
+{
+ unsigned fieldNdx = getSelectedFieldNdx();
+
+ // Ensure there is at least one field after this one
+ if( fieldNdx >= ( m_FieldsBuf.size() - 1 ) )
+ {
+ return;
+ }
+
+ // The first field which can be moved up is the second user field
+ // so any field which id < MANDATORY_FIELDS cannot be moved down
+ if( fieldNdx < MANDATORY_FIELDS )
+ return;
+
+ if( !copyPanelToSelectedField() )
+ return;
+
+ // swap the fieldNdx field with the one before it, in both the vector
+ // and in the fieldListCtrl
+ SCH_FIELD tmp = m_FieldsBuf[fieldNdx + 1];
+
+ m_FieldsBuf[fieldNdx + 1] = m_FieldsBuf[fieldNdx];
+ setRowItem( fieldNdx + 1, m_FieldsBuf[fieldNdx] );
+ m_FieldsBuf[fieldNdx + 1].SetId(fieldNdx + 1);
+
+ m_FieldsBuf[fieldNdx] = tmp;
+ setRowItem( fieldNdx, tmp );
+ m_FieldsBuf[fieldNdx].SetId(fieldNdx);
+
+ updateDisplay( );
+
+ m_skipCopyFromPanel = true;
+ setSelectedFieldNdx( fieldNdx + 1 );
+ m_skipCopyFromPanel = false;
+}
+
+
void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::setSelectedFieldNdx( int aFieldNdx )
{
/* deselect old selection, but I think this is done by single selection
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
index 08af0ec..c6e3992 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 19 2017)
+// C++ code generated with wxFormBuilder (version Mar 22 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -123,20 +123,34 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
gridStaticBoxSizer->Add( fieldListCtrl, 1, wxALL|wxEXPAND, 8 );
- addFieldButton = new wxButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, _("New Field"), wxDefaultPosition, wxDefaultSize, 0 );
- addFieldButton->SetToolTip( _("Create new custom field") );
+ wxBoxSizer* bSizer9;
+ bSizer9 = new wxBoxSizer( wxHORIZONTAL );
+
+ moveUpButton = new wxBitmapButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ moveUpButton->SetToolTip( _("Move the selected optional field up one position") );
+
+ bSizer9->Add( moveUpButton, 0, wxALL, 5 );
+
+ moveDownButton = new wxBitmapButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ moveDownButton->SetToolTip( _("Move the selected optional field down one position") );
- gridStaticBoxSizer->Add( addFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+ bSizer9->Add( moveDownButton, 0, wxALL, 5 );
- deleteFieldButton = new wxButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, _("Delete Field"), wxDefaultPosition, wxDefaultSize, 0 );
+
+ bSizer9->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ deleteFieldButton = new wxBitmapButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
deleteFieldButton->SetToolTip( _("Delete optional field") );
- gridStaticBoxSizer->Add( deleteFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+ bSizer9->Add( deleteFieldButton, 0, wxALL, 5 );
- moveUpButton = new wxButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );
- moveUpButton->SetToolTip( _("Move the selected optional field up one position") );
+ addFieldButton = new wxBitmapButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+ addFieldButton->SetToolTip( _("Create new custom field") );
+
+ bSizer9->Add( addFieldButton, 0, wxALL, 5 );
- gridStaticBoxSizer->Add( moveUpButton, 0, wxALL|wxEXPAND, 5 );
+
+ gridStaticBoxSizer->Add( bSizer9, 0, wxEXPAND, 5 );
fieldsSizer->Add( gridStaticBoxSizer, 3, wxEXPAND|wxRIGHT|wxLEFT, 0 );
@@ -298,9 +312,10 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
defaultsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::SetInitCmp ), NULL, this );
fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemDeselected ), NULL, this );
fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemSelected ), NULL, this );
- addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::addFieldButtonHandler ), NULL, this );
- deleteFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::deleteFieldButtonHandler ), NULL, this );
moveUpButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::moveUpButtonHandler ), NULL, this );
+ moveDownButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::moveDownButtonHandler ), NULL, this );
+ deleteFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::deleteFieldButtonHandler ), NULL, this );
+ addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::addFieldButtonHandler ), NULL, this );
m_show_datasheet_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::showButtonHandler ), NULL, this );
stdDialogButtonSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnCancelButtonClick ), NULL, this );
stdDialogButtonSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnOKButtonClick ), NULL, this );
@@ -317,9 +332,10 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
defaultsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::SetInitCmp ), NULL, this );
fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemDeselected ), NULL, this );
fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemSelected ), NULL, this );
- addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::addFieldButtonHandler ), NULL, this );
- deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::deleteFieldButtonHandler ), NULL, this );
moveUpButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::moveUpButtonHandler ), NULL, this );
+ moveDownButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::moveDownButtonHandler ), NULL, this );
+ deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::deleteFieldButtonHandler ), NULL, this );
+ addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::addFieldButtonHandler ), NULL, this );
m_show_datasheet_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::showButtonHandler ), NULL, this );
stdDialogButtonSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnCancelButtonClick ), NULL, this );
stdDialogButtonSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnOKButtonClick ), NULL, this );
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
index 6c1d9b2..20b2332 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
@@ -731,11 +731,11 @@
<event name="OnUpdateUI"></event>
</object>
</object>
- <object class="sizeritem" expanded="0">
+ <object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
- <object class="wxStaticBoxSizer" expanded="0">
+ <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Component Name:</property>
<property name="minimum_size"></property>
@@ -835,11 +835,11 @@
<event name="OnUpdateUI"></event>
</object>
</object>
- <object class="sizeritem" expanded="0">
+ <object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
- <object class="wxBoxSizer" expanded="0">
+ <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizerChpinameButt</property>
<property name="orient">wxHORIZONTAL</property>
@@ -1461,7 +1461,7 @@
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
- <object class="wxStaticBoxSizer" expanded="0">
+ <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label"> Fields</property>
<property name="minimum_size"></property>
@@ -1470,11 +1470,11 @@
<property name="parent">1</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
- <object class="sizeritem" expanded="0">
+ <object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">3</property>
- <object class="wxStaticBoxSizer" expanded="0">
+ <object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label"></property>
<property name="minimum_size">-1,-1</property>
@@ -1588,268 +1588,397 @@
<event name="OnUpdateUI"></event>
</object>
</object>
- <object class="sizeritem" expanded="0">
- <property name="border">5</property>
- <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default">0</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">New Field</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">addFieldButton</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Create new custom field</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">addFieldButtonHandler</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="0">
- <property name="border">5</property>
- <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
- <property name="proportion">0</property>
- <object class="wxButton" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default">0</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Delete Field</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">deleteFieldButton</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Delete optional field</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">deleteFieldButtonHandler</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="0">
+ <object class="sizeritem" expanded="1">
<property name="border">5</property>
- <property name="flag">wxALL|wxEXPAND</property>
+ <property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
- <object class="wxButton" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default">0</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Move Up</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
+ <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">moveUpButton</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip">Move the selected optional field up one position</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnButtonClick">moveUpButtonHandler</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <property name="name">bSizer9</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="permission">none</property>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">MyButton</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">moveUpButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Move the selected optional field up one position</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">moveUpButtonHandler</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">MyButton</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">moveDownButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Move the selected optional field down one position</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">moveDownButtonHandler</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="spacer" expanded="1">
+ <property name="height">0</property>
+ <property name="permission">protected</property>
+ <property name="width">0</property>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">MyButton</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">deleteFieldButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Delete optional field</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">deleteFieldButtonHandler</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxBitmapButton" expanded="1">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="bitmap"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default">0</property>
+ <property name="default_pane">0</property>
+ <property name="disabled"></property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="focus"></property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="hover"></property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">MyButton</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">addFieldButton</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="selected"></property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style">wxBU_AUTODRAW</property>
+ <property name="subclass"></property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip">Create new custom field</property>
+ <property name="validator_data_type"></property>
+ <property name="validator_style">wxFILTER_NONE</property>
+ <property name="validator_type">wxDefaultValidator</property>
+ <property name="validator_variable"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnButtonClick">addFieldButtonHandler</event>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
</object>
</object>
</object>
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
index ce223ac..b449d2b 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 19 2017)
+// C++ code generated with wxFormBuilder (version Mar 22 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -29,6 +29,10 @@ class DIALOG_SHIM;
#include <wx/statbox.h>
#include <wx/statline.h>
#include <wx/listctrl.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/bmpbuttn.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
@@ -58,9 +62,10 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM
wxButton* spiceFieldsButton;
wxButton* defaultsButton;
wxListCtrl* fieldListCtrl;
- wxButton* addFieldButton;
- wxButton* deleteFieldButton;
- wxButton* moveUpButton;
+ wxBitmapButton* moveUpButton;
+ wxBitmapButton* moveDownButton;
+ wxBitmapButton* deleteFieldButton;
+ wxBitmapButton* addFieldButton;
wxRadioBox* m_FieldHJustifyCtrl;
wxRadioBox* m_FieldVJustifyCtrl;
wxCheckBox* showCheckBox;
@@ -93,9 +98,10 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM
virtual void SetInitCmp( wxCommandEvent& event ) { event.Skip(); }
virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
- virtual void addFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
- virtual void deleteFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void moveUpButtonHandler( wxCommandEvent& event ) { event.Skip(); }
+ virtual void moveDownButtonHandler( wxCommandEvent& event ) { event.Skip(); }
+ virtual void deleteFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
+ virtual void addFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void showButtonHandler( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
--
2.7.4
Follow ups
