From 3b490cdd3befbaadba0a29648e5530f77a36e8a8 Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Sat, 11 Jan 2025 00:01:43 +0800
Subject: [PATCH] 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.
---
common/gal/cursors.cpp | 18 -----
eeschema/tools/ee_selection_tool.cpp | 2 +-
include/gal/cursors.h | 2 -
.../cursors/cursor-line-wire-add.xpm | 39 ----------
.../cursors/cursor-line-wire-add64.xpm | 71 -------------------
5 files changed, 1 insertion(+), 131 deletions(-)
delete mode 100644 resources/bitmaps_png/cursors/cursor-line-wire-add.xpm
delete mode 100644 resources/bitmaps_png/cursors/cursor-line-wire-add64.xpm
diff --git a/common/gal/cursors.cpp b/common/gal/cursors.cpp
index 280cc7bb64..0eda81d346 100644
--- a/common/gal/cursors.cpp
+++ b/common/gal/cursors.cpp
@@ -36,7 +36,6 @@
#include <cursors/cursor-line-bus.xpm>
#include <cursors/cursor-line-graphic.xpm>
#include <cursors/cursor-line-wire.xpm>
-#include <cursors/cursor-line-wire-add.xpm>
#include <cursors/cursor-measure.xpm>
#include <cursors/cursor-pencil.xpm>
#include <cursors/cursor-select-lasso.xpm>
@@ -60,7 +59,6 @@
#include <cursors/cursor-line-bus64.xpm>
#include <cursors/cursor-line-graphic64.xpm>
#include <cursors/cursor-line-wire64.xpm>
-#include <cursors/cursor-line-wire-add64.xpm>
#include <cursors/cursor-measure64.xpm>
#include <cursors/cursor-pencil64.xpm>
#include <cursors/cursor-select-lasso64.xpm>
@@ -257,14 +255,6 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> standard_cursors = {
{ 32, 32 },
{ 5, 26 },
},
- {
- KICURSOR::LINE_WIRE_ADD,
- nullptr,
- nullptr,
- cursor_line_wire_add_xpm,
- { 32, 32 },
- { 5, 26 },
- },
{
KICURSOR::LINE_GRAPHIC,
nullptr,
@@ -461,14 +451,6 @@ static const std::vector<CURSOR_STORE::CURSOR_DEF> hidpi_cursors = {
{ 64, 64 },
{ 10, 52 },
},
- {
- KICURSOR::LINE_WIRE_ADD,
- nullptr,
- nullptr,
- cursor_line_wire_add64_xpm,
- { 64, 64 },
- { 10, 52 },
- },
{
KICURSOR::LINE_GRAPHIC,
nullptr,
diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 096315d56b..5a7d6b8e1f 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -1034,7 +1034,7 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
{
if( displayWireCursor )
{
- m_nonModifiedCursor = KICURSOR::LINE_WIRE_ADD;
+ m_nonModifiedCursor = KICURSOR::LINE_WIRE;
}
else if( displayBusCursor )
{
diff --git a/include/gal/cursors.h b/include/gal/cursors.h
index f6529f6ae5..783a512b1d 100644
--- a/include/gal/cursors.h
+++ b/include/gal/cursors.h
@@ -81,8 +81,6 @@ enum class KICURSOR
LINE_GRAPHIC64,
LINE_WIRE,
LINE_WIRE64,
- LINE_WIRE_ADD,
- LINE_WIRE_ADD64,
LABEL_HIER,
LABEL_HIER64,
PLACE,
diff --git a/resources/bitmaps_png/cursors/cursor-line-wire-add.xpm b/resources/bitmaps_png/cursors/cursor-line-wire-add.xpm
deleted file mode 100644
index a8f9663bf0..0000000000
--- a/resources/bitmaps_png/cursors/cursor-line-wire-add.xpm
+++ /dev/null
@@ -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",
-" ",
-" ",
-" ",
-" ",
-" .. . ",
-" .++. .+. ",
-" ..++.. .+++. ",
-" .++++++. .+++. ",
-" .++++++. .+++. ",
-" ..++.. .+++. ",
-" .++. .+++. ",
-" .. .+++. ",
-" .+++. ",
-" .+++. ",
-" .+++. ",
-" .+++. ",
-" .+++. ",
-" .+++. ",
-" .+++. ",
-" .+++. ",
-" .+++. ",
-" ... .+. ",
-" .@. . ",
-" .@. ",
-" .@. ",
-".....@..... ",
-".@@@@ @@@@. ",
-".....@..... ",
-" .@. ",
-" .@. ",
-" .@. ",
-" ... "};
diff --git a/resources/bitmaps_png/cursors/cursor-line-wire-add64.xpm b/resources/bitmaps_png/cursors/cursor-line-wire-add64.xpm
deleted file mode 100644
index 4de3887440..0000000000
--- a/resources/bitmaps_png/cursors/cursor-line-wire-add64.xpm
+++ /dev/null
@@ -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",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" @@@@ @@ ",
-" @++++@ @@@@ ",
-" @++++@ @@++@@ ",
-" @++++@ @@++++@@ ",
-" @@@@++++@@@@ @@+++++@@ ",
-" @++++++++++++@ @@+++++@@ ",
-" @++++++++++++@ @@+++++@@ ",
-" @++++++++++++@ @@+++++@@ ",
-" @++++++++++++@ @@+++++@@ ",
-" @@@@++++@@@@ @@+++++@@ ",
-" @++++@ @@+++++@@ ",
-" @++++@ @@+++++@@ ",
-" @++++@ @@+++++@@ ",
-" @@@@ @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@+++++@@ ",
-" @@++++@@ ",
-" @@++@@ ",
-" @@ @@@@ ",
-" @..@ @@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @@@@@@@@..@@@@@@@@ ",
-" @........ ........@ ",
-" @........ ........@ ",
-" @@@@@@@@..@@@@@@@@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @..@ ",
-" @@ ",
-" "};