Rename libedit_icon to icon_libedit, bo be consistent with other icon…

… names.
rwoloszyn · Sep 20, 2016 · 3f10444 · 3f10444
1 parent 4bb16af
commit 3f10444
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
@@ -571,11 +571,11 @@ set( BMAPS_BIG
     icon_eeschema
     icon_gerbview
     icon_kicad
+    icon_libedit
     icon_modedit
     icon_pcbnew
     icon_bitmap2component
     icon_pcbcalculator
-    libedit_icon
     viewlibs_icon
     icon_pagelayout_editor
     wizard_add_fplib_icon

diff --git a/bitmaps_png/cpp_48/libedit_icon.cpp → bitmaps_png/cpp_48/icon_libedit.cpp b/bitmaps_png/cpp_48/libedit_icon.cpp → bitmaps_png/cpp_48/icon_libedit.cpp
@@ -276,6 +276,6 @@ static const unsigned char png[] = {
  0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
-const BITMAP_OPAQUE libedit_icon_xpm[1] = {{ png, sizeof( png ), "libedit_icon_xpm" }};
+const BITMAP_OPAQUE icon_libedit_xpm[1] = {{ png, sizeof( png ), "icon_libedit_xpm" }};
 
 //EOF
diff --git a/bitmaps_png/sources/libedit_icon.svg → bitmaps_png/sources/icon_libedit.svg b/bitmaps_png/sources/libedit_icon.svg → bitmaps_png/sources/icon_libedit.svg
diff --git a/eeschema/libeditframe.cpp b/eeschema/libeditframe.cpp
@@ -200,7 +200,7 @@ LIB_EDIT_FRAME::LIB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_LastGridSizeId = ID_POPUP_GRID_LEVEL_50 - ID_POPUP_GRID_LEVEL_1000;
 
     wxIcon icon;
-    icon.CopyFromBitmap( KiBitmap( libedit_icon_xpm ) );
+    icon.CopyFromBitmap( KiBitmap( icon_libedit_xpm ) );
     SetIcon( icon );
 
     LoadSettings( config() );

diff --git a/include/bitmaps.h b/include/bitmaps.h
@@ -258,6 +258,7 @@ EXTERN_BITMAP( icon_pcbnew_xpm )
 EXTERN_BITMAP( icon_txt_xpm )
 EXTERN_BITMAP( icon_3d_xpm )
 EXTERN_BITMAP( icon_bitmap2component_xpm )
+EXTERN_BITMAP( icon_libedit_xpm )
 EXTERN_BITMAP( icon_pcbcalculator_xpm )
 EXTERN_BITMAP( icon_pagelayout_editor_xpm )
 EXTERN_BITMAP( image_xpm )
@@ -301,7 +302,6 @@ EXTERN_BITMAP( language_xpm )
 EXTERN_BITMAP( layers_manager_xpm )
 EXTERN_BITMAP( leave_sheet_xpm )
 EXTERN_BITMAP( left_xpm )
-EXTERN_BITMAP( libedit_icon_xpm )
 EXTERN_BITMAP( libedit_xpm )
 EXTERN_BITMAP( libedprt_xpm )
 EXTERN_BITMAP( lib_next_xpm )

diff --git a/kicad/commandframe.cpp b/kicad/commandframe.cpp
@@ -64,7 +64,7 @@ void LAUNCHER_PANEL::CreateCommandToolbar()
     btn = AddBitmapButton( ID_TO_SCH, KiBitmap( icon_eeschema_xpm ) );
     btn->SetToolTip( _( "Eeschema - Electronic schematic editor" ) );
 
-    btn = AddBitmapButton( ID_TO_SCH_LIB_EDITOR, KiBitmap( libedit_icon_xpm ) );
+    btn = AddBitmapButton( ID_TO_SCH_LIB_EDITOR, KiBitmap( icon_libedit_xpm ) );
     btn->SetToolTip( _( "Schematic library editor" ) );
 
     btn = AddBitmapButton( ID_TO_PCB, KiBitmap( icon_pcbnew_xpm ) );