Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
02d4b59c
Commit
02d4b59c
authored
Mar 29, 2011
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bitmaps cosmetic enhancements
parent
3f5478ee
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
5060 additions
and
71 deletions
+5060
-71
CMakeLists.txt
bitmaps/CMakeLists.txt
+4
-1
create_cmp_file.xpm
bitmaps/create_cmp_file.xpm
+1
-6
export_footprint_names.xpm
bitmaps/export_footprint_names.xpm
+38
-0
import_footprint_names.xpm
bitmaps/import_footprint_names.xpm
+38
-0
show_footprint.xpm
bitmaps/show_footprint.xpm
+38
-0
export_footprint_names.svg
bitmaps/sources/export_footprint_names.svg
+1172
-0
import_footprint_names.svg
bitmaps/sources/import_footprint_names.svg
+1172
-0
show_footprint.svg
bitmaps/sources/show_footprint.svg
+2535
-0
build_version.cpp
common/build_version.cpp
+1
-1
menubar.cpp
cvpcb/menubar.cpp
+23
-28
tool_cvpcb.cpp
cvpcb/tool_cvpcb.cpp
+29
-29
tool_sch.cpp
eeschema/tool_sch.cpp
+1
-1
bitmaps.h
include/bitmaps.h
+4
-1
install.nsi
packaging/windows/nsis/install.nsi
+1
-1
menubar_pcbframe.cpp
pcbnew/menubar_pcbframe.cpp
+1
-1
version.txt
version.txt
+2
-2
No files found.
bitmaps/CMakeLists.txt
View file @
02d4b59c
...
...
@@ -59,6 +59,7 @@ set(BITMAP_SRCS
Browse_Files.xpm
cancel_tool.xpm
Cancel.xpm
create_cmp_file.xpm
checked_ok.xpm
component_select_unit.xpm
component_select_alternate_shape.xpm
...
...
@@ -125,6 +126,7 @@ set(BITMAP_SRCS
ercwarn.xpm
erc.xpm
Exit.xpm
export_footprint_names.xpm
Export_Module.xpm
Export_Options_Pad.xpm
export.xpm
...
...
@@ -171,6 +173,7 @@ set(BITMAP_SRCS
icon_txt.xpm
import3d.xpm
import_cmp_from_lib.xpm
import_footprint_names.xpm
import_hierarchical_label.xpm
Import_Module.xpm
import.xpm
...
...
@@ -368,7 +371,6 @@ set(BITMAP_SRCS
rotate-z.xpm
rotate+z.xpm
save_as.xpm
Save_CmpStuff.xpm
Save_Library.xpm
Save_NetList.xpm
Save_Project.xpm
...
...
@@ -381,6 +383,7 @@ set(BITMAP_SRCS
shape_3d.xpm
sheetset.xpm
showdcode.xpm
show_footprint.xpm
showmodedge.xpm
showtrack.xpm
Show_Zone.xpm
...
...
bitmaps/
Save_CmpStuff
.xpm
→
bitmaps/
create_cmp_file
.xpm
View file @
02d4b59c
/* XPM */
#ifndef XPMMAIN
extern const char *save_cmpstuff_xpm[];
#else
const char * save_cmpstuff_xpm[] = {
const char * create_cmp_file_xpm[] = {
"16 16 99 2",
" c None",
". c #160A00",
...
...
@@ -120,4 +116,3 @@ const char * save_cmpstuff_xpm[] = {
" @ P Q @ R v S T U V W V X X ",
" @ # @ R Y Y Z ` . . ...+.",
" . @ R Y @.#.G E $.N r %."};
#endif
bitmaps/export_footprint_names.xpm
0 → 100644
View file @
02d4b59c
/* XPM */
const char *export_footprint_names_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"+ c #4C4C54",
"& c #898AEB",
"$ c #3A397D",
"= c #0C0A06",
"o c #342A11",
"O c #695007",
"X c #6E6F71",
"# c #2D2C50",
"- c #505179",
" c None",
"@ c #BE9004",
"* c #9C9AFC",
": c #5757A1",
"; c #4040B6",
"% c #696AA9",
". c #898A8C",
/* pixels */
" . ",
" Xo ",
" XOo ",
" .X+o@O# ",
" .oO@@@@@O+",
" X$o@@@@@@@o.",
" X%&&o@@@O+#@o#X",
"+&*&#O@@=%&-=#;#",
"$;%$=@@o$&%##;-#",
"$;;:====$;;$$..+",
"#;;;;;-$;$-.-+X+",
".+$;;;:-.X#-+#XX",
" .#;;$#-X#++.XX",
" .###++ X+ + ",
" . X+ +. ",
" ++ "
};
bitmaps/import_footprint_names.xpm
0 → 100644
View file @
02d4b59c
/* XPM */
const char *import_footprint_names_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"X c #525279",
"@ c #83848C",
"* c #242349",
"O c #4E4FB9",
" c None",
"- c #5F4A08",
": c #2B281E",
"o c #535456",
"& c #3F3E4C",
". c #6F6F6F",
"; c #C29204",
"= c #130F06",
"$ c #ACAAFC",
"+ c #8484F2",
"% c #3C3AA6",
"# c #383779",
/* pixels */
" .XXo ",
" .XO++++OX. ",
" @O+++++++++++#@",
"#++++$+++++++O%&",
"#O@##O++*==*%%#*",
"#OOOX+X-;;-*#@@&",
"#OOOO#-;;;-&X&.o",
".X%O%-;;;:=:o:..",
" @@#*;;;=::oo ..",
" :;;-&o .o o@",
" -;;o.o o. ",
"@oo&-;;:::@ ",
" o-;;;;;=o ",
" .:;;;=. ",
" @:-=@ ",
" & "
};
bitmaps/show_footprint.xpm
0 → 100644
View file @
02d4b59c
/* XPM */
char *show_footprint_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"* c #4E4F5E",
"O c #797C84",
"; c #4343B7",
"= c #7F7FF8",
". c #AAABB0",
"+ c #7197E4",
" c None",
"& c #62616F",
"o c #6E92B7",
"X c #95969C",
": c #363557",
"@ c #90C7EA",
"$ c #6B79B8",
"# c #7FACE8",
"% c #B4D8E6",
"- c #424286",
/* pixels */
" .X.. ",
" .XoooOX ",
" X+@@@#$X ",
"Xo#@@@@#X ",
"X#@%%%@o$&*. ",
"X#@ oo++$$=$-O ",
"Xoo####+o=====-O",
"*.###@#+X===$;;:",
"-O.o$+#.%o$-;;-:",
"-;-X..X$&%o--OX*",
":;;;;;$;-& .&:O*",
"O*;;;;-*X&O .:&O",
" .X:;;-:*&:O. &O",
" O:::*& &X. .",
" O.&& *O.. ",
" ** .X "
};
bitmaps/sources/export_footprint_names.svg
0 → 100644
View file @
02d4b59c
This diff is collapsed.
Click to expand it.
bitmaps/sources/import_footprint_names.svg
0 → 100644
View file @
02d4b59c
This diff is collapsed.
Click to expand it.
bitmaps/sources/show_footprint.svg
0 → 100644
View file @
02d4b59c
This diff is collapsed.
Click to expand it.
common/build_version.cpp
View file @
02d4b59c
...
...
@@ -6,7 +6,7 @@
#endif
#ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION "(2011-03-2
8
)"
#define KICAD_BUILD_VERSION "(2011-03-2
9
)"
#endif
// uncomment this line only when creating a stable version
...
...
cvpcb/menubar.cpp
View file @
02d4b59c
...
...
@@ -32,11 +32,9 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
// Recreate all menus:
wxMenu
*
filesMenu
=
new
wxMenu
;
item
=
new
wxMenuItem
(
filesMenu
,
ID_LOAD_PROJECT
,
_
(
"&Open"
),
_
(
"Open a net list file"
)
);
item
->
SetBitmap
(
open_document_xpm
);
filesMenu
->
Append
(
item
);
ADD_MENUITEM_WITH_HELP
(
filesMenu
,
ID_LOAD_PROJECT
,
_
(
"&Open"
),
_
(
"Open a net list file"
),
open_document_xpm
);
/* Open Recent submenu */
wxMenu
*
openRecentMenu
=
new
wxMenu
();
...
...
@@ -48,27 +46,26 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
filesMenu
->
AppendSeparator
();
item
=
new
wxMenuItem
(
filesMenu
,
ID_SAVE_PROJECT
,
ADD_MENUITEM_WITH_HELP
(
filesMenu
,
ID_SAVE_PROJECT
,
_
(
"&Save As..."
),
_
(
"Save new net list and footprint list files"
)
);
item
->
SetBitmap
(
save_xpm
);
filesMenu
->
Append
(
item
);
_
(
"Save new net list and footprint list files"
),
save_xpm
);
/* Quit on all platforms except WXMAC */
#if !defined(__WXMAC__)
filesMenu
->
AppendSeparator
();
item
=
new
wxMenuItem
(
filesMenu
,
wxID_EXIT
,
_
(
"&Quit"
),
_
(
"Quit CvPCB"
)
);
filesMenu
->
Append
(
item
);
ADD_MENUITEM_WITH_HELP
(
filesMenu
,
wxID_EXIT
,
_
(
"&Quit"
),
_
(
"Quit CvPCB"
),
exit_xpm
);
#endif
/* !defined( __WXMAC__) */
// Menu Configuration:
wxMenu
*
configmenu
=
new
wxMenu
;
item
=
new
wxMenuItem
(
configmenu
,
ID_CONFIG_REQ
,
_
(
"&Configuration"
),
_
(
"Set libraries and library search paths"
)
);
item
->
SetBitmap
(
config_xpm
);
configmenu
->
Append
(
item
);
ADD_MENUITEM_WITH_HELP
(
configmenu
,
ID_CONFIG_REQ
,
_
(
"&Configuration"
),
_
(
"Set libraries and library search paths"
),
config_xpm
);
wxGetApp
().
AddMenuLanguageList
(
configmenu
);
...
...
@@ -77,31 +74,29 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
_
(
"Prevent CVPcb from exiting after saving netlist file"
),
wxITEM_CHECK
);
configmenu
->
Append
(
item
);
configmenu
->
AppendSeparator
();
item
=
new
wxMenuItem
(
configmenu
,
ID_CONFIG_SAVE
,
_
(
"&Save Project File"
),
_
(
"Save changes to the project file"
)
);
item
->
SetBitmap
(
save_setup_xpm
);
configmenu
->
Append
(
item
);
ADD_MENUITEM_WITH_HELP
(
configmenu
,
ID_CONFIG_SAVE
,
_
(
"&Save Project File"
),
_
(
"Save changes to the project file"
),
save_setup_xpm
);
// Menu Help:
wxMenu
*
helpMenu
=
new
wxMenu
;
AddHelpVersionInfoMenuEntry
(
helpMenu
);
item
=
new
wxMenuItem
(
helpMenu
,
ID_GENERAL_HELP
,
_
(
"&Contents"
),
_
(
"Open the cvpcb manual"
)
);
item
->
SetBitmap
(
online_help_xpm
);
helpMenu
->
Append
(
item
);
ADD_MENUITEM_WITH_HELP
(
helpMenu
,
ID_GENERAL_HELP
,
_
(
"&Contents"
),
_
(
"Open the cvpcb manual"
),
online_help_xpm
);
/* About on all platforms except WXMAC */
#if !defined(__WXMAC__)
item
=
new
wxMenuItem
(
helpMenu
,
ID_KICAD_ABOUT
,
ADD_MENUITEM_WITH_HELP
(
helpMenu
,
ID_KICAD_ABOUT
,
_
(
"&About"
),
_
(
"About cvpcb schematic to pcb converter"
)
);
item
->
SetBitmap
(
info_xpm
);
helpMenu
->
Append
(
item
);
_
(
"About cvpcb schematic to pcb converter"
),
info_xpm
);
#endif
/* !defined(__WXMAC__) */
...
...
cvpcb/tool_cvpcb.cpp
View file @
02d4b59c
...
...
@@ -5,7 +5,6 @@
#include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h"
#include "trigo.h"
#include "bitmaps.h"
#include "cvpcb.h"
...
...
@@ -23,63 +22,64 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
m_HToolBar
=
new
WinEDA_Toolbar
(
TOOLBAR_MAIN
,
this
,
ID_H_TOOLBAR
,
TRUE
);
m_HToolBar
->
AddTool
(
ID_CVPCB_READ_INPUT_NETLIST
,
wxEmptyString
,
wxBitmap
(
open_document_xpm
),
_
(
"Open a net list file"
)
);
wxBitmap
(
open_document_xpm
),
_
(
"Open a net list file"
)
);
m_HToolBar
->
AddTool
(
ID_CVPCB_SAVEQUITCVPCB
,
wxEmptyString
,
wxBitmap
(
save_xpm
),
_
(
"Save net list and footprint files"
)
);
wxBitmap
(
save_xpm
),
_
(
"Save net list and footprint files"
)
);
m_HToolBar
->
AddSeparator
();
m_HToolBar
->
AddTool
(
ID_CVPCB_CREATE_CONFIGWINDOW
,
wxEmptyString
,
wxBitmap
(
config_xpm
),
_
(
"Configuration"
)
);
wxBitmap
(
config_xpm
),
_
(
"Configuration"
)
);
m_HToolBar
->
AddSeparator
();
m_HToolBar
->
AddTool
(
ID_CVPCB_CREATE_SCREENCMP
,
wxEmptyString
,
wxBitmap
(
module
_xpm
),
_
(
"View selected footprint"
)
);
wxBitmap
(
show_footprint
_xpm
),
_
(
"View selected footprint"
)
);
m_HToolBar
->
AddTool
(
ID_CVPCB_AUTO_ASSOCIE
,
wxEmptyString
,
wxBitmap
(
auto_associe_xpm
),
_
(
"Perform automatic footprint association"
)
);
wxBitmap
(
auto_associe_xpm
),
_
(
"Perform automatic footprint association"
)
);
m_HToolBar
->
AddSeparator
();
m_HToolBar
->
AddTool
(
ID_CVPCB_GOTO_PREVIOUSNA
,
wxEmptyString
,
wxBitmap
(
left_xpm
),
_
(
"Select previous free component"
)
);
wxBitmap
(
left_xpm
),
_
(
"Select previous free component"
)
);
m_HToolBar
->
AddTool
(
ID_CVPCB_GOTO_FIRSTNA
,
wxEmptyString
,
wxBitmap
(
right_xpm
),
_
(
"Select next free component"
)
);
wxBitmap
(
right_xpm
),
_
(
"Select next free component"
)
);
m_HToolBar
->
AddSeparator
();
m_HToolBar
->
AddTool
(
ID_CVPCB_DEL_ASSOCIATIONS
,
wxEmptyString
,
wxBitmap
(
delete_association_xpm
),
_
(
"Delete all associations"
)
);
wxBitmap
(
delete_association_xpm
),
_
(
"Delete all associations"
)
);
m_HToolBar
->
AddSeparator
();
m_HToolBar
->
AddTool
(
ID_CVPCB_CREATE_STUFF_FILE
,
wxEmptyString
,
wxBitmap
(
save_cmpstuff_xpm
),
_
(
"Create export file (component/footprint list, \
used by eeschema to fill the footprint field of components)"
)
);
wxBitmap
(
export_footprint_names_xpm
),
_
(
"Create export file (component/footprint list, \
used by eeschema to fill the footprint field of components)"
)
);
m_HToolBar
->
AddSeparator
();
m_HToolBar
->
AddTool
(
ID_PCB_DISPLAY_FOOTPRINT_DOC
,
wxEmptyString
,
wxBitmap
(
datasheet_xpm
),
_
(
"Display footprints list documentation"
)
);
wxBitmap
(
datasheet_xpm
),
_
(
"Display footprints list documentation"
)
);
m_HToolBar
->
AddSeparator
();
m_HToolBar
->
AddSeparator
();
m_HToolBar
->
AddRadioTool
(
ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST
,
wxEmptyString
,
wxBitmap
(
module_filtered_list_xpm
),
wxNullBitmap
,
_
(
"Display the filtered footprint list for the current component"
)
);
wxEmptyString
,
wxBitmap
(
module_filtered_list_xpm
),
wxNullBitmap
,
_
(
"Display the filtered footprint list for the current component"
)
);
m_HToolBar
->
AddRadioTool
(
ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST
,
wxEmptyString
,
wxBitmap
(
module_full_list_xpm
),
wxNullBitmap
,
_
(
"Display the full footprint list (without filtering)"
)
);
wxEmptyString
,
wxBitmap
(
module_full_list_xpm
),
wxNullBitmap
,
_
(
"Display the full footprint list (without filtering)"
)
);
if
(
config
)
{
...
...
eeschema/tool_sch.cpp
View file @
02d4b59c
...
...
@@ -111,7 +111,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar
->
AddTool
(
ID_GET_TOOLS
,
wxEmptyString
,
wxBitmap
(
tools_xpm
),
_
(
"Generate bill of materials and/or cross references"
)
);
m_HToolBar
->
AddTool
(
ID_BACKANNO_ITEMS
,
wxEmptyString
,
wxBitmap
(
backanno
_xpm
),
m_HToolBar
->
AddTool
(
ID_BACKANNO_ITEMS
,
wxEmptyString
,
wxBitmap
(
import_footprint_names
_xpm
),
_
(
"Back annotate component foot prints"
)
);
// after adding the tools to the toolbar, must call Realize() to reflect the changes
...
...
include/bitmaps.h
View file @
02d4b59c
...
...
@@ -62,6 +62,7 @@ extern const char* copper_layers_setup_xpm[];
extern
const
char
*
copyblock_xpm
[];
extern
const
char
*
copyComponent_xpm
[];
extern
const
char
*
copy_button
[];
extern
const
char
*
create_cmp_file_xpm
[];
extern
const
char
*
cursor_shape_xpm
[];
extern
const
char
*
cursor_xpm
[];
extern
const
char
*
cut_button
[];
...
...
@@ -119,6 +120,7 @@ extern const char* erc_xpm[];
extern
const
char
*
erc_green_xpm
[];
extern
const
char
*
error_xpm
[];
extern
const
char
*
exit_xpm
[];
extern
const
char
*
export_footprint_names_xpm
[];
extern
const
char
*
export_module_xpm
[];
extern
const
char
*
export_options_pad_xpm
[];
extern
const
char
*
export_xpm
[];
...
...
@@ -162,6 +164,7 @@ extern const char* icon_modedit_xpm[];
extern
const
char
*
icon_txt_xpm
[];
extern
const
char
*
icon_w3d_xpm
[];
extern
const
char
*
import_cmp_from_lib_xpm
[];
extern
const
char
*
import_footprint_names_xpm
[];
extern
const
char
*
import_hierarchical_label_xpm
[];
extern
const
char
*
import_module_xpm
[];
extern
const
char
*
import_xpm
[];
...
...
@@ -362,7 +365,6 @@ extern const char* rotate_pos_Y_xpm[];
extern
const
char
*
rotate_neg_Z_xpm
[];
extern
const
char
*
rotate_pos_Z_xpm
[];
extern
const
char
*
save_as_xpm
[];
extern
const
char
*
save_cmpstuff_xpm
[];
extern
const
char
*
save_library_xpm
[];
extern
const
char
*
save_netlist_xpm
[];
extern
const
char
*
save_part_in_mem_xpm
[];
...
...
@@ -376,6 +378,7 @@ extern const char* select_w_layer_xpm[];
extern
const
char
*
sheetset_xpm
[];
extern
const
char
*
show_3d_xpm
[];
extern
const
char
*
show_dcodenumber_xpm
[];
extern
const
char
*
show_footprint_xpm
[];
extern
const
char
*
show_mod_edge_xpm
[];
extern
const
char
*
showtrack_xpm
[];
extern
const
char
*
show_zone_xpm
[];
...
...
packaging/windows/nsis/install.nsi
View file @
02d4b59c
...
...
@@ -17,7 +17,7 @@
; General Product Description Definitions
!define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2011.03.2
8
"
!define PRODUCT_VERSION "2011.03.2
9
"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME ""
...
...
pcbnew/menubar_pcbframe.cpp
View file @
02d4b59c
...
...
@@ -118,7 +118,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
item
=
new
wxMenuItem
(
fabricationOutputsMenu
,
ID_PCB_GEN_CMP_FILE
,
_
(
"&Component File"
),
_
(
"(Re)create components file (*.cmp) for CvPcb"
)
);
item
->
SetBitmap
(
save_cmpstuff
_xpm
);
item
->
SetBitmap
(
create_cmp_file
_xpm
);
fabricationOutputsMenu
->
Append
(
item
);
// BOM File
...
...
version.txt
View file @
02d4b59c
release version:
2011 mar
17
2011 mar
29
files (.zip,.tgz):
kicad-2011-03-2
8
kicad-2011-03-2
9
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment