Commit 2c72f821 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Zoom icons enhancements. Gerbview: add missing icons in popup menu

parents a2359ebc edfc1109

3d-viewer/3d_toolbar.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -46,8 +46,8 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() 
                         wxBitmap( zoom_redraw_xpm ),

                         wxBitmap( zoom_redraw_xpm ),

                         _( "Redraw view" ) );

                         _( "Redraw view" ) );





    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" ) );

                         _( "Fit in page" ) );





    m_HToolBar->AddSeparator();

    m_HToolBar->AddSeparator();

    m_HToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString,

    m_HToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString,

bitmaps/CMakeLists.txt

+5 −6
Original line number Original line Diff line number Diff line
@@ -414,19 +414,18 @@ set(BITMAP_SRCS 
    Width_Vias.xpm

    Width_Vias.xpm

    zip_tool.xpm

    zip_tool.xpm

    zip.xpm

    zip.xpm

    zoom_auto.xpm

    zoom.xpm

    Zoom_Center.xpm

    zoom_area.xpm

    zoom_fit_in_page.xpm

    zoom_center_on_screen.xpm

    zoom_in.xpm

    zoom_in.xpm

    zoomoins3d.xpm

    zoomoins3d.xpm

    zoom_out.xpm

    zoom_out.xpm

    zoompage3d.xpm

    zoompage3d.xpm

    Zoom_Page.xpm

    zoomplus3d.xpm

    zoomplus3d.xpm

    zoom_redraw.xpm

    zoom_redraw.xpm

    zoomrefr3d.xpm

    zoomrefr3d.xpm

    Zoom_Selected.xpm

    zoom_selection.xpm

    Zoom_Select.xpm

    zoom.xpm

)

)

bitmaps/Zoom_Center.xpm

deleted100644 → 0
+0 −30
Original line number Original line Diff line number Diff line 
/* 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

bitmaps/Zoom_Page.xpm

deleted100644 → 0
+0 −92
Original line number Original line Diff line number Diff line 
/* 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

bitmaps/Zoom_Select.xpm

deleted100644 → 0
+0 −63
Original line number Original line Diff line number Diff line 
/* 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