Skip to content

K
kicad-source-mirror
Commit 2e173c97 authored by raburton's avatar raburton
Browse files
Options

bitmap work

parent 64966800
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 91 deletions
bitmaps/Reload.xpm → bitmaps/reload2.xpm
View file @ 2e173c97
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char * reload_xpm[]; extern const char * reload2_xpm[];
#else #else
const char * reload_xpm[] = { const char * reload2_xpm[] = {
"16 16 110 2", "16 16 110 2",
" c None", " c None",
". c #000000", ". c #000000",
......
include/bitmaps.h
View file @ 2e173c97
// Largeur du toolbar vertical
#define VTOOLBAR_WIDTH 26
// dimension d'un tool vertical
#define TOOL_SIZE 23
/****************************/ /****************************/
/* Used bitmaps in Kicad */ /* Used bitmaps in Kicad */
/****************************/ /****************************/
...@@ -5,7 +11,7 @@ ...@@ -5,7 +11,7 @@
#include "../bitmaps/Cancel.xpm" #include "../bitmaps/Cancel.xpm"
#include "../bitmaps/cancel_tool.xpm" #include "../bitmaps/cancel_tool.xpm"
#include "../bitmaps/Apply.xpm" #include "../bitmaps/Apply.xpm"
#include "../bitmaps/Reload.xpm" #include "../bitmaps/reload2.xpm"
#include "../bitmaps/icon_txt.xpm" #include "../bitmaps/icon_txt.xpm"
#include "../bitmaps/new_txt.xpm" #include "../bitmaps/new_txt.xpm"
...@@ -219,12 +225,85 @@ ...@@ -219,12 +225,85 @@
#include "../bitmaps/unknown.xpm" #include "../bitmaps/unknown.xpm"
#include "../bitmaps/new_pcb.xpm" #include "../bitmaps/new_pcb.xpm"
#include "../bitmaps/reload.xpm"
#include "../bitmaps/treesel.xpm" #include "../bitmaps/treesel.xpm"
#include "../bitmaps/ercerr.xpm" #include "../bitmaps/ercerr.xpm"
#include "../bitmaps/ercwarn.xpm" #include "../bitmaps/ercwarn.xpm"
// Largeur du toolbar vertical #include "../bitmaps/add_cotation.xpm"
#define VTOOLBAR_WIDTH 26 #include "../bitmaps/Add_Mires.xpm"
// dimension d'un tool vertical #include "../bitmaps/Break_Line.xpm"
#define TOOL_SIZE 23 #include "../bitmaps/Delete_Module.xpm"
#include "../bitmaps/Delete_Net.xpm"
#include "../bitmaps/Delete_Node.xpm"
#include "../bitmaps/Delete_Pad.xpm"
#include "../bitmaps/Delete_Track.xpm"
#include "../bitmaps/Drag_Module.xpm"
#include "../bitmaps/Drag_Outline_Segment.xpm"
#include "../bitmaps/Drag_Pad.xpm"
#include "../bitmaps/Drag_Segment_WithSlope.xpm"
#include "../bitmaps/Drag_Track_Segment.xpm"
#include "../bitmaps/Edges_Sketch.xpm"
#include "../bitmaps/Edit_Module.xpm"
#include "../bitmaps/Export_Module.xpm"
#include "../bitmaps/Export_Options_Pad.xpm"
#include "../bitmaps/Flag.xpm"
#include "../bitmaps/Global_Options_Pad.xpm"
#include "../bitmaps/Import_Module.xpm"
#include "../bitmaps/Insert_Module_Board.xpm"
#include "../bitmaps/Invert_Module.xpm"
#include "../bitmaps/Load_Module_Board.xpm"
#include "../bitmaps/Load_Module_Lib.xpm"
#include "../bitmaps/local_ratsnet.xpm"
#include "../bitmaps/Locked.xpm"
#include "../bitmaps/Mode_Module.xpm"
#include "../bitmaps/Mode_Track.xpm"
#include "../bitmaps/Module_Check.xpm"
#include "../bitmaps/Modul_Edit.xpm"
#include "../bitmaps/module_options.xpm"
#include "../bitmaps/Module_Ratsnet.xpm"
#include "../bitmaps/Move_Module.xpm"
#include "../bitmaps/Move_Pad.xpm"
#include "../bitmaps/Move_Pin.xpm"
#include "../bitmaps/Move_Track_Segment.xpm"
#include "../bitmaps/Move_Track.xpm"
#include "../bitmaps/mw_Add_Gap.xpm"
#include "../bitmaps/mw_Add_Line.xpm"
#include "../bitmaps/mw_Add_Shape.xpm"
#include "../bitmaps/mw_Add_stub_arc.xpm"
#include "../bitmaps/mw_Add_Stub.xpm"
#include "../bitmaps/mw_toolbar.xpm"
#include "../bitmaps/Net_HighLight.xpm"
#include "../bitmaps/net_hightlight.xpm"
#include "../bitmaps/Net_Locked.xpm"
#include "../bitmaps/Net_UnLocked.xpm"
#include "../bitmaps/New_FootPrint.xpm"
#include "../bitmaps/New_Module.xpm"
#include "../bitmaps/Options_All_Tracks&Vias.xpm"
#include "../bitmaps/Options_All_Tracks.xpm"
#include "../bitmaps/Options_All_Vias.xpm"
#include "../bitmaps/Options_Module.xpm"
#include "../bitmaps/Options_Tracks.xpm"
#include "../bitmaps/Options_Track.xpm"
#include "../bitmaps/Options_Vias.xpm"
#include "../bitmaps/PcbOffset.xpm"
#include "../bitmaps/Post_Compo.xpm"
#include "../bitmaps/Post_Drill.xpm"
#include "../bitmaps/Post_Module.xpm"
#include "../bitmaps/Rotate_Module-.xpm"
#include "../bitmaps/Rotate_Module+.xpm"
#include "../bitmaps/Select_Layer_Pair.xpm"
#include "../bitmaps/Select_W_Layer.xpm"
#include "../bitmaps/Show_Zone.xpm"
#include "../bitmaps/Swap_Layer.xpm"
#include "../bitmaps/tool_ratsnet.xpm"
#include "../bitmaps/Track_Locked.xpm"
#include "../bitmaps/Track_Sketch.xpm"
#include "../bitmaps/Track_UnLocked.xpm"
#include "../bitmaps/Unlocked.xpm"
#include "../bitmaps/Update_Module_Board.xpm"
#include "../bitmaps/Width_Net.xpm"
#include "../bitmaps/Width_Track_Via.xpm"
#include "../bitmaps/Width_Track.xpm"
#include "../bitmaps/Width_Vias.xpm"
pcbnew/class_board_item.cpp
View file @ 2e173c97
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
#include "collectors.h" #include "collectors.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "add_cotation.xpm"
#include "Add_Mires.xpm"
/********************************************************/ /********************************************************/
wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
......
pcbnew/menubarpcb.cpp
View file @ 2e173c97
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
#include "hotkeys.h" #include "hotkeys.h"
#include "id.h" #include "id.h"
#include "Swap_Layer.xpm"
#include "Post_Drill.xpm"
#include "Post_Compo.xpm"
/***********************************************/ /***********************************************/
void WinEDA_PcbFrame::ReCreateMenuBar() void WinEDA_PcbFrame::ReCreateMenuBar()
/***********************************************/ /***********************************************/
......
pcbnew/modedit_onclick.cpp
View file @ 2e173c97
...@@ -15,16 +15,6 @@ ...@@ -15,16 +15,6 @@
#include "protos.h" #include "protos.h"
#include "id.h" #include "id.h"
#include "Edit_Module.xpm"
#include "Rotate_Module+.xpm"
#include "Move_Field.xpm"
#include "Rotate_Field.xpm"
#include "Move_Pad.xpm"
#include "Global_Options_Pad.xpm"
#include "Delete_Pad.xpm"
#include "Export_Options_Pad.xpm"
#include "Select_Layer_Pair.xpm"
/*************************************************************************/ /*************************************************************************/
void WinEDA_ModuleEditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos ) void WinEDA_ModuleEditFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
/*************************************************************************/ /*************************************************************************/
...@@ -289,10 +279,10 @@ bool WinEDA_ModuleEditFrame::OnRightClick( const wxPoint& MousePos, ...@@ -289,10 +279,10 @@ bool WinEDA_ModuleEditFrame::OnRightClick( const wxPoint& MousePos,
if( !flags ) if( !flags )
{ {
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST, ADD_MENUITEM( PopMenu, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST,
_( "Move Text Mod." ), Move_Field_xpm ); _( "Move Text Mod." ), move_field_xpm );
} }
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_ROTATE_TEXTMODULE, ADD_MENUITEM( PopMenu, ID_POPUP_PCB_ROTATE_TEXTMODULE,
_( "Rotate Text Mod." ), Rotate_Field_xpm ); _( "Rotate Text Mod." ), rotate_field_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_TEXTMODULE, ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_TEXTMODULE,
_( "Edit Text Mod." ), edit_text_xpm ); _( "Edit Text Mod." ), edit_text_xpm );
if( ( (TEXTE_MODULE*) DrawStruct )->m_Type == TEXT_is_DIVERS ) if( ( (TEXTE_MODULE*) DrawStruct )->m_Type == TEXT_is_DIVERS )
......
pcbnew/onrightclick.cpp
View file @ 2e173c97
...@@ -20,41 +20,6 @@ ...@@ -20,41 +20,6 @@
#include "bitmaps.h" #include "bitmaps.h"
/* Specific bitmaps */
#include "Break_Line.xpm"
#include "Delete_Net.xpm"
#include "Delete_Line.xpm"
#include "Delete_Track.xpm"
#include "Move_Module.xpm"
#include "Drag_Track_Segment.xpm"
#include "Drag_Segment_WithSlope.xpm"
#include "Drag_Module.xpm"
#include "Edit_Module.xpm"
#include "Rotate_Module+.xpm"
#include "Rotate_Module-.xpm"
#include "Delete_Module.xpm"
#include "Invert_Module.xpm"
#include "Locked.xpm"
#include "Unlocked.xpm"
#include "Move_Field.xpm"
#include "Rotate_Field.xpm"
#include "Move_Pad.xpm"
#include "Drag_Pad.xpm"
#include "Global_Options_Pad.xpm"
#include "Delete_Pad.xpm"
#include "Export_Options_Pad.xpm"
#include "Select_W_Layer.xpm"
#include "Width_Track.xpm"
#include "Width_Vias.xpm"
#include "Width_Net.xpm"
#include "Width_Track_Via.xpm"
#include "Select_Layer_Pair.xpm"
#include "Drag_Outline_Segment.xpm"
#include "Flag.xpm"
/********************************************/ /********************************************/
static wxMenu* Append_Track_Width_List() static wxMenu* Append_Track_Width_List()
/********************************************/ /********************************************/
...@@ -617,7 +582,7 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) ...@@ -617,7 +582,7 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
s_Board_Editor_Hokeys_Descr, HK_BACK_SPACE ); s_Board_Editor_Hokeys_Descr, HK_BACK_SPACE );
ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACKSEG, ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACKSEG,
msg, Delete_Line_xpm ); msg, delete_line_xpm );
if( !flags ) if( !flags )
{ {
msg = AddHotkeyName( _( "Delete Track" ), s_Board_Editor_Hokeys_Descr, HK_DELETE ); msg = AddHotkeyName( _( "Delete Track" ), s_Board_Editor_Hokeys_Descr, HK_DELETE );
...@@ -783,10 +748,10 @@ void WinEDA_PcbFrame::createPopUpMenuForFpTexts( TEXTE_MODULE* FpText, wxMenu* m ...@@ -783,10 +748,10 @@ void WinEDA_PcbFrame::createPopUpMenuForFpTexts( TEXTE_MODULE* FpText, wxMenu* m
if( !flags ) if( !flags )
ADD_MENUITEM( sub_menu_Fp_text, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST, ADD_MENUITEM( sub_menu_Fp_text, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST,
_( "Move" ), Move_Field_xpm ); _( "Move" ), move_field_xpm );
ADD_MENUITEM( sub_menu_Fp_text, ID_POPUP_PCB_ROTATE_TEXTMODULE, ADD_MENUITEM( sub_menu_Fp_text, ID_POPUP_PCB_ROTATE_TEXTMODULE,
_( "Rotate" ), Rotate_Field_xpm ); _( "Rotate" ), rotate_field_xpm );
ADD_MENUITEM( sub_menu_Fp_text, ID_POPUP_PCB_EDIT_TEXTMODULE, ADD_MENUITEM( sub_menu_Fp_text, ID_POPUP_PCB_EDIT_TEXTMODULE,
_( "Edit" ), edit_text_xpm ); _( "Edit" ), edit_text_xpm );
......
pcbnew/tool_modedit.cpp
View file @ 2e173c97
...@@ -18,15 +18,6 @@ ...@@ -18,15 +18,6 @@
#include "hotkeys.h" #include "hotkeys.h"
#include "Module_Check.xpm"
#include "Import_Module.xpm"
#include "Export_Module.xpm"
#include "New_FootPrint.xpm"
#include "module_options.xpm"
#include "Load_Module_Board.xpm"
#include "Insert_Module_Board.xpm"
#include "Update_Module_Board.xpm"
#ifdef __UNIX__ #ifdef __UNIX__
#define LISTBOX_WIDTH 140 #define LISTBOX_WIDTH 140
#else #else
......
pcbnew/tool_pcb.cpp
View file @ 2e173c97
...@@ -29,22 +29,6 @@ ...@@ -29,22 +29,6 @@
#define MUWAVE_ENBL #define MUWAVE_ENBL
#include "mw_Add_Stub.xpm"
#include "mw_Add_stub_arc.xpm"
#include "mw_Add_Shape.xpm"
#include "mw_Add_Line.xpm"
#include "mw_Add_Gap.xpm"
#include "mw_toolbar.xpm"
#include "Show_Zone.xpm"
#include "net_hightlight.xpm"
#include "PcbOffset.xpm"
#include "Add_Mires.xpm"
#include "Mode_Module.xpm"
#include "Mode_Track.xpm"
#include "tool_ratsnet.xpm"
#include "local_ratsnet.xpm"
#include "add_cotation.xpm"
#define SEL_LAYER_HELP _( \ #define SEL_LAYER_HELP _( \
"Show active layer selections\nand select layer pair for route and place via" ) "Show active layer selections\nand select layer pair for route and place via" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment