diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp index aeffc580c6..ab997426aa 100644 --- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp +++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp @@ -41,6 +41,11 @@ #include #include // To use GetRunningMicroSecs or an other profiling utility #include +#include +#include + +extern struct EDA_HOTKEY_CONFIG g_3DViewer_Hokeys_Descr[]; + /** * Trace mask used to enable or disable the trace output of this class. @@ -597,61 +602,80 @@ void EDA_3D_CANVAS::OnRightClick( wxMouseEvent &event ) wxPoint pos; wxMenu PopUpMenu; + wxString msg; + wxMenuItem* item; pos.x = event.GetX(); pos.y = event.GetY(); - wxMenuItem* item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMIN, _( "Zoom +" ) ); - item->SetBitmap( KiBitmap( zoom_in_xpm )); - PopUpMenu.Append( item ); + msg = AddHotkeyName( _( "Zoom +" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_ZOOMIN ); + AddMenuItem( &PopUpMenu, ID_POPUP_ZOOMIN, + msg, KiBitmap( zoom_in_xpm ) ); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMOUT, _( "Zoom -" ) ); - item->SetBitmap( KiBitmap( zoom_out_xpm )); - PopUpMenu.Append( item ); + + msg = AddHotkeyName( _( "Zoom -" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_ZOOMOUT ); + AddMenuItem( &PopUpMenu, ID_POPUP_ZOOMOUT, + msg, KiBitmap( zoom_out_xpm ) ); PopUpMenu.AppendSeparator(); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZPOS, _( "Top View" ) ); - item->SetBitmap( KiBitmap( axis3d_top_xpm )); - PopUpMenu.Append( item ); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZNEG, _( "Bottom View" ) ); - item->SetBitmap( KiBitmap( axis3d_bottom_xpm )); - PopUpMenu.Append( item ); + msg = AddHotkeyName( _( "Top View" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_VIEW_ZPOS ); + AddMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZPOS, + msg, KiBitmap( axis3d_top_xpm ) ); + + msg = AddHotkeyName( _( "Top View" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_VIEW_ZNEG ); + AddMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZNEG, + msg, KiBitmap( axis3d_bottom_xpm ) ); PopUpMenu.AppendSeparator(); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XPOS, _( "Right View" ) ); - item->SetBitmap( KiBitmap( axis3d_right_xpm )); - PopUpMenu.Append( item ); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XNEG, _( "Left View" ) ); - item->SetBitmap( KiBitmap( axis3d_left_xpm )); - PopUpMenu.Append( item ); + msg = AddHotkeyName( _( "Right View" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_VIEW_XPOS ); + AddMenuItem( &PopUpMenu, ID_POPUP_VIEW_XPOS, + msg, KiBitmap( axis3d_right_xpm ) ); + + msg = AddHotkeyName( _( "Left View" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_VIEW_XNEG ); + AddMenuItem( &PopUpMenu, ID_POPUP_VIEW_XNEG, + msg, KiBitmap( axis3d_left_xpm ) ); PopUpMenu.AppendSeparator(); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YPOS, _( "Front View" ) ); - item->SetBitmap( KiBitmap( axis3d_front_xpm )); - PopUpMenu.Append( item ); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YNEG, _( "Back View" ) ); - item->SetBitmap( KiBitmap( axis3d_back_xpm )); - PopUpMenu.Append( item ); + msg = AddHotkeyName( _( "Front View" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_VIEW_YPOS ); + AddMenuItem( &PopUpMenu, ID_POPUP_VIEW_YPOS, + msg, KiBitmap( axis3d_front_xpm ) ); + + msg = AddHotkeyName( _( "Back View" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_VIEW_YNEG ); + AddMenuItem( &PopUpMenu, ID_POPUP_VIEW_YNEG, + msg, KiBitmap( axis3d_back_xpm ) ); PopUpMenu.AppendSeparator(); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_LEFT, _( "Move left <-" ) ); - item->SetBitmap( KiBitmap( left_xpm )); - PopUpMenu.Append( item ); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_RIGHT, _( "Move right ->" ) ); - item->SetBitmap( KiBitmap( right_xpm )); - PopUpMenu.Append( item ); + msg = AddHotkeyName( _( "Move left <-" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_MOVE3D_LEFT ); + AddMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_LEFT, + msg, KiBitmap( left_xpm ) ); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_UP, _( "Move Up ^" ) ); - item->SetBitmap( KiBitmap( up_xpm )); - PopUpMenu.Append( item ); + msg = AddHotkeyName( _( "Move right ->" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_MOVE3D_RIGHT ); + AddMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_RIGHT, + msg, KiBitmap( right_xpm ) ); - item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_DOWN, _( "Move Down" ) ); - item->SetBitmap( KiBitmap( down_xpm )); - PopUpMenu.Append( item ); + msg = AddHotkeyName( _( "Move Up ^" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_MOVE3D_UP ); + AddMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_UP, + msg, KiBitmap( up_xpm ) ); + + msg = AddHotkeyName( _( "Move Down" ), g_3DViewer_Hokeys_Descr, + ID_POPUP_MOVE3D_DOWN ); + AddMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_DOWN, + msg, KiBitmap( down_xpm ) ); PopupMenu( &PopUpMenu, pos ); } diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp index 32231c9cd1..8ca177eebd 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015-2016 Mario Luzeiro - * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1188,25 +1188,24 @@ bool EDA_3D_VIEWER::Set3DSolderPasteColorFromUser() // Define 3D Viewer Hotkeys -// !TODO: this is used just for help menu, the structured are not used yet in the viewer static EDA_HOTKEY Hk3D_PivotCenter( _HKI( "Center pivot rotation (Middle mouse click)" ), 0, WXK_SPACE ); -static EDA_HOTKEY Hk3D_MoveLeft( _HKI( "Move board Left" ), 0, WXK_LEFT ); -static EDA_HOTKEY Hk3D_MoveRight( _HKI( "Move board Right" ), 0, WXK_RIGHT ); -static EDA_HOTKEY Hk3D_MoveUp( _HKI( "Move board Up" ), 0, WXK_UP ); -static EDA_HOTKEY Hk3D_MoveDown( _HKI( "Move board Down" ), 0, WXK_DOWN ); +static EDA_HOTKEY Hk3D_MoveLeft( _HKI( "Move board Left" ), ID_POPUP_MOVE3D_LEFT, WXK_LEFT ); +static EDA_HOTKEY Hk3D_MoveRight( _HKI( "Move board Right" ), ID_POPUP_MOVE3D_RIGHT, WXK_RIGHT ); +static EDA_HOTKEY Hk3D_MoveUp( _HKI( "Move board Up" ), ID_POPUP_MOVE3D_UP, WXK_UP ); +static EDA_HOTKEY Hk3D_MoveDown( _HKI( "Move board Down" ), ID_POPUP_MOVE3D_DOWN, WXK_DOWN ); static EDA_HOTKEY Hk3D_HomeView( _HKI( "Home view" ), 0, WXK_HOME ); static EDA_HOTKEY Hk3D_ResetView( _HKI( "Reset view" ), 0, 'R' ); -static EDA_HOTKEY Hk3D_ViewFront( _HKI( "View Top" ), 0, 'y' ); -static EDA_HOTKEY Hk3D_ViewBack( _HKI( "View Bot" ), 0, 'Y' ); -static EDA_HOTKEY Hk3D_ViewLeft( _HKI( "View Left" ), 0, 'X' ); -static EDA_HOTKEY Hk3D_ViewRight( _HKI( "View Right" ), 0, 'x' ); -static EDA_HOTKEY Hk3D_ViewTop( _HKI( "View Top" ), 0, 'z' ); -static EDA_HOTKEY Hk3D_ViewBot( _HKI( "View Bot" ), 0, 'Z' ); +static EDA_HOTKEY Hk3D_ViewFront( _HKI( "View Front" ), ID_POPUP_VIEW_YPOS, 'y' ); +static EDA_HOTKEY Hk3D_ViewBack( _HKI( "View Back" ), ID_POPUP_VIEW_YNEG, 'Y' ); +static EDA_HOTKEY Hk3D_ViewLeft( _HKI( "View Left" ), ID_POPUP_VIEW_XNEG, 'X' ); +static EDA_HOTKEY Hk3D_ViewRight( _HKI( "View Right" ), ID_POPUP_VIEW_XPOS, 'x' ); +static EDA_HOTKEY Hk3D_ViewTop( _HKI( "View Top" ), ID_POPUP_VIEW_ZPOS, 'z' ); +static EDA_HOTKEY Hk3D_ViewBot( _HKI( "View Bot" ), ID_POPUP_VIEW_ZNEG, 'Z' ); static EDA_HOTKEY Hk3D_Rotate45axisZ( _HKI( "Rotate 45 degrees over Z axis" ), 0, WXK_TAB ); -static EDA_HOTKEY Hk3D_ZoomIn( _HKI( "Zoom in " ), 0, WXK_F1 ); -static EDA_HOTKEY Hk3D_ZoomOut( _HKI( "Zoom out" ), 0, WXK_F2 ); +static EDA_HOTKEY Hk3D_ZoomIn( _HKI( "Zoom in " ), ID_POPUP_ZOOMIN, WXK_F1 ); +static EDA_HOTKEY Hk3D_ZoomOut( _HKI( "Zoom out" ), ID_POPUP_ZOOMOUT, WXK_F2 ); static EDA_HOTKEY Hk3D_AttributesTHT( _HKI( "Toggle 3D models with type Through Hole" ), 0, 'T' ); static EDA_HOTKEY Hk3D_AttributesSMD( _HKI( "Toggle 3D models with type Surface Mount" ), 0, 'S' ); static EDA_HOTKEY Hk3D_AttributesVirtual( _HKI( "Toggle 3D models with type Virtual" ), 0, 'V' ); diff --git a/bitmaps_png/cpp_26/up.cpp b/bitmaps_png/cpp_26/up.cpp index 7e7433d3ee..4c12875e19 100644 --- a/bitmaps_png/cpp_26/up.cpp +++ b/bitmaps_png/cpp_26/up.cpp @@ -8,39 +8,39 @@ 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, 0xfd, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0x34, - 0x01, 0xda, 0xa1, 0x6c, 0x9c, 0xfa, 0x19, 0x9b, 0x79, 0x8c, 0x72, 0x77, 0xa0, 0x60, 0xe3, 0xdc, - 0x9d, 0x7c, 0x26, 0x05, 0x70, 0xcc, 0x69, 0x9c, 0xd5, 0x4e, 0x99, 0x45, 0x4a, 0xa1, 0xfc, 0x22, - 0x0e, 0x0d, 0x1f, 0x2c, 0x0a, 0x8e, 0xfe, 0xb7, 0x2e, 0x3d, 0x83, 0x15, 0x1b, 0xa4, 0x6e, 0xfd, - 0x2f, 0x68, 0x55, 0x79, 0x99, 0x52, 0x1f, 0xf1, 0xc8, 0x78, 0xf4, 0xbc, 0x71, 0xaa, 0xbb, 0xf9, - 0xdf, 0xab, 0xf3, 0xe5, 0xff, 0xc0, 0x29, 0xdf, 0xff, 0x87, 0xcc, 0xf8, 0x07, 0xc6, 0x01, 0x93, - 0xbf, 0xfe, 0xf7, 0x68, 0x7f, 0xfa, 0xdf, 0xa2, 0xe0, 0xc8, 0x7f, 0x11, 0xbb, 0x86, 0x13, 0x14, - 0x5b, 0xa4, 0xe8, 0x3f, 0xf5, 0x45, 0xd0, 0x94, 0x9f, 0xff, 0xbd, 0xbb, 0x5f, 0xff, 0x77, 0x69, - 0xba, 0xff, 0x1f, 0x64, 0xa9, 0x73, 0xfd, 0xad, 0xff, 0x6e, 0x2d, 0x0f, 0xff, 0xfb, 0xf4, 0xbe, - 0x03, 0x5b, 0x26, 0xe6, 0xd8, 0x7c, 0x98, 0x2a, 0x16, 0x85, 0x4c, 0xff, 0xfb, 0x3f, 0x74, 0xe6, - 0x7f, 0xac, 0xd8, 0xb3, 0xf3, 0xf9, 0xa8, 0x45, 0x74, 0xb4, 0x88, 0x45, 0x3b, 0xda, 0x9a, 0xdf, - 0xac, 0xb0, 0x0a, 0x86, 0x79, 0x4c, 0xf2, 0x1a, 0x94, 0x02, 0x67, 0xbc, 0x26, 0x64, 0x91, 0x90, - 0x75, 0xe5, 0x75, 0x64, 0x7d, 0xdc, 0x06, 0x59, 0x25, 0x0c, 0x0a, 0x01, 0x02, 0xb8, 0x6d, 0x52, - 0x09, 0x15, 0x15, 0xb0, 0x28, 0x7b, 0x60, 0x92, 0xb5, 0xef, 0xbf, 0x6d, 0xc5, 0x79, 0x30, 0xb6, - 0xaf, 0xba, 0x0c, 0x4c, 0xce, 0xb8, 0x2d, 0xf2, 0xed, 0x7b, 0xff, 0xdf, 0xae, 0xf2, 0x22, 0x58, - 0x2d, 0x28, 0x5f, 0x69, 0xc7, 0xae, 0xf9, 0xcd, 0x67, 0x5a, 0xb4, 0x84, 0xa0, 0xaf, 0xd8, 0xf5, - 0x53, 0xd5, 0xa4, 0xdc, 0xba, 0x1f, 0x79, 0x75, 0xbe, 0xc0, 0x69, 0x38, 0x36, 0x0c, 0xca, 0x5b, - 0x36, 0x65, 0xe7, 0xff, 0x09, 0x58, 0x94, 0xee, 0x63, 0x60, 0x08, 0x65, 0x26, 0x2a, 0x08, 0x39, - 0xf4, 0x32, 0x6d, 0x15, 0x03, 0x66, 0xbe, 0x00, 0xb9, 0x96, 0x58, 0x8b, 0x40, 0xf9, 0x4b, 0xd8, - 0xa6, 0xf2, 0x2c, 0x83, 0x78, 0x2c, 0x37, 0x49, 0xf1, 0xc5, 0x6b, 0x92, 0x9b, 0xa4, 0x1e, 0xb9, - 0xe4, 0x7d, 0xc0, 0xe4, 0x6f, 0x04, 0x2d, 0x71, 0x6b, 0x79, 0xf4, 0x5f, 0xdc, 0xa9, 0xf1, 0x0e, - 0x83, 0x62, 0xa4, 0x38, 0x59, 0x89, 0x8e, 0xdf, 0xac, 0xb8, 0x53, 0x3f, 0x75, 0xf3, 0xb7, 0xa0, - 0xa9, 0xbf, 0x70, 0x5a, 0xe2, 0xdd, 0xf5, 0xea, 0xbf, 0xb4, 0x57, 0xcf, 0x13, 0x36, 0xed, 0x44, - 0x2d, 0x8a, 0x52, 0x38, 0xbf, 0x45, 0xc9, 0x52, 0xf3, 0xfc, 0x83, 0xbf, 0xb1, 0xa5, 0x3c, 0xff, - 0x09, 0x9f, 0xfe, 0xab, 0x04, 0xcf, 0x7e, 0xcb, 0x6b, 0x9a, 0xeb, 0x4b, 0x85, 0xba, 0xa2, 0x81, - 0x49, 0xc0, 0xb2, 0x6c, 0x8f, 0x4d, 0xe9, 0xd9, 0x7f, 0xa1, 0xc0, 0x08, 0x87, 0x59, 0x12, 0x38, - 0xe5, 0xc7, 0x7f, 0xed, 0xf8, 0xd5, 0x9f, 0xf8, 0x4c, 0x0b, 0xf3, 0xa9, 0x57, 0x2f, 0xc9, 0x84, - 0x72, 0x8a, 0xd8, 0x54, 0x9f, 0x77, 0xac, 0xbd, 0x0e, 0xb6, 0x24, 0x78, 0xfa, 0x9f, 0xff, 0x46, - 0x19, 0x3b, 0x7f, 0x08, 0x98, 0x15, 0xf7, 0x51, 0xbf, 0x12, 0x54, 0x8b, 0x14, 0x11, 0x73, 0x68, - 0xbc, 0xe5, 0xd6, 0xfa, 0xf0, 0xbf, 0x65, 0xe1, 0xf1, 0x3f, 0xc0, 0x20, 0x5d, 0x47, 0xb3, 0x0a, - 0x97, 0x4d, 0x2b, 0x5e, 0x5b, 0xd2, 0xa5, 0xed, 0x89, 0xa0, 0x45, 0xc5, 0x71, 0x06, 0x07, 0x07, - 0x16, 0x9a, 0xd6, 0xee, 0x2c, 0x1a, 0x71, 0x96, 0x0c, 0x2a, 0xd1, 0x7c, 0xa3, 0xed, 0x1c, 0xba, - 0x01, 0x00, 0xda, 0xa6, 0xf5, 0xf3, 0xaf, 0xdd, 0x75, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, + 0xce, 0x00, 0x00, 0x01, 0xfd, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0xf4, + 0x02, 0x2c, 0x1a, 0x71, 0x96, 0x0c, 0x2a, 0xd1, 0x7c, 0x34, 0xb5, 0x84, 0x4d, 0x2b, 0x5e, 0x5b, + 0xd2, 0xa5, 0xed, 0x89, 0xa0, 0x45, 0xc5, 0x71, 0x06, 0x07, 0x07, 0x16, 0xda, 0xd8, 0xa2, 0x16, + 0x29, 0x22, 0xe6, 0xd0, 0x78, 0xcb, 0xad, 0xf5, 0xe1, 0x7f, 0xcb, 0xc2, 0xe3, 0x7f, 0xf8, 0x2d, + 0x4a, 0xd6, 0x51, 0xdf, 0x12, 0x99, 0x50, 0x4e, 0x11, 0x9b, 0xea, 0xf3, 0x8e, 0xb5, 0xd7, 0xff, + 0x87, 0xce, 0xfc, 0xff, 0x3f, 0x78, 0xfa, 0x9f, 0xff, 0x46, 0x19, 0x3b, 0x7f, 0x08, 0x98, 0x15, + 0xf7, 0x51, 0xd1, 0x96, 0x06, 0x26, 0x01, 0xcb, 0xb2, 0x3d, 0x36, 0xa5, 0x67, 0xff, 0x85, 0xce, + 0xf8, 0x07, 0xb6, 0x08, 0x84, 0x03, 0xa7, 0xfc, 0xf8, 0xaf, 0x1d, 0xbf, 0xfa, 0x13, 0x9f, 0x69, + 0x61, 0x3e, 0x55, 0xac, 0x01, 0x06, 0xd1, 0x52, 0xf3, 0xfc, 0x83, 0xbf, 0x43, 0xa6, 0xff, 0x85, + 0x5b, 0x02, 0xc3, 0xfe, 0x13, 0x3e, 0xfd, 0x57, 0x09, 0x9e, 0xfd, 0x96, 0xd7, 0x34, 0xd7, 0x97, + 0x32, 0x4b, 0xcc, 0x8a, 0x3b, 0xf5, 0x53, 0x37, 0x7f, 0x0b, 0x9a, 0xfa, 0x0b, 0xc3, 0x12, 0x18, + 0xf6, 0xee, 0x7a, 0xf5, 0x5f, 0xda, 0xab, 0xe7, 0x09, 0x9b, 0x76, 0xa2, 0x16, 0x59, 0x96, 0xf0, + 0x9a, 0xe4, 0x26, 0xa9, 0x47, 0x2e, 0x79, 0x1f, 0x30, 0xf9, 0x1b, 0x4e, 0x4b, 0x60, 0xd8, 0xad, + 0xe5, 0xd1, 0x7f, 0x71, 0xa7, 0xc6, 0x3b, 0x0c, 0x8a, 0x91, 0xe2, 0x24, 0x59, 0xc2, 0xa1, 0x97, + 0x69, 0xab, 0x18, 0x30, 0xf3, 0x85, 0x6f, 0xdf, 0x7b, 0x82, 0x96, 0xc0, 0xb0, 0x53, 0xdd, 0xcd, + 0xff, 0xc2, 0x36, 0x95, 0x67, 0x19, 0xc4, 0x63, 0xb9, 0x89, 0xb2, 0x84, 0x5d, 0x3f, 0x55, 0x4d, + 0xca, 0xad, 0xfb, 0x91, 0x57, 0xe7, 0x0b, 0xa2, 0x2d, 0x01, 0xe1, 0x10, 0x60, 0x42, 0xb1, 0x29, + 0x3b, 0xff, 0x4f, 0xc0, 0xa2, 0x74, 0x1f, 0x03, 0x43, 0x28, 0x33, 0x7e, 0x5b, 0x54, 0x42, 0x45, + 0x05, 0x2c, 0xca, 0x1e, 0x98, 0x64, 0xed, 0xfb, 0x6f, 0x5b, 0x71, 0x1e, 0x8c, 0xed, 0xab, 0x2e, + 0x03, 0x0d, 0xf9, 0x8b, 0xd3, 0x02, 0x90, 0xaf, 0xed, 0x2a, 0x2f, 0x82, 0xd5, 0x5a, 0x97, 0x9e, + 0xf9, 0xaf, 0x1d, 0xbb, 0xe6, 0x37, 0x9f, 0x69, 0xd1, 0x12, 0xfc, 0xc5, 0x8b, 0x76, 0xb4, 0x35, + 0xbf, 0x59, 0x61, 0x15, 0x0c, 0xf3, 0x98, 0xe4, 0x35, 0x28, 0x05, 0xce, 0x78, 0x8d, 0x2d, 0xc5, + 0xc1, 0xb0, 0x67, 0xe7, 0xf3, 0xff, 0x42, 0xd6, 0x95, 0xd7, 0x91, 0xf5, 0x71, 0x1b, 0x64, 0x95, + 0x30, 0x28, 0x04, 0x08, 0x10, 0x1f, 0x59, 0xda, 0xa1, 0x3c, 0x8a, 0xfe, 0x53, 0x5f, 0x10, 0xb2, + 0x48, 0xcc, 0xb1, 0xf9, 0x30, 0x65, 0x99, 0x68, 0xd4, 0x22, 0x4a, 0x2d, 0x0a, 0x02, 0x96, 0x6b, + 0xde, 0xdd, 0xaf, 0xfe, 0xbb, 0x34, 0xdd, 0x07, 0xe7, 0x17, 0x10, 0x76, 0x6d, 0x79, 0xf0, 0xdf, + 0xa7, 0xf7, 0xdd, 0x7f, 0x8f, 0x8e, 0xa7, 0xd4, 0xb1, 0x48, 0xc6, 0xa3, 0xe7, 0x0d, 0xc8, 0x60, + 0x50, 0x51, 0x13, 0x38, 0xe5, 0x3b, 0x38, 0xbf, 0x80, 0x30, 0xa8, 0xc4, 0xf0, 0x68, 0x7f, 0xf6, + 0xdf, 0xbc, 0xe0, 0xf0, 0x7f, 0x11, 0xbb, 0x86, 0x13, 0x94, 0x59, 0xa4, 0x14, 0xca, 0x2f, 0xe2, + 0xd0, 0xf0, 0xc1, 0xa2, 0xe0, 0x28, 0x38, 0x8f, 0x60, 0xc3, 0x06, 0xa9, 0x5b, 0xff, 0x0b, 0x5a, + 0x55, 0x5e, 0xa6, 0xd4, 0x47, 0x6c, 0x9c, 0xfa, 0x19, 0x9b, 0x79, 0x8c, 0x72, 0x77, 0xa0, 0x60, + 0xe3, 0xdc, 0x9d, 0x7c, 0x26, 0x05, 0x70, 0xcc, 0x69, 0x9c, 0xd5, 0x3e, 0xda, 0xc8, 0xa1, 0x19, + 0x00, 0x00, 0x7f, 0x14, 0xf5, 0xf0, 0x7c, 0xb6, 0xf2, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; diff --git a/bitmaps_png/sources/up.svg b/bitmaps_png/sources/up.svg index 641ed4246c..38102c750e 100644 --- a/bitmaps_png/sources/up.svg +++ b/bitmaps_png/sources/up.svg @@ -11,7 +11,7 @@ width="26" version="1.0" id="svg2" - inkscape:version="0.91 r" + inkscape:version="0.92.0 r15299" sodipodi:docname="up.svg"> @@ -21,6 +21,7 @@ image/svg+xml + @@ -34,25 +35,25 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1053" + inkscape:window-height="1033" id="namedview26" showgrid="false" - inkscape:zoom="5.7403845" - inkscape:cx="7.1978314" - inkscape:cy="24.441167" - inkscape:window-x="0" - inkscape:window-y="0" + inkscape:zoom="14.913306" + inkscape:cx="16.24453" + inkscape:cy="8.0817039" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="svg2" /> + transform="matrix(1,0,0,-1,-39.035684,29.139269)">