liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Navigator should use a different icon while panning

Browse Source 
The Navigator uses the same hand icon regardless whether panning
the red square or not, this branch tries to fix that, #4738
Includes a cleanup of icon names, i.e. the crosshair should not be
called the hand.
This commit is contained in:
Morgan Hardwood
2018-08-20 10:44:27 +02:00
parent 9847285c4c
commit 871188a1d8
11 changed files with 179 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/images/themed/png/dark/hand-open-hicontrast.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 772 B

BIN
rtdata/images/themed/png/light/hand-open-hicontrast.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 772 B

126
rtdata/images/themed/svg/hand-open-hicontrast.svg Normal file
View File

@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24px"
height="24px"
viewBox="0 0 24 24"
version="1.1"
id="SVGRoot"
inkscape:export-filename="/tmp/template.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="0.92.2 2405546, 2018-03-11"
sodipodi:docname="hand-open-hicontrast.svg">
<sodipodi:namedview
id="base"
pagecolor="#E0E1E2"
bordercolor="#666768"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="33.75"
inkscape:cx="12"
inkscape:cy="12"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1019"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:grid-bbox="true"
inkscape:pagecheckerboard="false"
inkscape:snap-bbox="true"
inkscape:bbox-nodes="true"
inkscape:snap-others="false"
inkscape:object-nodes="false"
inkscape:snap-grids="true"
inkscape:snap-bbox-midpoints="false"
inkscape:snap-nodes="false">
<inkscape:grid
type="xygrid"
id="grid1374"
originx="1"
originy="1"
empspacing="11"
dotted="false" />
</sodipodi:namedview>
<defs
id="defs815" />
<metadata
id="metadata818">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Maciej Dworak</dc:title>
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:description>RawTherapee icon.</dc:description>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<path
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
d="m 51.066359,2.3192467 c 0.02103,2.1794281 0.361946,4.3436016 0.343124,6.5243847 C 50.703789,6.7461227 49.69609,4.7620769 49.007444,2.6597168 48.699396,1.4049372 46.685585,1.3469162 46.712083,2.7917117 c 0.148468,1.5137205 0.594459,2.9945305 1.145375,4.4118738 0.579646,1.5250885 1.194783,3.1140255 1.074022,4.7764985 -0.211465,1.328048 -1.804794,1.751182 -2.69689,0.581002 -0.416475,-0.393564 -0.543928,-0.65319 -0.960441,-1.239744 -0.416513,-0.586553 -1.122086,-1.500035 -1.86898,-1.219348 -1.497669,0.876326 -0.294126,2.449671 0.319536,3.475862 0.529141,1.049899 1.265396,1.943333 2.096629,2.765328 1.139405,1.210646 2.007145,2.792292 1.92774,4.496496 0.04404,1.388514 1.558478,2.053001 2.76408,2.126395 1.546216,0.08721 3.127517,0.02028 4.631582,-0.365992 0.822251,-0.241424 1.611938,-0.89834 1.595907,-1.823778 0.244116,-4.074098 2.047676,-7.810263 3.063052,-11.7140115 C 60.094797,8.0057799 60.448279,6.9330366 60.445238,5.8285168 60.177118,4.6460216 58.537149,4.6959279 58.236123,6.0272935 57.967363,6.9739347 57.870142,7.9685551 57.495572,8.884547 57.242047,6.9260482 57.684456,4.9341325 57.368125,2.97878 57.41337,1.4507624 55.214218,1.5288595 54.956983,2.8379753 54.705459,4.7639487 54.797305,6.7197263 54.556058,8.6480125 53.992175,6.3772042 54.267168,3.9545282 53.446484,1.7396332 52.871322,0.60333839 51.123424,1.0946692 51.066359,2.3192467 Z"
id="path2954"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccccccc" />
<path
sodipodi:nodetypes="cccccccccccccccccccccccc"
inkscape:connector-curvature="0"
id="path814"
d="m 11.066359,2.319247 c 0.02103,2.179428 0.361946,4.343601 0.343124,6.524384 C 10.703789,6.746123 9.6960899,4.762077 9.0074444,2.659717 8.6993964,1.404937 6.6855849,1.346916 6.7120828,2.791712 6.860551,4.305432 7.3065418,5.786242 7.8574584,7.203585 8.4371042,8.728674 9.0522407,10.317611 8.9314796,11.980084 8.7200153,13.308132 7.126686,13.731266 6.2345901,12.561086 5.8181155,12.167522 5.6906617,11.907896 5.2741487,11.321342 4.8576356,10.734789 4.1520632,9.821307 3.4051693,10.101994 c -1.4976695,0.876326 -0.2941262,2.449671 0.3195361,3.475862 0.5291409,1.049899 1.265396,1.943333 2.0966285,2.765328 1.1394053,1.210646 2.0071456,2.792292 1.9277399,4.496496 0.044036,1.388514 1.5584783,2.053001 2.7640802,2.126395 1.546216,0.08721 3.127517,0.02028 4.631582,-0.365992 0.822251,-0.241424 1.611938,-0.89834 1.595907,-1.823778 0.244116,-4.074098 2.047676,-7.810263 3.063052,-11.714012 C 20.094797,8.00578 20.448279,6.933037 20.445238,5.828517 20.177118,4.646022 18.537149,4.695928 18.236123,6.027293 17.967363,6.973935 17.870142,7.968555 17.495572,8.884547 17.242047,6.926048 17.684456,4.934132 17.368125,2.97878 17.413375,1.450762 15.214218,1.528859 14.956983,2.837975 14.705459,4.763949 14.797305,6.719726 14.556058,8.648012 13.992175,6.377204 14.267168,3.954528 13.446484,1.739633 12.871322,0.603338 11.123424,1.094669 11.066359,2.319247 Z"
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
<path
inkscape:connector-curvature="0"
id="path820"
d="m -12.0625,0.66015625 c -0.698739,0.18127568 -1.331656,0.79041755 -1.371094,1.63671875 v 0.013672 0.013672 c 0.01134,1.1756433 0.0924,2.2946186 0.181641,3.4375 -0.449578,-1.0772468 -0.910985,-2.1751358 -1.265625,-3.2578128 l 0.0098,0.037109 c -0.213752,-0.8706616 -1.017807,-1.3409622 -1.76563,-1.3281246 -0.373911,0.00642 -0.758073,0.1317809 -1.052734,0.4082032 -0.29466,0.2764222 -0.46969,0.7024553 -0.460937,1.1796874 v 0.019531 l 0.0019,0.019531 c 0.154749,1.5777324 0.615886,3.1000247 1.175784,4.5410162 0.576175,1.5159574 1.138616,3.0231956 1.039062,4.5292966 -0.07989,0.470271 -0.362916,0.730463 -0.705078,0.810547 -0.345672,0.08091 -0.750378,-0.01505 -1.091797,-0.462891 l -0.02539,-0.03125 -0.0293,-0.0293 c -0.373704,-0.353142 -0.467524,-0.561929 -0.896484,-1.166012 -0.214481,-0.302041 -0.50916,-0.706808 -0.898438,-1.029297 -0.389278,-0.3224884 -0.96551,-0.5886036 -1.554687,-0.3671874 l -0.03906,0.013672 -0.03711,0.021484 c -0.4559,0.2667591 -0.765427,0.6392684 -0.892579,1.0527344 -0.127152,0.413466 -0.07809,0.829655 0.03516,1.205078 0.222721,0.738347 0.690357,1.390996 0.982422,1.875 0.0011,0.0022 0.0028,0.0037 0.0039,0.0059 0.561462,1.111707 1.336036,2.046692 2.189453,2.890625 l -0.01367,-0.01367 c 1.077278,1.144595 1.86382,2.610155 1.792966,4.130817 l -0.002,0.01953 0.002,0.01953 c 0.02769,0.873239 0.542175,1.548231 1.171875,1.958984 0.6297,0.410754 1.379068,0.608904 2.060547,0.650391 h 0.002 c 1.579712,0.0891 3.21279,0.02295 4.785156,-0.38086 l 0.0078,-0.002 0.0078,-0.002 c 0.487232,-0.143058 0.961438,-0.403695 1.332032,-0.789062 0.370593,-0.385367 0.63356,-0.916516 0.623046,-1.523438 v 0.03906 c 0.236258,-3.942943 2.012498,-7.646163 3.044922,-11.6113285 v -0.00391 C -3.428351,8.1521527 -3.051332,7.0368022 -3.054666,5.8260682 V 5.7714844 L -3.066406,5.71875 C -3.249415,4.9116225 -3.982389,4.4412768 -4.679688,4.4863281 -5.275494,4.5248222 -5.800031,4.9741686 -6.078125,5.6210938 -6.045805,4.7352914 -5.996807,3.9097621 -6.136719,2.984375 -6.125163,2.4875655 -6.307139,2.0425781 -6.615234,1.7597656 -6.925794,1.4746908 -7.325968,1.3490659 -7.716797,1.34375 -8.498454,1.3331182 -9.352973,1.8249624 -9.533203,2.7421875 l -0.0039,0.015625 -0.002,0.015625 c -0.05278,0.4041277 -0.05266,0.7822623 -0.08203,1.1835937 -0.107375,-0.7981063 -0.169123,-1.5977948 -0.46289,-2.390625 l -0.0098,-0.027344 -0.01367,-0.025391 C -10.500285,0.73752895 -11.363761,0.47888057 -12.0625,0.66015625 Z m 0.25,0.96874995 c 0.327629,-0.084998 0.615816,-0.014161 0.798828,0.3300782 0.747739,2.0597572 0.494913,4.4363486 1.083984,6.8085937 l 0.982422,-0.056641 C -8.70016,6.735827 -8.78812,4.7904773 -8.548828,2.9316406 -8.469639,2.5430223 -8.099804,2.3387264 -7.730469,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 -6.828955,4.8885487 -7.268573,6.874471 -7,8.9492188 l 0.242188,1.8750002 0.716796,-1.7500002 c 0.411093,-1.0053066 0.505532,-2.0215571 0.757813,-2.9101563 l 0.0039,-0.013672 0.0039,-0.013672 c 0.107736,-0.4764884 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 -5.678376,12.774915 -7.506052,16.543442 -7.75787,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 -0.524019,-0.03191 -1.134184,-0.203265 -1.574115,-0.490233 -0.439931,-0.286967 -0.704361,-0.637069 -0.720703,-1.152343 v 0.03906 c 0.08796,-1.887744 -0.86097,-3.586624 -2.0625,-4.863279 l -0.0059,-0.0059 -0.0059,-0.0059 c -0.807393,-0.79834 -1.505397,-1.649441 -2.001952,-2.634684 l -0.0078,-0.01758 -0.0098,-0.01563 c -0.322958,-0.54006 -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.168742,-0.284663 0.398438,-0.435547 0.148565,-0.04428 0.291098,-0.0095 0.531249,0.189453 0.254361,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.337555,-0.786297 1.472656,-1.634765 l 0.0019,-0.02149 0.002,-0.02148 c 0.131323,-1.8078 -0.526579,-3.4671485 -1.105463,-4.9902334 v -0.00195 -0.00195 c -0.537613,-1.3831218 -0.962413,-2.8116379 -1.107422,-4.2500062 -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.712135,4.1379731 2.402343,6.1894533 l 0.974609,-0.15625 c 0.01924,-2.227041 -0.318816,-4.3853297 -0.341775,-6.5078124 0.01905,-0.3764263 0.286845,-0.6247291 0.619141,-0.7109376 z m 5.568359,4.2617188 c -0.0026,0.00904 -0.0033,0.01636 -0.0059,0.025391 -2.2e-4,9.659e-4 -0.0017,9.865e-4 -0.002,0.00195 z"
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" />
<path
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:#2a7fff;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 52.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 50.704462,6.7462413 49.696458,4.7625164 49.007812,2.6601562 48.699764,1.4053767 46.686393,1.3462201 46.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 56.98435,16.701293 58.787358,12.966248 59.802734,9.0625 60.093836,8.0059864 60.448353,6.9326448 60.445312,5.828125 60.177193,4.6456298 58.537354,4.6959782 58.236328,6.0273438 57.967568,6.973985 57.870664,7.9687737 57.496094,8.8847656 57.242569,6.9262668 57.683518,4.9338681 57.367188,2.9785156 57.412433,1.450498 55.214266,1.5287748 54.957031,2.8378906 54.705507,4.763864 54.797888,6.7201513 54.556641,8.6484375 53.992758,6.3776292 54.26795,3.9551294 53.447266,1.7402344 53.23158,1.3141238 52.849587,1.1170679 52.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 55.29984,6.7358274 55.21188,4.7904773 55.451172,2.9316406 55.530361,2.5430223 55.900196,2.3387264 56.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 57.171104,4.8885486 56.731427,6.8744709 57,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 58.321624,12.774915 56.493948,16.543442 56.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 50.01895,22.434887 49.408681,22.263531 48.96875,21.976562 48.528819,21.689595 48.264389,21.339493 48.248047,20.824219 48.321056,18.952282 47.378689,17.267743 46.185547,16 l -0.0059,-0.0059 -0.0059,-0.0059 c -0.807393,-0.79834 -1.505398,-1.649522 -2.001953,-2.634765 l -0.0078,-0.01758 -0.0098,-0.01563 c -0.322958,-0.54006 -0.748065,-1.170185 -0.902344,-1.68164 -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.148565,-0.04428 0.291099,-0.0095 0.53125,0.189453 0.254361,0.210719 0.520623,0.555332 0.722656,0.839844 0.388512,0.547122 0.564085,0.853027 0.984375,1.261719 0.550791,0.711482 1.379595,0.989291 2.101563,0.820312 0.726883,-0.170128 1.337555,-0.786297 1.472656,-1.634765 l 0.002,-0.02149 0.002,-0.02148 c 0.131324,-1.8078 -0.526584,-3.4671495 -1.105468,-4.9902344 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 0.01924,-2.2270409 -0.318838,-4.3853298 -0.341797,-6.5078124 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" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

4
rtgui/cropwindow.cc
View File

@@ -1251,7 +1251,7 @@ void CropWindow::updateCursor (int x, int y)
if (onArea (CropObserved, x, y)) { if (onArea (CropObserved, x, y)) {
newType = CSMove; newType = CSMove;
} else { } else {
newType = CSOpenHand; newType = CSHandOpen;
} }
} else if (tm == TMSpotWB) { } else if (tm == TMSpotWB) {
newType = CSSpotWB; newType = CSSpotWB;
@@ -1284,7 +1284,7 @@ void CropWindow::updateCursor (int x, int y)
} else if (state == SCropMove || state == SCropWinMove || state == SObservedMove) { } else if (state == SCropMove || state == SCropWinMove || state == SObservedMove) {
newType = CSMove; newType = CSMove;
} else if (state == SHandMove || state == SCropImgMove) { } else if (state == SHandMove || state == SCropImgMove) {
newType = CSClosedHand; newType = CSHandClosed;
} else if (state == SResizeW1 || state == SResizeW2) { } else if (state == SResizeW1 || state == SResizeW2) {
newType = CSResizeWidth; newType = CSResizeWidth;
} else if (state == SResizeH1 || state == SResizeH2) { } else if (state == SResizeH1 || state == SResizeH2) {

24
rtgui/cursormanager.cc
View File

@@ -51,8 +51,9 @@ void CursorManager::init (Glib::RefPtr<Gdk::Window> mainWindow)
cAdd = Gdk::Cursor::create (display, Gdk::PLUS); cAdd = Gdk::Cursor::create (display, Gdk::PLUS);
cWait = Gdk::Cursor::create (display, Gdk::CLOCK); cWait = Gdk::Cursor::create (display, Gdk::CLOCK);
Glib::RefPtr<Gdk::Pixbuf> hand = RTImage::createFromFile ("crosshair-hicontrast.png"); Glib::RefPtr<Gdk::Pixbuf> crosshair = RTImage::createFromFile ("crosshair-hicontrast.png");
Glib::RefPtr<Gdk::Pixbuf> close_hand = RTImage::createFromFile ("hand-closed-hicontrast.png"); Glib::RefPtr<Gdk::Pixbuf> hand_open = RTImage::createFromFile ("hand-open-hicontrast.png");
Glib::RefPtr<Gdk::Pixbuf> hand_closed = RTImage::createFromFile ("hand-closed-hicontrast.png");
Glib::RefPtr<Gdk::Pixbuf> wbpick = RTImage::createFromFile ("color-picker-hicontrast.png"); Glib::RefPtr<Gdk::Pixbuf> wbpick = RTImage::createFromFile ("color-picker-hicontrast.png");
Glib::RefPtr<Gdk::Pixbuf> cpick = RTImage::createFromFile ("color-picker-add-hicontrast.png"); Glib::RefPtr<Gdk::Pixbuf> cpick = RTImage::createFromFile ("color-picker-add-hicontrast.png");
Glib::RefPtr<Gdk::Pixbuf> empty = RTImage::createFromFile ("empty.png"); Glib::RefPtr<Gdk::Pixbuf> empty = RTImage::createFromFile ("empty.png");
@@ -61,8 +62,9 @@ void CursorManager::init (Glib::RefPtr<Gdk::Window> mainWindow)
Glib::RefPtr<Gdk::Pixbuf> move1DV = RTImage::createFromFile ("node-move-y-hicontrast.png"); Glib::RefPtr<Gdk::Pixbuf> move1DV = RTImage::createFromFile ("node-move-y-hicontrast.png");
Glib::RefPtr<Gdk::Pixbuf> moveRotate = RTImage::createFromFile ("rotate-aroundnode-hicontrast.png"); Glib::RefPtr<Gdk::Pixbuf> moveRotate = RTImage::createFromFile ("rotate-aroundnode-hicontrast.png");
cHand = hand ? Gdk::Cursor::create (cAdd->get_display(), hand, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2); cCrosshair = crosshair ? Gdk::Cursor::create (cAdd->get_display(), crosshair, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2);
cClosedHand = close_hand ? Gdk::Cursor::create (cAdd->get_display(), close_hand, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2); cHandOpen = hand_open ? Gdk::Cursor::create (cAdd->get_display(), hand_open, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2);
cHandClosed = hand_closed ? Gdk::Cursor::create (cAdd->get_display(), hand_closed, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2);
cWB = wbpick ? Gdk::Cursor::create (cAdd->get_display(), wbpick, 4, 21) : Gdk::Cursor::create (cAdd->get_display(), Gdk::ARROW); cWB = wbpick ? Gdk::Cursor::create (cAdd->get_display(), wbpick, 4, 21) : Gdk::Cursor::create (cAdd->get_display(), Gdk::ARROW);
cAddPicker = cpick ? Gdk::Cursor::create (cAdd->get_display(), cpick, 4, 21) : Gdk::Cursor::create (cAdd->get_display(), Gdk::ARROW); cAddPicker = cpick ? Gdk::Cursor::create (cAdd->get_display(), cpick, 4, 21) : Gdk::Cursor::create (cAdd->get_display(), Gdk::ARROW);
cHidden = empty ? Gdk::Cursor::create (cAdd->get_display(), empty, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::FLEUR); cHidden = empty ? Gdk::Cursor::create (cAdd->get_display(), empty, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::FLEUR);
@@ -82,10 +84,12 @@ void CursorManager::setCursor (Glib::RefPtr<Gdk::Window> window, CursorShape sha
// set_cursor without any arguments to select system default // set_cursor without any arguments to select system default
{ {
window->set_cursor (); window->set_cursor ();
} else if (shape == CSOpenHand) { } else if (shape == CSCrosshair) {
window->set_cursor (cHand); window->set_cursor (cCrosshair);
} else if (shape == CSClosedHand) { } else if (shape == CSHandOpen) {
window->set_cursor (cClosedHand); window->set_cursor (cHandOpen);
} else if (shape == CSHandClosed) {
window->set_cursor (cHandClosed);
} else if (shape == CSMove) { } else if (shape == CSMove) {
window->set_cursor (cCropMove); window->set_cursor (cCropMove);
} else if (shape == CSResizeWidth) { } else if (shape == CSResizeWidth) {
@@ -115,13 +119,13 @@ void CursorManager::setCursor (Glib::RefPtr<Gdk::Window> window, CursorShape sha
} else if (shape == CSAddColPicker) { } else if (shape == CSAddColPicker) {
window->set_cursor (cAddPicker); window->set_cursor (cAddPicker);
} else if (shape == CSCropSelect) { } else if (shape == CSCropSelect) {
window->set_cursor (cHand); window->set_cursor (cCrosshair);
} else if (shape == CSMoveLeft) { } else if (shape == CSMoveLeft) {
window->set_cursor (cLeftTanMove); window->set_cursor (cLeftTanMove);
} else if (shape == CSMoveRight) { } else if (shape == CSMoveRight) {
window->set_cursor (cRightTanMove); window->set_cursor (cRightTanMove);
} else if (shape == CSStraighten) { } else if (shape == CSStraighten) {
window->set_cursor (cHand); window->set_cursor (cCrosshair);
} else if (shape == CSWait) { } else if (shape == CSWait) {
window->set_cursor (cWait); window->set_cursor (cWait);
} else if (shape == CSPlus) { } else if (shape == CSPlus) {

36
rtgui/cursormanager.h
View File

@@ -22,11 +22,32 @@
#include <gtkmm.h> #include <gtkmm.h>
enum CursorShape { enum CursorShape {
CSUndefined, CSArrow, CSOpenHand, CSClosedHand, CSMove, CSMoveLeft, CSUndefined,
CSMoveRight, CSResizeWidth, CSResizeHeight, CSResizeDiagonal, CSArrow,
CSResizeTopLeft, CSResizeTopRight, CSResizeBottomLeft, CSResizeBottomRight, CSCrosshair,
CSMove2D, CSMove1DH, CSMove1DV, CSMoveRotate, CSHandOpen,
CSSpotWB, CSAddColPicker, CSCropSelect, CSStraighten, CSPlus, CSWait, CSEmpty CSHandClosed,
CSMove,
CSMoveLeft,
CSMoveRight,
CSResizeWidth,
CSResizeHeight,
CSResizeDiagonal,
CSResizeTopLeft,
CSResizeTopRight,
CSResizeBottomLeft,
CSResizeBottomRight,
CSMove2D,
CSMove1DH,
CSMove1DV,
CSMoveRotate,
CSSpotWB,
CSAddColPicker,
CSCropSelect,
CSStraighten,
CSPlus,
CSWait,
CSEmpty
}; };
class CursorManager class CursorManager
@@ -48,8 +69,9 @@ private:
Glib::RefPtr<Gdk::Cursor> cCropSelection; Glib::RefPtr<Gdk::Cursor> cCropSelection;
Glib::RefPtr<Gdk::Cursor> cAdd; Glib::RefPtr<Gdk::Cursor> cAdd;
Glib::RefPtr<Gdk::Cursor> cWait; Glib::RefPtr<Gdk::Cursor> cWait;
Glib::RefPtr<Gdk::Cursor> cHand; Glib::RefPtr<Gdk::Cursor> cCrosshair;
Glib::RefPtr<Gdk::Cursor> cClosedHand; Glib::RefPtr<Gdk::Cursor> cHandOpen;
Glib::RefPtr<Gdk::Cursor> cHandClosed;
Glib::RefPtr<Gdk::Cursor> cWB; Glib::RefPtr<Gdk::Cursor> cWB;
Glib::RefPtr<Gdk::Cursor> cAddPicker; Glib::RefPtr<Gdk::Cursor> cAddPicker;
Glib::RefPtr<Gdk::Cursor> cHidden; Glib::RefPtr<Gdk::Cursor> cHidden;

2
rtgui/curveeditor.cc
View File

@@ -443,5 +443,5 @@ CursorShape CurveEditor::getCursor(const int objectID)
return CSResizeHeight; return CSResizeHeight;
} }
return CSOpenHand; return CSHandOpen;
} }

2
rtgui/edit.cc
View File

@@ -1140,7 +1140,7 @@ CursorShape EditDataProvider::getCursor(int objectID)
currSubscriber->getCursor(objectID); currSubscriber->getCursor(objectID);
} }
return CSOpenHand; return CSHandOpen;
} }
EditSubscriber* EditDataProvider::getCurrSubscriber() EditSubscriber* EditDataProvider::getCurrSubscriber()

2
rtgui/edit.h
View File

@@ -717,7 +717,7 @@ inline EditDataProvider* EditSubscriber::getEditProvider () {
} }
inline CursorShape EditSubscriber::getCursor (const int objectID) { inline CursorShape EditSubscriber::getCursor (const int objectID) {
return CSOpenHand; return CSHandOpen;
} }
inline bool EditSubscriber::mouseOver (const int modifierKey) { inline bool EditSubscriber::mouseOver (const int modifierKey) {

2
rtgui/gradient.cc
View File

@@ -346,7 +346,7 @@ CursorShape Gradient::getCursor(const int objectID)
return CSMove2D; return CSMove2D;
default: default:
return CSOpenHand; return CSHandOpen;
} }
} }

7
rtgui/previewwindow.cc
View File

@@ -230,8 +230,9 @@ bool PreviewWindow::on_motion_notify_event (GdkEventMotion* event)
mainCropWin->remoteMove ((event->x - press_x) / zoom, (event->y - press_y) / zoom); mainCropWin->remoteMove ((event->x - press_x) / zoom, (event->y - press_y) / zoom);
press_x = event->x; press_x = event->x;
press_y = event->y; press_y = event->y;
newType = CSHandClosed;
} else if (inside) { } else if (inside) {
newType = CSClosedHand; newType = CSHandOpen;
} else { } else {
newType = CSArrow; newType = CSArrow;
} }
@@ -262,8 +263,8 @@ bool PreviewWindow::on_button_press_event (GdkEventButton* event)
press_x = event->x; press_x = event->x;
press_y = event->y; press_y = event->y;
if (cursor_type != CSClosedHand) { if (cursor_type != CSHandClosed) {
cursor_type = CSClosedHand; cursor_type = CSHandClosed;
CursorManager::setWidgetCursor(get_window(), cursor_type); CursorManager::setWidgetCursor(get_window(), cursor_type);
} }
} }