diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp
index f2dcdbffa9..3c78fb15b8 100644
--- a/3d-viewer/3d_toolbar.cpp
+++ b/3d-viewer/3d_toolbar.cpp
@@ -46,8 +46,8 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar()
wxBitmap( zoom_redraw_xpm ),
_( "Redraw view" ) );
- m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ),
- _( "Zoom auto" ) );
+ m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_fit_in_page_xpm ),
+ _( "Fit in page" ) );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString,
diff --git a/bitmaps/CMakeLists.txt b/bitmaps/CMakeLists.txt
index aaca595490..8fe5b221af 100644
--- a/bitmaps/CMakeLists.txt
+++ b/bitmaps/CMakeLists.txt
@@ -414,19 +414,18 @@ set(BITMAP_SRCS
Width_Vias.xpm
zip_tool.xpm
zip.xpm
- zoom_auto.xpm
- Zoom_Center.xpm
+ zoom.xpm
+ zoom_area.xpm
+ zoom_fit_in_page.xpm
+ zoom_center_on_screen.xpm
zoom_in.xpm
zoomoins3d.xpm
zoom_out.xpm
zoompage3d.xpm
- Zoom_Page.xpm
zoomplus3d.xpm
zoom_redraw.xpm
zoomrefr3d.xpm
- Zoom_Selected.xpm
- Zoom_Select.xpm
- zoom.xpm
+ zoom_selection.xpm
)
diff --git a/bitmaps/Zoom_Center.xpm b/bitmaps/Zoom_Center.xpm
deleted file mode 100644
index a448fcb9f6..0000000000
--- a/bitmaps/Zoom_Center.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-#ifndef XPMMAIN
-extern const char * zoom_center_xpm[];
-
-#else
-const char * zoom_center_xpm[] = {
-"16 16 4 1",
-" c None",
-". c Black",
-"c c Red",
-"X c Gray100",
-" .... ",
-" ..XXXX.. ",
-" .XXXXXXXX. ",
-" .XXccccXX. ",
-".XXccccccXX. ",
-".XXccccccXX. ",
-".XXccccccXX. ",
-".XXccccccXX. ",
-" .XXccccXX. ",
-" .XXXXXXXX. ",
-" ..XXXX... ",
-" .... ... ",
-" ... ",
-" ... ",
-" ... ",
-" .. "
-};
-#endif
-
diff --git a/bitmaps/Zoom_Page.xpm b/bitmaps/Zoom_Page.xpm
deleted file mode 100644
index 376fbacb3c..0000000000
--- a/bitmaps/Zoom_Page.xpm
+++ /dev/null
@@ -1,92 +0,0 @@
-/* XPM */
-#ifndef XPMMAIN
-extern const char * zoom_page_xpm[];
-
-#else
-const char * zoom_page_xpm[] = {
-"16 16 68 1",
-" c None",
-". c #000000",
-"+ c #262626",
-"@ c #C5C5C5",
-"# c #EEEEEE",
-"$ c #EDEDED",
-"% c #ABABAB",
-"& c #464646",
-"* c #878787",
-"= c #F1F1F1",
-"- c #FEFEFE",
-"; c #FDFDFD",
-"> c #FCFCFC",
-", c #EAEAEA",
-"' c #707070",
-") c #2E2E2E",
-"! c #A0A0A0",
-"~ c #A9A9A9",
-"{ c #E5E5E5",
-"] c #FBFBFB",
-"^ c #E8E8E8",
-"/ c #AFAFAF",
-"( c #F4F4F4",
-"_ c #E9E9E9",
-": c #E1E1E1",
-"< c #FAFAFA",
-"[ c #A4A4A4",
-"} c #F9F9F9",
-"| c #A8A8A8",
-"1 c #E2E2E2",
-"2 c #F8F8F8",
-"3 c #D0D0D0",
-"4 c #C7C7C7",
-"5 c #BDBDBD",
-"6 c #A7A7A7",
-"7 c #E4E4E4",
-"8 c #F7F7F7",
-"9 c #F3F3F3",
-"0 c #D4D4D4",
-"a c #C0C0C0",
-"b c #AEAEAE",
-"c c #A6A6A6",
-"d c #BABABA",
-"e c #444444",
-"f c #F5F5F5",
-"g c #F6F6F6",
-"h c #E7E7E7",
-"i c #858585",
-"j c #828282",
-"k c #E3E3E3",
-"l c #979797",
-"m c #6D6D6D",
-"n c #D6D6D6",
-"o c #2D2D2D",
-"p c #E0E0E0",
-"q c #DEDEDE",
-"r c #949494",
-"s c #7C7C7C",
-"t c #050505",
-"u c #040404",
-"v c #202020",
-"w c #BBBBBB",
-"x c #686868",
-"y c #343434",
-"z c #C2C2C2",
-"A c #797979",
-"B c #3A3A3A",
-"C c #1F1F1F",
-" .... ",
-" .+@#$%&. ",
-" .*=--;>,'. ",
-" )!~~~{;]^& ",
-"./;;(_~:><[. ",
-"._}},>:|1<{. ",
-".^2}13456<7. ",
-".|8290abc}d. ",
-".e{fgffhch& ",
-".ijk((9{lm. ",
-".noe!pqr).... ",
-".;{s)tu. vv.. ",
-".;7kkkw. .xy.. ",
-".zwwww!. .AB..",
-" ...... .xC.",
-" .. "};
-#endif
diff --git a/bitmaps/Zoom_Select.xpm b/bitmaps/Zoom_Select.xpm
deleted file mode 100644
index efe60daaed..0000000000
--- a/bitmaps/Zoom_Select.xpm
+++ /dev/null
@@ -1,63 +0,0 @@
-/* XPM */
-#ifndef XPMMAIN
-extern const char * zoom_select_xpm[];
-
-#else
-const char * zoom_select_xpm[] = {
-"16 16 39 1",
-" c None",
-"! c black",
-"# c #252525",
-"$ c #C4C4C4",
-"% c #EDEDED",
-"& c #ECECEC",
-"' c #AAAAAA",
-"( c #454545",
-") c #868686",
-"* c #F0F0F0",
-"+ c #FDFDFD",
-", c #FCFCFC",
-"- c #FBFBFB",
-". c #E9E9E9",
-"0 c #6F6F6F",
-"1 c #FF8548",
-"2 c #D90000",
-"3 c #FAFAFA",
-"4 c #E7E7E7",
-"5 c #AFAFAF",
-"6 c #FEFEFE",
-"7 c white",
-"8 c #F9F9F9",
-"9 c #A3A3A3",
-": c #E4E4E4",
-"; c #E3E3E3",
-"< c #F8F8F8",
-"= c #B9B9B9",
-"> c #E6E6E6",
-"? c #848484",
-"@ c #E2E2E2",
-"A c #6C6C6C",
-"B c #A0A0A0",
-"C c #202020",
-"D c #1F1F1F",
-"E c #676767",
-"F c #333333",
-"G c #787878",
-"H c #393939",
-" !!!! ",
-" !#$%&'(! ",
-" !)*++,-.0! ",
-" (*+122134( ",
-"!5++6712-89! ",
-"!%+7722178:! ",
-"!&,7727778;! ",
-"!'-,,7738<=! ",
-" (.3-278<>( ",
-" !?4818<@A! ",
-" !(9:;B(!!!! ",
-" !!!! CD!! ",
-" !EF!! ",
-" !GH!!",
-" !ED!",
-" !! "};
-#endif
diff --git a/bitmaps/Zoom_Selected.xpm b/bitmaps/Zoom_Selected.xpm
deleted file mode 100644
index 91d07b22cf..0000000000
--- a/bitmaps/Zoom_Selected.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-#ifndef XPMMAIN
-extern const char * zoom_selected_xpm[];
-
-#else
-const char * zoom_selected_xpm[] = {
-"16 16 38 1",
-" c None",
-". c #000000",
-"+ c #C5C5C5",
-"@ c #EDEDED",
-"# c #464646",
-"$ c #878787",
-"% c #CACACA",
-"& c #FEFEFE",
-"* c #D5D5D5",
-"= c #FDFDFD",
-"- c #D3D3D3",
-"; c #EAEAEA",
-"> c #707070",
-", c #AAAAAA",
-"' c #FBFBFB",
-") c #E8E8E8",
-"! c #B0B0B0",
-"~ c #FFFFFF",
-"{ c #FCFCFC",
-"] c #FAFAFA",
-"^ c #A4A4A4",
-"/ c #E5E5E5",
-"( c #C6C6C6",
-"_ c #E4E4E4",
-": c #B1B1B1",
-"< c #F9F9F9",
-"[ c #BABABA",
-"} c #E7E7E7",
-"| c #858585",
-"1 c #E3E3E3",
-"2 c #6D6D6D",
-"3 c #A1A1A1",
-"4 c #202020",
-"5 c #686868",
-"6 c #343434",
-"7 c #797979",
-"8 c #3A3A3A",
-"9 c #1F1F1F",
-".. .... .. ",
-"....+.@.#. . .. ",
-" .$%&*=-;>. ",
-" .,&&&&=')# . ",
-".!&&~&&={]^. ",
-"..*&&&&=']/. . ",
-".(=&&&={']_. ",
-"..:==={']<[. . ",
-".#;'{'']<}# ",
-" .|)]]]<12. . ",
-" .#^/_3#.... ",
-" . .... 44.. ",
-" .56.. ",
-".. . . . . .78..",
-".. .59.",
-" .. "};
-#endif
diff --git a/bitmaps/sources/zoom.svg b/bitmaps/sources/zoom.svg
new file mode 100644
index 0000000000..5dd236f46e
--- /dev/null
+++ b/bitmaps/sources/zoom.svg
@@ -0,0 +1,794 @@
+
+
+
+
\ No newline at end of file
diff --git a/bitmaps/sources/zoom_area.svg b/bitmaps/sources/zoom_area.svg
new file mode 100644
index 0000000000..5521264919
--- /dev/null
+++ b/bitmaps/sources/zoom_area.svg
@@ -0,0 +1,911 @@
+
+
+
+
\ No newline at end of file
diff --git a/bitmaps/sources/zoom_center_on_screen.svg b/bitmaps/sources/zoom_center_on_screen.svg
new file mode 100644
index 0000000000..3e298f35ec
--- /dev/null
+++ b/bitmaps/sources/zoom_center_on_screen.svg
@@ -0,0 +1,803 @@
+
+
+
+
\ No newline at end of file
diff --git a/bitmaps/sources/zoom_fit_in_page.svg b/bitmaps/sources/zoom_fit_in_page.svg
new file mode 100644
index 0000000000..b539a2fbfe
--- /dev/null
+++ b/bitmaps/sources/zoom_fit_in_page.svg
@@ -0,0 +1,945 @@
+
+
+
+
\ No newline at end of file
diff --git a/bitmaps/sources/zoom_in.svg b/bitmaps/sources/zoom_in.svg
new file mode 100644
index 0000000000..91ab1d976e
--- /dev/null
+++ b/bitmaps/sources/zoom_in.svg
@@ -0,0 +1,703 @@
+
+
+
+
diff --git a/bitmaps/sources/zoom_out.svg b/bitmaps/sources/zoom_out.svg
new file mode 100644
index 0000000000..6935d7a546
--- /dev/null
+++ b/bitmaps/sources/zoom_out.svg
@@ -0,0 +1,635 @@
+
+
+
+
diff --git a/bitmaps/sources/zoom_selection.svg b/bitmaps/sources/zoom_selection.svg
new file mode 100644
index 0000000000..8700a26716
--- /dev/null
+++ b/bitmaps/sources/zoom_selection.svg
@@ -0,0 +1,805 @@
+
+
+
+
\ No newline at end of file
diff --git a/bitmaps/zoom.xpm b/bitmaps/zoom.xpm
index 637e3b2f88..cda574d842 100644
--- a/bitmaps/zoom.xpm
+++ b/bitmaps/zoom.xpm
@@ -1,28 +1,38 @@
/* XPM */
-#ifndef XPMMAIN
-extern const char * zoom_xpm[];
-#else
-const char * zoom_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #00A000",
-"X c #A0C0A0",
-" .... ",
-" ..XXXX.. ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-".XXXXXXXXXX. ",
-".XXXXXXXXXX. ",
-".XXXXXXXXXX. ",
-".XXXXXXXXXX. ",
-" .XXXXXXXX. ",
-" .XXXXXXXX. ",
-" ..XXXX... ",
-" .... ... ",
-" ... ",
-" ... ",
-" ... ",
-" .. "
+const char *zoom_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"X c #989392",
+"o c #7D7979",
+"$ c #A3D1FB",
+"+ c #989EA2",
+"= c #F6AD3E",
+"& c #F4C284",
+" c None",
+"% c #2E2D2E",
+"O c #656566",
+"- c #FCDB4E",
+"@ c #49494B",
+"; c #BA4D36",
+": c #F07716",
+"# c #CAE5FB",
+". c #BDBBBC",
+"* c #C16854",
+/* pixels */
+" .XoOOOX ",
+" .OX +@O. ",
+".O ##### @O ",
+"XX$####$$+%X ",
+"O$$$$$$$$$@O ",
+"O#$$$$$$$$o% ",
+"O##$$$$$##O% ",
+"O ########@O ",
+"+o#######X%+ ",
+" oX#####+o@X. ",
+" .oO+.+O@@.&*. ",
+" +Xooo.X=--*. ",
+" .;:=-*.",
+" .;:=-*",
+" .;:=:",
+" .*;o"
};
-#endif
-
diff --git a/bitmaps/zoom_area.xpm b/bitmaps/zoom_area.xpm
new file mode 100644
index 0000000000..bb35209862
--- /dev/null
+++ b/bitmaps/zoom_area.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+const char *zoom_area_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+" c #6C0A84",
+"X c #7A6F6D",
+". c #9B9A9C",
+"% c #C0DFFB",
+"# c #545456",
+"; c #FCD046",
+"* c #343334",
+"= c #F4C284",
+"O c None",
+"$ c #2C5630",
+"- c #BC5040",
+": c #FC760C",
+"+ c #978980",
+"& c #D4EAFB",
+"o c #0C8922",
+"@ c #BBC7D3",
+/* pixels */
+" .XXXX.oOoO ",
+" +@@@.#$OoO ",
+" %&&&%@##OO ",
+"+.%%%%%%%.*.OOOO",
+"X@%%%%%%%%##OOoo",
+"#%%%%%%%%%X*OOOO",
+"#&%%%%%%%&X*OOoo",
+"X@&&%%%&&%*#OOOO",
+".X&&&&&&&.*.OOoo",
+"o$.%&&&&.X#.OOOO",
+"OO+X.O.X*#O=-Ooo",
+"ooO.+XX+O.+;;-OO",
+"OOOOOOOOOO-:;;oo",
+" OOOOOOOO-: ",
+" OoOoOoOoOo ",
+" OoOoOoOoOo "
+};
diff --git a/bitmaps/zoom_center_on_screen.xpm b/bitmaps/zoom_center_on_screen.xpm
new file mode 100644
index 0000000000..1fe0baa412
--- /dev/null
+++ b/bitmaps/zoom_center_on_screen.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+const char *zoom_center_on_screen_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"& c #C6E2FA",
+"$ c #3D3D40",
+"@ c #768AE3",
+"% c #85635C",
+"; c #BC4828",
+"= c #F4C284",
+" c None",
+"X c #737576",
+"# c #6D73C3",
+"* c #0A16D2",
+". c #94979C",
+"O c #A1A6AA",
+"+ c #9E908B",
+": c #F07716",
+"- c #FCCB43",
+"o c #4C509C",
+/* pixels */
+" .XooX. ",
+" OX+ @#.$% ",
+" X &&@@& $% ",
+"+.&&&@@&&O$+ ",
+"X&&&&@@&&&$% ",
+"%&&&&@@&&&X$ ",
+"****************",
+"X &&&@@&&&$% ",
+".X&&&@@&&.$O ",
+" X.&&@@&OX%+ ",
+" XX.##X$$ =% ",
+" O+ooXO++--% ",
+" ## ;:--% ",
+" ## ;:--%",
+" ## ;:-:",
+" ## %;+"
+};
diff --git a/bitmaps/zoom_fit_in_page.xpm b/bitmaps/zoom_fit_in_page.xpm
new file mode 100644
index 0000000000..4cf254ba03
--- /dev/null
+++ b/bitmaps/zoom_fit_in_page.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+const char *zoom_fit_in_page_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"# c #323432",
+"@ c #9D9187",
+"X c #6E6A6A",
+"& c #121322",
+"O c #595FCC",
+" c #1521D7",
+"$ c #9A9EB7",
+"= c #F4C284",
+"* c #6C727C",
+"o c None",
+"- c #D65A1F",
+". c #545056",
+"+ c #282EA4",
+"% c #CAE5FB",
+": c #B22407",
+"; c #FCCB43",
+/* pixels */
+" ..X..XooO O",
+" +.@ooo@.#$o ",
+" .o%%%%%o.&$ ",
+".@%%%%%%%$#& ",
+".o%%%%%%%%.& O$O",
+".%%o%%%o%%*&Oooo",
+".%%%%%%%%%X&oooo",
+".o%%%%%%%%#&oooo",
+"**%%%%%%%@&@oooo",
+"o.@%%%%%$*.Xoooo",
+"o$.X$$$X#.o=-ooo",
+"$o$+.X..@X@;;-oo",
+" O $oooo:-;;-o",
+" $oooooo:-;;-",
+" Ooooooooo:-;-",
+"O $oooooooo::-"
+};
diff --git a/bitmaps/zoom_in.xpm b/bitmaps/zoom_in.xpm
index 1fa2094407..a3c60fedb1 100644
--- a/bitmaps/zoom_in.xpm
+++ b/bitmaps/zoom_in.xpm
@@ -2,37 +2,37 @@
const char *zoom_in_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
-"; c #9A9E98",
-"# c #A0BEDD",
-"% c #5883B7",
-"X c #AFB8BD",
-"@ c #D2DDE4",
-": c #585955",
+"# c #2D2D2D",
+"@ c #828FB4",
+"O c #958B86",
+". c #6D6E8C",
+"% c #0A0B88",
+"+ c #A8CFF7",
+"* c #F4C284",
" c None",
-". c #898B87",
-"* c #4C7AB4",
-"& c #8DB1D7",
-"- c #767672",
-"= c #BCC0BE",
-"$ c #B3CBE1",
-"+ c #909490",
-"o c #C5D5E2",
-"O c #E5E7EC",
+"$ c #CCE6FA",
+"o c #9FA7B5",
+"& c #3C3EA4",
+"X c #585859",
+"; c #B23014",
+"= c #B45644",
+"- c #FCCB43",
+": c #E1651E",
/* pixels */
-" ........ ",
-" ..XoOOoX.. ",
-" .+o@####@o+. ",
-"..o$#$%%$#$o.. ",
-".X@#o% %$&@X. ",
-".o#$%% %%#&o. ",
-".O&% *&O. ",
-".O&* *&O. ",
-".@#&** **&#@. ",
-".X@&#% *##@=. ",
-"..@@##%%$#o@.- ",
-" .;@Oooo@O@;;:: ",
-" ..=OOO@=..==::",
-" ..+..+.-:-.X:",
-" ::-;:",
-" ::::"
+" .XXXX. ",
+" oXO + @X#o ",
+" X $$ +$ X# ",
+".O+$$%.++o#. ",
+"X++++%.+++X# ",
+"X$o%%%%%&+.# ",
+"X$+..%&.@$.# ",
+"X+$$$%.$$$## ",
+"O.$$$&@$$O#O ",
+" XO$$$$$o.XO ",
+" oX.ooo.#X *= ",
+" O.XXXoOO--= ",
+" ;:--= ",
+" ;:--=",
+" ;:-:",
+" ;;="
};
diff --git a/bitmaps/zoom_out.xpm b/bitmaps/zoom_out.xpm
index 7ad4297591..69da25a95e 100644
--- a/bitmaps/zoom_out.xpm
+++ b/bitmaps/zoom_out.xpm
@@ -2,37 +2,37 @@
const char *zoom_out_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
-"# c #9FBDDD",
-"- c #9A9E98",
-"X c #AFB8BD",
-"@ c #D2DDE4",
-"$ c #B2CBE2",
-"; c #585955",
-"o c #C4D5E4",
+"$ c #2C3EA4",
+"X c #736E6F",
+"% c #3443A6",
+"@ c #2A2B2A",
+"O c #989EA3",
+"& c #050785",
+"# c #CBE5FB",
+"* c #F4C284",
" c None",
-". c #898B87",
-"* c #4C7AB4",
-"& c #5682B7",
-"% c #8DB1D7",
-"= c #767672",
-": c #BCC0BE",
-"+ c #909490",
-"O c #E5E7EC",
+"o c #515252",
+". c #BDBCBD",
+"; c #B23014",
+"+ c #9C9089",
+"= c #B45644",
+"- c #FCCB43",
+": c #E1651E",
/* pixels */
-" ........ ",
-" ..XoOOoX.. ",
-" .+o@####o@+. ",
-"..o$#$$$$#$o.. ",
-".X@#o@oo$$%oX. ",
-".o#$&&&&&&##o. ",
-".O%& *%O. ",
-".O%* *%O. ",
-".@#%******%#@. ",
-".X@#%######OX. ",
-"..@@##$#$#o@.= ",
-" .-@Oooo@O@--;; ",
-" ..:OOO@:..::;;",
-" ..+..+.=;=.X;",
-" ;;=-;",
-" ;;;;"
+" .XXXooX ",
+" Oo+ Oo@. ",
+".o.##### o@ ",
+"X+#######O@X ",
+"o ########o@ ",
+"o##$%%%$%#X@ ",
+"o##&&&&&&#X@ ",
+"o ########@@ ",
+"+X#######O@+ ",
+" o+#####OXoX. ",
+" .XXO.OX@o.*=. ",
+" +XXXXOX+--=. ",
+" .;:--=.",
+" .;:--=",
+" .;:-:",
+" .;;="
};
diff --git a/bitmaps/zoom_selection.xpm b/bitmaps/zoom_selection.xpm
new file mode 100644
index 0000000000..46bc0be5a9
--- /dev/null
+++ b/bitmaps/zoom_selection.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+const char *zoom_selection_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"+ c #9D9DA9",
+"& c #4C2C2F",
+"# c #66535A",
+"% c #640F10",
+"; c #B7503A",
+"@ c #464647",
+"O c #816964",
+"* c #F4C284",
+" c None",
+"= c #D88648",
+"X c #958D8C",
+"$ c #CCE5FA",
+". c #BABABF",
+": c #FC760C",
+"o c #77747A",
+"- c #FCCB43",
+/* pixels */
+" .XoOOOX ",
+" .OX +@#. ",
+".O.$$+.$ ## ",
+"XX$+%#&&$+&X ",
+"O $oo$ %+$@# ",
+"#$$$$$@% $o& ",
+"#$$$$#% $$O@ ",
+"O $$$&+$$$@# ",
+"+o$$$O.$$X&+ ",
+" oX$$#+$+o#X. ",
+" .oO+.+O@@.*O. ",
+" +XooX+X=--O. ",
+" .;:--O.",
+" .;:--O",
+" .;:-=",
+" .;;X"
+};
diff --git a/common/zoom.cpp b/common/zoom.cpp
index 89a8eee9dd..55ba96504c 100644
--- a/common/zoom.cpp
+++ b/common/zoom.cpp
@@ -165,7 +165,7 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
BASE_SCREEN * screen = DrawPanel->GetScreen();
msg = AddHotkeyName( _( "Center" ), m_HotkeysZoomAndGridList, HK_ZOOM_CENTER );
- ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_CENTER, msg, zoom_center_xpm );
+ ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_CENTER, msg, zoom_center_on_screen_xpm );
msg = AddHotkeyName( _( "Zoom in" ), m_HotkeysZoomAndGridList, HK_ZOOM_IN );
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_IN, msg, zoom_in_xpm );
msg = AddHotkeyName( _( "Zoom out" ), m_HotkeysZoomAndGridList, HK_ZOOM_OUT );
@@ -173,13 +173,13 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
msg = AddHotkeyName( _( "Redraw view" ), m_HotkeysZoomAndGridList, HK_ZOOM_REDRAW );
ADD_MENUITEM( MasterMenu, ID_ZOOM_REDRAW, msg, zoom_redraw_xpm );
msg = AddHotkeyName( _( "Zoom auto" ), m_HotkeysZoomAndGridList, HK_ZOOM_AUTO );
- ADD_MENUITEM( MasterMenu, ID_ZOOM_PAGE, msg, zoom_auto_xpm );
+ ADD_MENUITEM( MasterMenu, ID_ZOOM_PAGE, msg, zoom_fit_in_page_xpm );
wxMenu* zoom_choice = new wxMenu;
ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice,
ID_POPUP_ZOOM_SELECT, _( "Zoom select" ),
- zoom_select_xpm );
+ zoom_selection_xpm );
zoom = screen->GetZoom();
maxZoomIds = ID_POPUP_ZOOM_LEVEL_END - ID_POPUP_ZOOM_LEVEL_START;
diff --git a/cvpcb/class_DisplayFootprintsFrame.cpp b/cvpcb/class_DisplayFootprintsFrame.cpp
index 375c925cd5..0b0a191238 100644
--- a/cvpcb/class_DisplayFootprintsFrame.cpp
+++ b/cvpcb/class_DisplayFootprintsFrame.cpp
@@ -217,7 +217,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ),
_( "Redraw view (F3)" ) );
- m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ),
+ m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_fit_in_page_xpm ),
_( "Zoom auto (Home)" ) );
m_HToolBar->AddSeparator();
diff --git a/eeschema/libedit_onrightclick.cpp b/eeschema/libedit_onrightclick.cpp
index fc21336d5a..d39c4ff72d 100644
--- a/eeschema/libedit_onrightclick.cpp
+++ b/eeschema/libedit_onrightclick.cpp
@@ -276,7 +276,7 @@ void AddMenusForBlock( wxMenu* PopMenu, LIB_EDIT_FRAME* frame )
if( frame->GetScreen()->m_BlockLocate.m_Command == BLOCK_MOVE )
ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK,
_( "Zoom Block (drag middle mouse)" ),
- zoom_selected_xpm );
+ zoom_area_xpm );
PopMenu->AppendSeparator();
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 63eb2dc474..539c3ae2cf 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -219,7 +219,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
/* Fit on screen */
text = AddHotkeyName( _( "Fit on Screen" ), s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO );
item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, wxITEM_NORMAL );
- item->SetBitmap( zoom_auto_xpm );
+ item->SetBitmap( zoom_fit_in_page_xpm );
viewMenu->Append( item );
viewMenu->AppendSeparator();
diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp
index a6b0a6202a..69f4fab0e4 100644
--- a/eeschema/menubar_libedit.cpp
+++ b/eeschema/menubar_libedit.cpp
@@ -132,7 +132,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
text = AddHotkeyName( _( "Fit on Screen" ), s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO );
item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, wxITEM_NORMAL );
- item->SetBitmap( zoom_auto_xpm );
+ item->SetBitmap( zoom_fit_in_page_xpm );
viewMenu->Append( item );
viewMenu->AppendSeparator();
diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index 206f9d80a7..bde39fbbbd 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -648,7 +648,8 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame )
PopMenu->AppendSeparator();
if( frame->GetScreen()->m_BlockLocate.m_Command == BLOCK_MOVE )
- ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK, _( "Window Zoom" ), zoom_selected_xpm );
+ ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK, _( "Window Zoom" ),
+ zoom_area_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), apply_xpm );
diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp
index 5e1079edbf..bb120fab1c 100644
--- a/eeschema/tool_lib.cpp
+++ b/eeschema/tool_lib.cpp
@@ -145,7 +145,7 @@ void LIB_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg );
msg = AddHotkeyName( HELP_ZOOM_FIT, s_Libedit_Hokeys_Descr, HK_ZOOM_AUTO, false );
- m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), msg );
+ m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_fit_in_page_xpm ), msg );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_DE_MORGAN_NORMAL_BUTT, wxEmptyString, wxBitmap( morgan1_xpm ),
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index b5528e59b1..7017e97fa9 100644
--- a/eeschema/tool_sch.cpp
+++ b/eeschema/tool_sch.cpp
@@ -92,7 +92,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg );
msg = AddHotkeyName( HELP_ZOOM_FIT, s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO, false );
- m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), msg );
+ m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_fit_in_page_xpm ), msg );
m_HToolBar->AddSeparator();
msg = AddHotkeyName( HELP_FIND, s_Schematic_Hokeys_Descr, HK_FIND_ITEM, false );
diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp
index af6f11bade..47cc3496b4 100644
--- a/eeschema/tool_viewlib.cpp
+++ b/eeschema/tool_viewlib.cpp
@@ -67,7 +67,7 @@ void LIB_VIEW_FRAME::ReCreateHToolbar()
msg = AddHotkeyName( _( "Zoom auto" ), s_Viewlib_Hokeys_Descr,
HK_ZOOM_AUTO, false );
m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString,
- wxBitmap( zoom_auto_xpm ), msg );
+ wxBitmap( zoom_fit_in_page_xpm ), msg );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString,
diff --git a/gerbview/onrightclick.cpp b/gerbview/onrightclick.cpp
index 960ccd9140..8bcfb2144e 100644
--- a/gerbview/onrightclick.cpp
+++ b/gerbview/onrightclick.cpp
@@ -6,6 +6,7 @@
#include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
+#include "bitmaps.h"
#include "gerbview.h"
@@ -33,9 +34,11 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
if( GetToolId() != ID_NO_TOOL_SELECTED )
{
if( DrawStruct && DrawStruct->m_Flags )
- PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel" ) );
+ ADD_MENUITEM( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND,
+ _( "Cancel" ), cancel_xpm );
else
- PopMenu->Append( ID_POPUP_CLOSE_CURRENT_TOOL, _( "End Tool" ) );
+ ADD_MENUITEM( PopMenu, ID_POPUP_CLOSE_CURRENT_TOOL,
+ _( "End Tool" ), cancel_tool_xpm );
PopMenu->AppendSeparator();
}
@@ -45,15 +48,17 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
{
if( BlockActive )
{
- PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ) );
+ ADD_MENUITEM( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND,
+ _( "Cancel Block" ), cancel_xpm );
PopMenu->AppendSeparator();
- PopMenu->Append( ID_POPUP_PLACE_BLOCK, _( "Place Block" ) );
- PopMenu->Append( ID_POPUP_DELETE_BLOCK,
- _( "Delete Block (ctrl + drag mouse)" ) );
+ ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK,
+ _( "Place Block" ), apply_xpm );
+ ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK,
+ _( "Delete Block (ctrl + drag mouse)" ), delete_xpm );
}
else
- PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND,
- _( "Cancel" ) );
+ ADD_MENUITEM( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND,
+ _( "Cancel" ), cancel_xpm );
PopMenu->AppendSeparator();
}
}
diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp
index 3fa8ecb086..29951702ac 100644
--- a/gerbview/toolbars_gerber.cpp
+++ b/gerbview/toolbars_gerber.cpp
@@ -4,7 +4,6 @@
#include "fctsys.h"
-//#include "appl_wxstruct.h"
#include "common.h"
#include "macros.h"
#include "gerbview.h"
@@ -59,7 +58,7 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void )
m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg );
msg = AddHotkeyName( _( "Zoom auto" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_AUTO );
- m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), msg );
+ m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_fit_in_page_xpm ), msg );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, wxBitmap( find_xpm ), _( "Find D-codes" ) );
diff --git a/include/bitmaps.h b/include/bitmaps.h
index f9678abf20..563dc58516 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -410,16 +410,16 @@ extern const char* width_track_xpm[];
extern const char* width_vias_xpm[];
extern const char* zip_tool_xpm[];
extern const char* zip_xpm[];
-extern const char* zoom_center_xpm[];
+extern const char* zoom_area_xpm[];
+extern const char* zoom_center_on_screen_xpm[];
extern const char* zoomoins3d_xpm[];
extern const char* zoom_redraw_xpm[];
-extern const char* zoom_auto_xpm[];
+extern const char* zoom_fit_in_page_xpm[];
extern const char* zoom_in_xpm[];
extern const char* zoom_out_xpm[];
extern const char* zoompage3d_xpm[];
extern const char* zoom_page_xpm[];
extern const char* zoomplus3d_xpm[];
extern const char* zoomrefr3d_xpm[];
-extern const char* zoom_selected_xpm[];
-extern const char* zoom_select_xpm[];
+extern const char* zoom_selection_xpm[];
extern const char* zoom_xpm[];
diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp
index fd05c48338..71dbad15cc 100644
--- a/pcbnew/menubar_modedit.cpp
+++ b/pcbnew/menubar_modedit.cpp
@@ -208,7 +208,7 @@ void WinEDA_ModuleEditFrame::ReCreateMenuBar()
ID_ZOOM_PAGE,
_( "Fit on Screen" ),
_( "Zoom and fit the module in the window" ) );
- item->SetBitmap( zoom_auto_xpm );
+ item->SetBitmap( zoom_fit_in_page_xpm );
viewMenu->Append( item );
/* Separator */
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp
index b27b91e09c..98d75591bd 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcbframe.cpp
@@ -345,7 +345,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text,
HELP_ZOOM_FIT, wxITEM_NORMAL );
- item->SetBitmap( zoom_auto_xpm );
+ item->SetBitmap( zoom_fit_in_page_xpm );
viewMenu->Append( item );
viewMenu->AppendSeparator();
diff --git a/pcbnew/modedit_onclick.cpp b/pcbnew/modedit_onclick.cpp
index c76512c770..da40d8076b 100644
--- a/pcbnew/modedit_onclick.cpp
+++ b/pcbnew/modedit_onclick.cpp
@@ -216,7 +216,7 @@ bool WinEDA_ModuleEditFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopM
_( "Cancel Block" ), cancel_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK,
_( "Zoom Block (drag middle mouse)" ),
- zoom_selected_xpm );
+ zoom_area_xpm );
PopMenu->AppendSeparator();
ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK,
_( "Place Block" ), apply_xpm );
diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp
index 910d1d167a..b55afed13c 100644
--- a/pcbnew/onrightclick.cpp
+++ b/pcbnew/onrightclick.cpp
@@ -374,7 +374,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
void PCB_EDIT_FRAME::createPopUpBlockMenu( wxMenu* menu )
{
ADD_MENUITEM( menu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ), cancel_xpm );
- ADD_MENUITEM( menu, ID_POPUP_ZOOM_BLOCK, _( "Zoom Block" ), zoom_selected_xpm );
+ ADD_MENUITEM( menu, ID_POPUP_ZOOM_BLOCK, _( "Zoom Block" ), zoom_area_xpm );
menu->AppendSeparator();
ADD_MENUITEM( menu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), apply_xpm );
ADD_MENUITEM( menu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), copyblock_xpm );
diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp
index 8b8347c255..72eb2b9503 100644
--- a/pcbnew/tool_modedit.cpp
+++ b/pcbnew/tool_modedit.cpp
@@ -102,7 +102,7 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar()
m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg );
msg = AddHotkeyName( _( "Zoom auto" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_AUTO, false );
- m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), msg );
+ m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_fit_in_page_xpm ), msg );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_MODEDIT_PAD_SETTINGS, wxEmptyString, wxBitmap( options_pad_xpm ),
diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp
index d8538d0de3..803617239e 100644
--- a/pcbnew/tool_pcb.cpp
+++ b/pcbnew/tool_pcb.cpp
@@ -241,7 +241,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg );
msg = AddHotkeyName( HELP_ZOOM_FIT, g_Board_Editor_Hokeys_Descr, HK_ZOOM_AUTO, false );
- m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), msg );
+ m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_fit_in_page_xpm ), msg );
m_HToolBar->AddSeparator();
msg = AddHotkeyName( HELP_FIND, g_Board_Editor_Hokeys_Descr, HK_FIND_ITEM, false );