From 3750b00272838d9aa532fccc069b2c7d2a98e53f Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 15 Jul 2018 12:32:47 +0200 Subject: [PATCH] Tweaked crosshair icon, #4469 --- ...shair1-adjust.png => crosshair-adjust.png} | Bin rtdata/images/themed/png/dark/crosshair.png | Bin 0 -> 421 bytes rtdata/images/themed/png/dark/crosshair1.png | Bin 418 -> 0 bytes ...shair1-adjust.png => crosshair-adjust.png} | Bin rtdata/images/themed/png/light/crosshair.png | Bin 0 -> 421 bytes rtdata/images/themed/png/light/crosshair1.png | Bin 418 -> 0 bytes ...shair1-adjust.svg => crosshair-adjust.svg} | 0 .../svg/{crosshair1.svg => crosshair.svg} | 21 +++++++++++++----- rtgui/cursormanager.cc | 2 +- rtgui/diagonalcurveeditorsubgroup.cc | 6 ++--- rtgui/flatcurveeditorsubgroup.cc | 2 +- rtgui/gradient.cc | 2 +- rtgui/toolbar.cc | 2 +- 13 files changed, 23 insertions(+), 12 deletions(-) rename rtdata/images/themed/png/dark/{crosshair1-adjust.png => crosshair-adjust.png} (100%) create mode 100644 rtdata/images/themed/png/dark/crosshair.png delete mode 100644 rtdata/images/themed/png/dark/crosshair1.png rename rtdata/images/themed/png/light/{crosshair1-adjust.png => crosshair-adjust.png} (100%) create mode 100644 rtdata/images/themed/png/light/crosshair.png delete mode 100644 rtdata/images/themed/png/light/crosshair1.png rename rtdata/images/themed/svg/{crosshair1-adjust.svg => crosshair-adjust.svg} (100%) rename rtdata/images/themed/svg/{crosshair1.svg => crosshair.svg} (71%) diff --git a/rtdata/images/themed/png/dark/crosshair1-adjust.png b/rtdata/images/themed/png/dark/crosshair-adjust.png similarity index 100% rename from rtdata/images/themed/png/dark/crosshair1-adjust.png rename to rtdata/images/themed/png/dark/crosshair-adjust.png diff --git a/rtdata/images/themed/png/dark/crosshair.png b/rtdata/images/themed/png/dark/crosshair.png new file mode 100644 index 0000000000000000000000000000000000000000..078512803dec62b7d5c2d95c3d42f4594606eb8b GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpDt0(?ST-3xrUxIp0m1k7LnWc>gC z|HzReM~@y|c(vy*kk3{UKNfkrcUy85}Sb4q9e0B^O3+5i9m literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/crosshair1.png b/rtdata/images/themed/png/dark/crosshair1.png deleted file mode 100644 index e824f00aaf74c463b28561bf55fe6bff8d7a524c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpBH1AIbU-3xp;IXVCT|If?}@;i`( zFn}UJ?$M)1Q|#w-16dp;L4LsuAEtXLd3r0p){SHYin)8bIEF}EPEI($(0Ry1W@W3# z9Lc#?o^WV7Wtg3uX{;``p}~Wh?U<;ntS=9bl&owl(+Zii2~6x8HZg=SXFMERK!`}5n0T@z;^_M8K-LVNdpDt0(?ST-3xrUxIp0m1k7LnWc>gC z|HzReM~@y|c(vy*kk3{UKNfkrcUy85}Sb4q9e0B^O3+5i9m literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/crosshair1.png b/rtdata/images/themed/png/light/crosshair1.png deleted file mode 100644 index e824f00aaf74c463b28561bf55fe6bff8d7a524c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpBH1AIbU-3xp;IXVCT|If?}@;i`( zFn}UJ?$M)1Q|#w-16dp;L4LsuAEtXLd3r0p){SHYin)8bIEF}EPEI($(0Ry1W@W3# z9Lc#?o^WV7Wtg3uX{;``p}~Wh?U<;ntS=9bl&owl(+Zii2~6x8HZg=SXFM + sodipodi:docname="crosshair.svg"> + d="m 12,-26.5 c -0.831,0 -1.5,0.669 -1.5,1.5 v 7.007812 C 10.918164,-18.30699 11.433952,-18.5 12,-18.5 c 0.566048,0 1.081836,0.19301 1.5,0.507812 V -25 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m -9,9 c -0.831,0 -1.5,0.669 -1.5,1.5 0,0.831 0.669,1.5 1.5,1.5 h 7.007812 C 9.69301,-14.918164 9.5,-15.433952 9.5,-16 c 0,-0.566048 0.19301,-1.081836 0.507812,-1.5 z m 10.992188,0 C 14.30699,-17.081836 14.5,-16.566048 14.5,-16 c 0,0.566048 -0.19301,1.081836 -0.507812,1.5 H 21 c 0.831,0 1.5,-0.669 1.5,-1.5 0,-0.831 -0.669,-1.5 -1.5,-1.5 z M 10.5,-14.007812 V -7 c 0,0.831 0.669,1.5 1.5,1.5 0.831,0 1.5,-0.669 1.5,-1.5 v -7.007812 C 13.081836,-13.69301 12.566048,-13.5 12,-13.5 c -0.566048,0 -1.081836,-0.19301 -1.5,-0.507812 z" + id="rect1440" + inkscape:connector-curvature="0" /> + d="m 12,-27 c -1.099351,0 -2,0.900649 -2,2 v 7 H 3 c -1.099351,0 -2,0.900649 -2,2 0,1.099351 0.900649,2 2,2 h 7 v 7 c 0,1.099351 0.900649,2 2,2 1.099351,0 2,-0.900649 2,-2 v -7 h 7 c 1.099351,0 2,-0.900649 2,-2 0,-1.099351 -0.900649,-2 -2,-2 h -7 v -7 c 0,-1.099351 -0.900649,-2 -2,-2 z m 0,1 c 0.562649,0 1,0.437351 1,1 v 6.708984 c 0.577268,0.251335 1.039681,0.713748 1.291016,1.291016 H 21 c 0.562649,0 1,0.437351 1,1 0,0.562649 -0.437351,1 -1,1 H 14.291016 C 14.039681,-14.422732 13.577268,-13.960319 13,-13.708984 V -7 c 0,0.562649 -0.437351,1 -1,1 -0.562649,0 -1,-0.437351 -1,-1 v -6.708984 C 10.422732,-13.960319 9.9603186,-14.422732 9.7089844,-15 H 3 c -0.562649,0 -1,-0.437351 -1,-1 0,-0.562649 0.437351,-1 1,-1 H 9.7089844 C 9.9603186,-17.577268 10.422732,-18.039681 11,-18.291016 V -25 c 0,-0.562649 0.437351,-1 1,-1 z" + id="path1481" + inkscape:connector-curvature="0" /> + + + diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc index 9f6884c5c..d1973dcca 100644 --- a/rtgui/cursormanager.cc +++ b/rtgui/cursormanager.cc @@ -51,7 +51,7 @@ void CursorManager::init (Glib::RefPtr mainWindow) cAdd = Gdk::Cursor::create (display, Gdk::PLUS); cWait = Gdk::Cursor::create (display, Gdk::CLOCK); - Glib::RefPtr hand = RTImage::createFromFile ("crosshair1.png"); + Glib::RefPtr hand = RTImage::createFromFile ("crosshair.png"); Glib::RefPtr close_hand = RTImage::createFromFile ("hand-closed.png"); Glib::RefPtr wbpick = RTImage::createFromFile ("color-picker.png"); Glib::RefPtr cpick = RTImage::createFromFile ("color-picker-add.png"); diff --git a/rtgui/diagonalcurveeditorsubgroup.cc b/rtgui/diagonalcurveeditorsubgroup.cc index eb61d8b45..e7599b502 100644 --- a/rtgui/diagonalcurveeditorsubgroup.cc +++ b/rtgui/diagonalcurveeditorsubgroup.cc @@ -69,7 +69,7 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt, editPointCustom = Gtk::manage (new Gtk::ToggleButton ()); initButton(*editPointCustom, Glib::ustring("edit-point.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT"); editCustom = Gtk::manage (new Gtk::ToggleButton()); - initButton(*editCustom, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); + initButton(*editCustom, Glib::ustring("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); editCustom->hide(); copyCustom = Gtk::manage (new Gtk::Button ()); initButton(*copyCustom, Glib::ustring("copy.png"), Gtk::ALIGN_END, true); @@ -146,7 +146,7 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt, editPointNURBS = Gtk::manage (new Gtk::ToggleButton ()); initButton(*editPointNURBS, Glib::ustring("edit-point.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT"); editNURBS = Gtk::manage (new Gtk::ToggleButton()); - initButton(*editNURBS, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); + initButton(*editNURBS, Glib::ustring("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); editNURBS->hide(); copyNURBS = Gtk::manage (new Gtk::Button ()); initButton(*copyNURBS, Glib::ustring("copy.png"), Gtk::ALIGN_END, true); @@ -224,7 +224,7 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt, shcSelector->set_name("CurveSHCSelector"); // To handle the 4px gap between the SHCSelector and the curve through CSS editParam = Gtk::manage (new Gtk::ToggleButton()); - initButton(*editParam, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); + initButton(*editParam, Glib::ustring("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); editParam->hide(); copyParam = Gtk::manage (new Gtk::Button ()); initButton(*copyParam, Glib::ustring("copy.png"), Gtk::ALIGN_END, true); diff --git a/rtgui/flatcurveeditorsubgroup.cc b/rtgui/flatcurveeditorsubgroup.cc index c6028b32d..055a8a92f 100644 --- a/rtgui/flatcurveeditorsubgroup.cc +++ b/rtgui/flatcurveeditorsubgroup.cc @@ -63,7 +63,7 @@ FlatCurveEditorSubGroup::FlatCurveEditorSubGroup (CurveEditorGroup* prt, Glib::u } editCPoints = Gtk::manage (new Gtk::ToggleButton()); - initButton(*editCPoints, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); + initButton(*editCPoints, Glib::ustring("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); editPointCPoints = Gtk::manage (new Gtk::ToggleButton ()); initButton(*editPointCPoints, Glib::ustring("edit-point.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT"); copyCPoints = Gtk::manage (new Gtk::Button ()); diff --git a/rtgui/gradient.cc b/rtgui/gradient.cc index 34d1f81bd..10cc30054 100644 --- a/rtgui/gradient.cc +++ b/rtgui/gradient.cc @@ -13,7 +13,7 @@ Gradient::Gradient () : FoldableToolPanel(this, "gradient", M("TP_GRADIENT_LABEL editHBox = Gtk::manage (new Gtk::HBox()); edit = Gtk::manage (new Gtk::ToggleButton()); - edit->add (*Gtk::manage (new RTImage ("crosshair1-adjust.png"))); + edit->add (*Gtk::manage (new RTImage ("crosshair-adjust.png"))); edit->set_tooltip_text(M("EDIT_OBJECT_TOOLTIP")); editConn = edit->signal_toggled().connect( sigc::mem_fun(*this, &Gradient::editToggled) ); editHBox->pack_start(*edit, Gtk::PACK_SHRINK, 0); diff --git a/rtgui/toolbar.cc b/rtgui/toolbar.cc index f586cb70d..f82911e80 100644 --- a/rtgui/toolbar.cc +++ b/rtgui/toolbar.cc @@ -27,7 +27,7 @@ ToolBar::ToolBar () : showColPickers(true), listener (nullptr), pickerListener(n editingMode = false; handimg.reset(new RTImage("hand-open.png")); - editinghandimg.reset(new RTImage("crosshair1-adjust.png")); + editinghandimg.reset(new RTImage("crosshair-adjust.png")); handTool = Gtk::manage (new Gtk::ToggleButton ()); handTool->add (*handimg);