From 54ff8788e69aaa770dc17dea899adf258161cdb0 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 28 Aug 2018 18:01:25 +0200 Subject: [PATCH] More icon and cursor fixes - The Graduated Filter on-canvas widget button now has its own icon, does not use the curve's "add adjustment point" icon anymore. - When dragging a crop, a closed hand cursor is shown. - The hand icon had the outline removed to improve separation between the fingers. --- .../themed/png/dark/crosshair-adjust.png | Bin 483 -> 478 bytes .../themed/png/dark/crosshair-node-curve.png | Bin 0 -> 483 bytes rtdata/images/themed/png/dark/hand-open.png | Bin 564 -> 533 bytes .../themed/png/light/crosshair-adjust.png | Bin 482 -> 468 bytes .../themed/png/light/crosshair-node-curve.png | Bin 0 -> 482 bytes rtdata/images/themed/png/light/hand-open.png | Bin 574 -> 549 bytes rtdata/images/themed/svg/crosshair-adjust.svg | 40 +----- .../themed/svg/crosshair-node-curve.svg | 134 ++++++++++++++++++ rtdata/images/themed/svg/hand-open.svg | 9 +- rtgui/cursormanager.cc | 5 +- rtgui/diagonalcurveeditorsubgroup.cc | 6 +- rtgui/flatcurveeditorsubgroup.cc | 2 +- 12 files changed, 150 insertions(+), 46 deletions(-) create mode 100644 rtdata/images/themed/png/dark/crosshair-node-curve.png create mode 100644 rtdata/images/themed/png/light/crosshair-node-curve.png create mode 100644 rtdata/images/themed/svg/crosshair-node-curve.svg diff --git a/rtdata/images/themed/png/dark/crosshair-adjust.png b/rtdata/images/themed/png/dark/crosshair-adjust.png index 08d6e00ff5c6dfa9b098e8f80d49d448b400ffb1..8536e8f0921f759767191dbf7bbea1e91acd41b6 100644 GIT binary patch delta 226 zcmaFNe2;kpD`UM%fKQ04dx6gxFgSbmERa5T?%e6qr~m)|4-o{C$B!TP*qLa{z`(#$ z666=mu=%NDR8lbG;Ypg@>{Ft%f#NluE{-7*my;75SUGukjy?-8>*iu^UT837vqvUl z^J0#cvv-$V;eB49rI~ri(&0egnM8-DGuV`)3c0uzNS(QKiAO?W#^pgQu&X%Q~loCIE#hUL^nk delta 231 zcmcb|{Fr$ID`UM@fKQ04dx6gxFgSkvIFLSj_AG=8VLyBJ3@8Ewr%#_&e`r|Dz`(#) z666=mu=$zXg4pGql}>De`qLbDFKh?ORC>BNhDcmaPEg>mSg(BJOzR_qXF=QDCUP41 zEm)8s9y4+A0tqMgMGH9QoPDaH!4?0!pks&2LCeOIJUm_ozghSdEZ9{gAIRh#XJBb( zej|{~k)CA6Jb98)^TbI^0ilmrSlXSN7#F@tFq_dNQDDf>8N837lbO}4f|-@!4U>@U UJ=c_%Kvyt$y85}Sb4q9e0QHb#AOHXW diff --git a/rtdata/images/themed/png/dark/crosshair-node-curve.png b/rtdata/images/themed/png/dark/crosshair-node-curve.png new file mode 100644 index 0000000000000000000000000000000000000000..08d6e00ff5c6dfa9b098e8f80d49d448b400ffb1 GIT binary patch literal 483 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-LVNdpD70(?ST-3xrqfWh(O$AR?Ovu7b( z2>aQyXFw4kIDPuG`a?sY5e$4KL4Lsuo1e)oh+W=U>BJ_eKh1IX!giocrKgKyh{WaO z1O*O@^~yKSv_3L;7PQ@MBBz1hf&~fUF%uUrkZ^Kew18vI*{2#BT+a(ScDNk0Y&^-s z<7M!hgb51SbnK0|SFlq{8Wmicjj*1AIbU&zw2qUf=^HFI>0)Bu}3{efI2GAOnq^ zwvwF_sFk-Q$S-&^!z{iPetP!x@-dxd^J0SBffDOIT^vIsF8f~C$k${b!1loYYM0}* z)e1u5v2$b^uCjLOCp=<4@T?>Mz@xr=h1sj~HOjZtAM>7dXZn`w`&s{rwoOgBIM1j% zPn<37*#pU`S=|MB7cAElx-4G5RpFSl{@%UZ(<~Nz{U{Q!I$*`iiZ&@8QG-wOtlEyR zFj?Bed3eFJTzNO1qqcfR3#Q7=RG408c+8WlEq`+;&-a$zxjG#Z>fKZKrum!|uHxP` h_jLR3x$(7(@4AGfpMTF{b_P10!PC{xWt~$(697)RD4oz9N-h;dIkp0pFe;4^y#x_&jJP93w$8LTeofn zid?>Y87>9n?%gwa9?%%Uk|4j}%{8l)4(t#ZyGWGFEx=*v&j9+OtYP zM`JhZB&I_b(oSUa^Yb=b zb_>^;@K0Oc$o}E#BkqYS&dZfBY~k@>>kfL!W>fv;VekBwjlYi0``Fed&gI+iQ{~{j z_s3Z@kE$OxytbM9THKcY(Po9+fDc5X(eqr!* L^>bP0l+XkKjI5uC diff --git a/rtdata/images/themed/png/light/crosshair-adjust.png b/rtdata/images/themed/png/light/crosshair-adjust.png index 0af7379c24aefb2914034148d0ccebc9187e0af5..b8b17dfa1a76be046ffc2ad3f056f92f845c5598 100644 GIT binary patch delta 216 zcmaFFe1&-fD`UNSfKQ04dx4KC45)yCnwlC!Kv!26$W~BL01E$mY5ReJfq}Oq$S;^7 zdh=6MKADC707~R}x;TbNTux4KVC9yOh>%&36XwjurY@?HzWE~~o1!bn z?9DfJ2%URqV79HH_yB|XaoyGcM(zS$Ue>6SLQ+ypDpRLS5t5L&(J+NstNmbLfWQkY zJx52uoVEoLy;oT^_*_3Sbv>7m@SV7)S4hEwfkAnf@a)aLD-Qy#X7F_Nb6Mw<&;$TX CoI-2> delta 230 zcmcb@{D^r2D`UM@fKQ04dx4KC7-(o{sHmtw*lKEOK!&!qHjq?TSBHql{A75)phGj$rU~^>bP0l+XkKmC;Jv diff --git a/rtdata/images/themed/png/light/crosshair-node-curve.png b/rtdata/images/themed/png/light/crosshair-node-curve.png new file mode 100644 index 0000000000000000000000000000000000000000..0af7379c24aefb2914034148d0ccebc9187e0af5 GIT binary patch literal 482 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-LVNdpD70(?ST-3xqF!9YVpLq$ae!d6pL z12VL=wSlC%x;jKW<|o4=pf0|WAirRS&Clc(BrbR9WUCg`pT>IN^KGC^g{O;Sh{WaO z1O<*8`3g7A^a>d~3)$YP#A@KTU_pXP%*4eDB%ItAE#R1Q_N9gf*YkqT9SU1m)Qk-@ z4!#k#X?P$blHO3fLzY=UMsI_2kK&v|Ic#dGscg!stP55hVPa|b?qXc{Cc$h*lSIKr lhR(}|jGfG^UKPx&3~L?>Uie$@CJuB1gQu&X%Q~loCIEdCm&pJC literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/hand-open.png b/rtdata/images/themed/png/light/hand-open.png index 8a180934f24afda377a0f3efcfb4426801ee9542..bb01eac88a0e150354fb20761b03cc5e22c13229 100644 GIT binary patch delta 310 zcmdnTvXo_l1SbnK0|SFlq{8Wmicjhd0(?STRaI5p3w)H6lz_M5pwwyMW zYi*qgeFDz%huO{8I(iF6g(5izWJu&xrv4hg$a4guiGmf#j=d9EObcVc-rBx swsD74ijtGk6y+EBIr~Z#dzhISq=e*8?&hEW59k2~Pgg&ebxsLQ05Qp5xc~qF delta 335 zcmZ3=vX5ng1SbbG0|UeLm1j>)RD4oz8Q>G*stN{bYHAP$gmf?PfiQG+byZYUfU+_& zGC&b^b#-NBWr&ol?a7ru!-PwM{DL=!DKzffzlPz+Db^Af@m}Ms8P}Gto1hJpKH%x% z7@~2$^kO4lvjPvx1?H$7O0VwxuYYsnNPX|DHHH&^2vx1ssONfo_gc`TwxGrBX<^(G zwbxqSSlPcQ!Nikqm7;i~Y0_s~BORt~B_3jG5iZ+!^K(fMNgu diff --git a/rtdata/images/themed/svg/crosshair-adjust.svg b/rtdata/images/themed/svg/crosshair-adjust.svg index 21862c970..4cde3415a 100644 --- a/rtdata/images/themed/svg/crosshair-adjust.svg +++ b/rtdata/images/themed/svg/crosshair-adjust.svg @@ -26,7 +26,7 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="34.25" + inkscape:zoom="33.833333" inkscape:cx="12" inkscape:cy="12" inkscape:document-units="px" @@ -63,7 +63,7 @@ image/svg+xml - + Maciej Dworak @@ -101,48 +101,18 @@ inkscape:label="Layer 1"> - - - - - - - diff --git a/rtdata/images/themed/svg/crosshair-node-curve.svg b/rtdata/images/themed/svg/crosshair-node-curve.svg new file mode 100644 index 000000000..d72c2a929 --- /dev/null +++ b/rtdata/images/themed/svg/crosshair-node-curve.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/hand-open.svg b/rtdata/images/themed/svg/hand-open.svg index d49d10d5f..a7597b482 100644 --- a/rtdata/images/themed/svg/hand-open.svg +++ b/rtdata/images/themed/svg/hand-open.svg @@ -26,12 +26,12 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="34.25" + inkscape:zoom="33.833333" inkscape:cx="12" inkscape:cy="12" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:window-width="1920" inkscape:window-height="1019" inkscape:window-x="0" @@ -119,7 +119,8 @@ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + d="m 36.455078,1.1015625 c -0.657515,-0.025842 -1.353006,0.4514359 -1.388672,1.2167969 0.02103,2.1794281 0.362572,4.3446075 0.34375,6.5253906 C 34.704462,6.7462413 33.696458,4.7625164 33.007812,2.6601562 32.699764,1.4053767 30.686393,1.3462201 30.712891,2.7910156 c 0.148468,1.5137205 0.593614,2.9947661 1.144531,4.4121094 0.579646,1.5250885 1.19498,3.114871 1.074219,4.777344 -0.211465,1.328048 -1.80517,1.750258 -2.697266,0.580078 -0.416475,-0.393564 -0.544424,-0.651727 -0.960938,-1.238281 -0.416513,-0.586553 -1.122246,-1.5013905 -1.86914,-1.220704 -1.49767,0.876327 -0.29335,2.450372 0.320312,3.476563 0.529141,1.049899 1.266424,1.94363 2.097657,2.765625 1.139405,1.210646 2.00714,2.79189 1.927734,4.496094 0.04404,1.388514 1.55807,2.053559 2.763672,2.126953 1.546216,0.08721 3.126794,0.01908 4.630859,-0.367188 0.822251,-0.241424 1.611734,-0.89878 1.595703,-1.824218 C 40.98435,16.701293 42.787358,12.966248 43.802734,9.0625 44.093836,8.0059864 44.448353,6.9326448 44.445312,5.828125 44.177193,4.6456298 42.537354,4.6959782 42.236328,6.0273438 41.967568,6.973985 41.870664,7.9687737 41.496094,8.8847656 41.242569,6.9262668 41.683518,4.9338681 41.367188,2.9785156 41.412433,1.450498 39.214266,1.5287748 38.957031,2.8378906 38.705507,4.763864 38.797888,6.7201513 38.556641,8.6484375 37.992758,6.3776292 38.26795,3.9551294 37.447266,1.7402344 37.23158,1.3141238 36.849587,1.1170679 36.455078,1.1015625 Z m -0.03125,0.4941406 c 0.22785,2.006e-4 0.425241,0.1051019 0.5625,0.3632813 0.747739,2.0597572 0.494913,4.4363486 1.083984,6.8085937 l 0.982422,-0.056641 C 39.29984,6.7358274 39.21188,4.7904773 39.451172,2.9316406 39.530361,2.5430223 39.900196,2.3387264 40.269531,2.34375 c 0.185458,0.00252 0.342359,0.063217 0.439453,0.1523438 0.09709,0.089127 0.167925,0.206397 0.160157,0.46875 l -0.002,0.046875 0.0078,0.046875 C 41.171104,4.8885486 40.731427,6.8744709 41,8.9492188 l 0.242188,1.8750002 0.716796,-1.7500002 c 0.411093,-1.0053067 0.505532,-2.0215571 0.757813,-2.9101563 l 0.0039,-0.013672 0.0039,-0.013672 c 0.107736,-0.4764885 0.395184,-0.6352244 0.660157,-0.6523438 0.251375,-0.016241 0.449106,0.1022573 0.542968,0.4316406 -0.01505,0.9710696 -0.318057,1.9705536 -0.605468,3.0136719 l -0.002,0.00391 v 0.00195 C 42.321624,12.774915 40.493948,16.543442 40.24213,20.746094 l -0.002,0.01953 v 0.01953 c 0.0055,0.318516 -0.117945,0.577694 -0.34375,0.8125 -0.223319,0.232223 -0.551559,0.418326 -0.882812,0.517578 -1.43352,0.367311 -2.960591,0.436603 -4.470703,0.351563 C 34.01895,22.434887 33.408681,22.263531 32.96875,21.976562 32.528819,21.689595 32.264389,21.339493 32.248047,20.824219 32.321056,18.952282 31.378689,17.267743 30.185547,16 l -0.0059,-0.0059 -0.0059,-0.0059 C 29.366435,15.189941 28.66843,14.338759 28.171875,13.353516 l -0.0078,-0.01758 -0.0098,-0.01563 c -0.322956,-0.540054 -0.748063,-1.170179 -0.902342,-1.681634 -0.07714,-0.255727 -0.08634,-0.461023 -0.03711,-0.621094 0.04425,-0.143897 0.168741,-0.284663 0.398437,-0.435547 0.148566,-0.04428 0.2911,-0.0095 0.53125,0.189453 0.254362,0.210719 0.520624,0.555332 0.722657,0.839844 0.388512,0.547122 0.564085,0.853027 0.984375,1.261719 0.550791,0.711482 1.379594,0.989291 2.101562,0.820312 0.726883,-0.170128 1.337556,-0.786297 1.472656,-1.634765 l 0.002,-0.02149 0.0019,-0.02148 C 33.56099,10.207825 32.903082,8.5484755 32.324198,7.0253906 v -0.00195 -0.00195 c -0.537613,-1.3831218 -0.962413,-2.8116317 -1.107422,-4.25 -7.18e-4,-0.2313914 0.05782,-0.3441971 0.140625,-0.421875 0.0851,-0.079836 0.22003,-0.1338908 0.384765,-0.1367188 0.329471,-0.00566 0.684997,0.1822887 0.779297,0.5664063 l 0.0059,0.017578 0.0059,0.017578 c 0.704593,2.151049 1.712136,4.1379729 2.402344,6.1894531 l 0.974609,-0.15625 C 35.929397,6.6206215 35.591319,4.4623326 35.56836,2.33985 c 0.01905,-0.3764264 0.286845,-0.6247291 0.619141,-0.7109376 0.08191,-0.021249 0.160378,-0.03327 0.236328,-0.033203 z" + id="path825" + inkscape:connector-curvature="0" /> diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc index d0e57ba61..9864a5da2 100644 --- a/rtgui/cursormanager.cc +++ b/rtgui/cursormanager.cc @@ -43,8 +43,7 @@ void CursorManager::init (Glib::RefPtr mainWindow) cResizeBottomLeft = Gdk::Cursor::create (display, Gdk::BOTTOM_LEFT_CORNER); cResizeBottomRight = Gdk::Cursor::create (display, Gdk::BOTTOM_RIGHT_CORNER); cCropDraw = Gdk::Cursor::create (display, Gdk::CROSSHAIR); - cCropMove = Gdk::Cursor::create (display, Gdk::CROSSHAIR); - cCropSelection = Gdk::Cursor::create (display, Gdk::CROSSHAIR); + cCropSelection = Gdk::Cursor::create (display, Gdk::STAR); // ? cLeftTanMove = Gdk::Cursor::create (display, Gdk::SB_LEFT_ARROW); cRightTanMove = Gdk::Cursor::create (display, Gdk::SB_RIGHT_ARROW); cAdd = Gdk::Cursor::create (display, Gdk::PLUS); @@ -100,7 +99,7 @@ void CursorManager::setCursor (Glib::RefPtr window, CursorShape sha } else if (shape == CSHandClosed) { window->set_cursor (cHandClosed); } else if (shape == CSMove) { - window->set_cursor (cCropMove); + window->set_cursor (cHandClosed); } else if (shape == CSResizeWidth) { window->set_cursor (cResizeWidth); } else if (shape == CSResizeHeight) { diff --git a/rtgui/diagonalcurveeditorsubgroup.cc b/rtgui/diagonalcurveeditorsubgroup.cc index e7599b502..6455f6cb9 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("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); + initButton(*editCustom, Glib::ustring("crosshair-node-curve.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("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); + initButton(*editNURBS, Glib::ustring("crosshair-node-curve.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("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); + initButton(*editParam, Glib::ustring("crosshair-node-curve.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 055a8a92f..2cc96a184 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("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP"); + initButton(*editCPoints, Glib::ustring("crosshair-node-curve.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 ());