From 5b96af47db19b878078b001f25514baf430ee264 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 12 Sep 2018 08:52:24 -0500 Subject: [PATCH] Add reticule-styled cursors --- mainwindow.cpp | 6 +++--- resources/icons/fill_color_cursor.ico | Bin 0 -> 4286 bytes resources/icons/pencil_cursor.ico | Bin 0 -> 4286 bytes resources/icons/pipette_cursor.ico | Bin 0 -> 4286 bytes resources/images.qrc | 3 +++ 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 resources/icons/fill_color_cursor.ico create mode 100644 resources/icons/pencil_cursor.ico create mode 100644 resources/icons/pipette_cursor.ico diff --git a/mainwindow.cpp b/mainwindow.cpp index e47eb792..65c36747 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -904,7 +904,7 @@ void MainWindow::on_toolButton_deleteObject_clicked() void MainWindow::on_toolButton_Paint_clicked() { editor->map_edit_mode = "paint"; - editor->cursor = QCursor(QPixmap(":/icons/pencil.ico"), 0, 14); + editor->cursor = QCursor(QPixmap(":/icons/pencil_cursor.ico"), 10, 10); ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); @@ -928,7 +928,7 @@ void MainWindow::on_toolButton_Select_clicked() void MainWindow::on_toolButton_Fill_clicked() { editor->map_edit_mode = "fill"; - editor->cursor = QCursor(QPixmap(":/icons/fill_color.ico"), 12, 10); + editor->cursor = QCursor(QPixmap(":/icons/fill_color_cursor.ico"), 10, 10); ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); @@ -940,7 +940,7 @@ void MainWindow::on_toolButton_Fill_clicked() void MainWindow::on_toolButton_Dropper_clicked() { editor->map_edit_mode = "pick"; - editor->cursor = QCursor(QPixmap(":/icons/pipette.ico"), 1, 14); + editor->cursor = QCursor(QPixmap(":/icons/pipette_cursor.ico"), 10, 10); ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); diff --git a/resources/icons/fill_color_cursor.ico b/resources/icons/fill_color_cursor.ico new file mode 100644 index 0000000000000000000000000000000000000000..712ab9926f9b13715c1d8077e84cca091fc24466 GIT binary patch literal 4286 zcmchZTTEMZ9LK*t`Cwv9OqOMv+F4+Tn@W}$qegxA$z&SCpg>Pst{Ve}6qwvB!pcRK zMU9E`!MJ4cvW#RiX2~|mM1j(B6C2kMnA3TU+1`90`TG4IEVL?%aHyyG^_>1r&-wiR zxAQr`9s0OjFyAy02TYcZ1<}!Zz3L-*$f3bN^Q?agEXY zV1&NxC8bCAobuPYJ~-jglcGIXMKR-W}jVyFK^^GtN_p+;2~J!(&x>bHvExt)&wg-HHTc=r zR;2ZKbShTo-j#)d!R!c2toQ=@DSyv&*LD?I(qAm8d~VW_E)NA@i;ll=JPI3sF% z(Ek#Dzj2+T7lwG@!}m27$9e9P6RdmemyGevob0Oev;AN(VurB{s`m?9b-fsRnJr}C=F%h5P7oUF2tI-kO`uPUUoOF8M^;~b}-A~^y8YbJS zJ?w4>m_tXNTkrLuT8pn8wruXPV8#E=Ppvl`tXh+=b^D(-`v(8=&s5Gvj^%I2Uy#2c ze?$I;{0;dV@;BsfGj8VjWp-u{`5W>#`wKHxrO@EuMdUqmOLt0+%502QnH4bbaLD7yecT02cr49eeW`J>PL;D~MN ze(~;E40aWvzs+m2^{j;a4fz}LH{@@d`Bw>)zv0h`+3Up0nsCe?X!D`3rOal_-;lo{ ze?$I;o}-Yz)A{aYzNx{4lfF0ChMOu84pu_`hWrir8}c{gZ^++}zcb4ZR^eFVGGG3N z{0;dV@;Bsf$ln@^<8}@5H}w9XzF+MF$L$wi&u8?!QepfJ`5W>#+}B3p(r4S?yEv_WzXn`}QYTii|)2 literal 0 HcmV?d00001 diff --git a/resources/icons/pencil_cursor.ico b/resources/icons/pencil_cursor.ico new file mode 100644 index 0000000000000000000000000000000000000000..1ff8d8fb6dd8f748d5d6e752f755d46d1ca38b11 GIT binary patch literal 4286 zcmd6pPe@cz6vjVk(Xwb^&_dk=xoBf;46LACgd(k4xs4JRu0$GU3{$fxp^VBzh!80# z3Ni-!2Sb5HmWc}qDhf(+BhjM3`ufhBcdu_oH#7QPJvr~(ci(yU`_7#=^Ao7hUri0{ zjIqr?C4e0YO<}*n=3_i|Y3*plD7A9wBdsTR@Mt%iF3$1r*=dGeRu;xI({gf{nH%>x zF#DS=6Xc%bR}=Mc=;k+$d?ByA`^D`e4JYei zcSnwmugHchxpR!H)*dA7p+5DD&9Bw>KlSkZzxB}2Hk8=+qCQo)4^?^}Diw9D*Aw?( z?_{ms$u0U`q;E|#)7hS=hsG)OEf1HTyyswl7qjDc*pX^W%tKvjlG)EcIB+V(nKv)l zf3BP3?e}>3*bDQJ$Z?^kliwE?*mF9=$$?2uq#y8hYN{-KvaH9@+neTmcAm4NZ~6Gl zOj(OKZI?^kyj=erAN7^3E!n*7;#{haXubFi@f+ed#P8@WKMsX01qQ+dmwjOw1MwT; zH^gs<-w?kGRxu5Q=~}WQxNq4-!2=~;h~E&uA$~*rhWHKf+iTb$6tz^)zmp25-DOEx z{D$}q@f+ed#BYe5zS%%D->cIOr-BshK}mwE6pP;wzoFksh~K_nmHK_R$4t@9g_nUR zySLUu{D$}q@!NZFjoRAb*yZT0wMzTv#jOGl`ai~h7S4hd=eJ=w`vulvu$l*JHZL2r z?Nyu)Ke0}OVh>UMs6<@)rr|u;J1Kq#pS$=C@!MO7Q{QiMeQQnphWHKf8{&7+Z4&z* z-B$4%;Mcbs2skwmS9K%z*nHu;y- zLQTsSO;9r`PLlKk(cdzn!bFxcFckGVnAk4kDGkkOJJ?ESAzTY{A`;15hKb4iD z-_o~PWQ&OGV6aQ}Ftp#}7V>!hQqzZ0sT7#-Up%Px&mZ%M$KwSL>LXCfu-jv*ozG7p z8jT_ri)noFdp#`6!t9sNn3;Zp$?=@=;im_!eSU5ZBX@22o@H8e+-`LK;7Bf z*neRN;fA7j#73`;Y(HS3W9%(1-FuC?eS_Z2GX##e z-3T|Oebo;)wbWEMB)A_5sP@idt?7cd^<4G6vNCU#u9Ye4dL~0l=GoeMDe|!5vE&?U z4XQTzEoA6gDPrsD#dUoZRc-QH$S@&COgPP~rSHrs_n!O~@>|GnA-_${reM2f+e1;m zJyfo=`MuUoehc}%yxttp^)@y%$@XCSoc%ghZqs$wddP1fzn4Uf^3tB$+C}}E?`9*n zj0f_Y9)^YgA-ErTqe&g(#;NDFzRs;4$Zt^(-Tkl()Rs|WI1$ZsLP zh5R-i$Zs85ZeFba^5ncBzlHo3@>|GnA-{$E7V=xjZ}sF%cm1CH7V=xjZy~>h{1)@M1BkTE#$Y5-_%d~s!x6k`7PwPkl#Xv`l?TUb1xDmRGa*EMIU&;W3-L2 wfpMOZ(KyH04ZPn3%rbs47At^1cHkkCmf{`nF8+(fdS+KLn^$K)G;fvm7x-#{I{*Lx literal 0 HcmV?d00001 diff --git a/resources/images.qrc b/resources/images.qrc index 59c14728..fcee557f 100755 --- a/resources/images.qrc +++ b/resources/images.qrc @@ -17,5 +17,8 @@ icons/delete.ico icons/viewsprites.ico images/collisions.png + icons/fill_color_cursor.ico + icons/pencil_cursor.ico + icons/pipette_cursor.ico