Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Eeschema: yeet wire-with-plus icon 

This icon was only used for auto-starting a wire, which was
inconsistent with auto-starting a bus or graphic line.

Also the plus sign is a little confusing as it could also be
interpreted as the origin marker (which is really bottom left),
which is also plus-shaped.
pcb_db
John Beard 9 months ago
parent
c77c921297
commit
3b490cdd3b
5 changed files with 1 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      common/gal/cursors.cpp
  2. 2
      eeschema/tools/ee_selection_tool.cpp
  3. 2
      include/gal/cursors.h
  4. 39
      resources/bitmaps_png/cursors/cursor-line-wire-add.xpm
  5. 71
      resources/bitmaps_png/cursors/cursor-line-wire-add64.xpm

18
common/gal/cursors.cpp
View File

@ -36,7 +36,6 @@
#include <cursors/cursor-line-bus.xpm> #include <cursors/cursor-line-bus.xpm>
#include <cursors/cursor-line-graphic.xpm> #include <cursors/cursor-line-graphic.xpm>
#include <cursors/cursor-line-wire.xpm> #include <cursors/cursor-line-wire.xpm>
#include <cursors/cursor-line-wire-add.xpm>
#include <cursors/cursor-measure.xpm> #include <cursors/cursor-measure.xpm>
#include <cursors/cursor-pencil.xpm> #include <cursors/cursor-pencil.xpm>
#include <cursors/cursor-select-lasso.xpm> #include <cursors/cursor-select-lasso.xpm>
@ -60,7 +59,6 @@
#include <cursors/cursor-line-bus64.xpm> #include <cursors/cursor-line-bus64.xpm>
#include <cursors/cursor-line-graphic64.xpm> #include <cursors/cursor-line-graphic64.xpm>
#include <cursors/cursor-line-wire64.xpm> #include <cursors/cursor-line-wire64.xpm>
#include <cursors/cursor-line-wire-add64.xpm>
#include <cursors/cursor-measure64.xpm> #include <cursors/cursor-measure64.xpm>
#include <cursors/cursor-pencil64.xpm> #include <cursors/cursor-pencil64.xpm>
#include <cursors/cursor-select-lasso64.xpm> #include <cursors/cursor-select-lasso64.xpm>
@ -257,14 +255,6 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
{ 32, 32 }, { 32, 32 },
{ 5, 26 }, { 5, 26 },
}, },
{
KICURSOR::LINE_WIRE_ADD,
nullptr,
nullptr,
cursor_line_wire_add_xpm,
{ 32, 32 },
{ 5, 26 },
},
{ {
KICURSOR::LINE_GRAPHIC, KICURSOR::LINE_GRAPHIC,
nullptr, nullptr,
@ -461,14 +451,6 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> hidpi_cursors = {
{ 64, 64 }, { 64, 64 },
{ 10, 52 }, { 10, 52 },
}, },
{
KICURSOR::LINE_WIRE_ADD,
nullptr,
nullptr,
cursor_line_wire_add64_xpm,
{ 64, 64 },
{ 10, 52 },
},
{ {
KICURSOR::LINE_GRAPHIC, KICURSOR::LINE_GRAPHIC,
nullptr, nullptr,

2
eeschema/tools/ee_selection_tool.cpp
View File

@ -1034,7 +1034,7 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
{ {
if( displayWireCursor ) if( displayWireCursor )
{ {
m_nonModifiedCursor = KICURSOR::LINE_WIRE_ADD;
m_nonModifiedCursor = KICURSOR::LINE_WIRE;
} }
else if( displayBusCursor ) else if( displayBusCursor )
{ {

2
include/gal/cursors.h
View File

@ -81,8 +81,6 @@ enum class KICURSOR
LINE_GRAPHIC64, LINE_GRAPHIC64,
LINE_WIRE, LINE_WIRE,
LINE_WIRE64, LINE_WIRE64,
LINE_WIRE_ADD,
LINE_WIRE_ADD64,
LABEL_HIER, LABEL_HIER,
LABEL_HIER64, LABEL_HIER64,
PLACE, PLACE,

39
resources/bitmaps_png/cursors/cursor-line-wire-add.xpm
View File

@ -1,39 +0,0 @@
/* XPM */
static const char * cursor_line_wire_add_xpm[] = {
"32 32 4 1",
" c None",
". c #FFFFFF",
"+ c #008000",
"@ c #000000",
" ",
" ",
" ",
" ",
" .. . ",
" .++. .+. ",
" ..++.. .+++. ",
" .++++++. .+++. ",
" .++++++. .+++. ",
" ..++.. .+++. ",
" .++. .+++. ",
" .. .+++. ",
" .+++. ",
" .+++. ",
" .+++. ",
" .+++. ",
" .+++. ",
" .+++. ",
" .+++. ",
" .+++. ",
" .+++. ",
" ... .+. ",
" .@. . ",
" .@. ",
" .@. ",
".....@..... ",
".@@@@ @@@@. ",
".....@..... ",
" .@. ",
" .@. ",
" .@. ",
" ... "};

71
resources/bitmaps_png/cursors/cursor-line-wire-add64.xpm
View File

@ -1,71 +0,0 @@
/* XPM */
static char const * cursor_line_wire_add64_xpm[] = {
"64 64 4 1",
" c None",
". c #000000",
"+ c #008000",
"@ c #FFFFFF",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" @@@@ @@ ",
" @++++@ @@@@ ",
" @++++@ @@++@@ ",
" @++++@ @@++++@@ ",
" @@@@++++@@@@ @@+++++@@ ",
" @++++++++++++@ @@+++++@@ ",
" @++++++++++++@ @@+++++@@ ",
" @++++++++++++@ @@+++++@@ ",
" @++++++++++++@ @@+++++@@ ",
" @@@@++++@@@@ @@+++++@@ ",
" @++++@ @@+++++@@ ",
" @++++@ @@+++++@@ ",
" @++++@ @@+++++@@ ",
" @@@@ @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@+++++@@ ",
" @@++++@@ ",
" @@++@@ ",
" @@ @@@@ ",
" @..@ @@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @@@@@@@@..@@@@@@@@ ",
" @........ ........@ ",
" @........ ........@ ",
" @@@@@@@@..@@@@@@@@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @..@ ",
" @@ ",
" "};
Write Preview
Loading…
Cancel
Save