From 3e731f52cfd35364e9516d09d00b61dd6fdc1919 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Tue, 20 Nov 2012 20:10:33 +0000 Subject: [PATCH] Removed unnecessary graphic files, updated tool palette. --- Makefile | 35 ++++--------- res/cur1.xpm | 38 -------------- res/cur2.xpm | 38 -------------- res/cur3.xpm | 38 -------------- res/cur4.xpm | 38 -------------- res/cur5.xpm | 38 -------------- res/cur6.xpm | 38 -------------- res/cur7.xpm | 38 -------------- res/cur8.xpm | 38 -------------- res/{cursor6.png => cursor-add-point.png} | Bin res/{cursor7.png => cursor-add-poly.png} | Bin res/{cursor8.png => cursor-del-point.png} | Bin res/{cursor9.png => cursor-del-poly.png} | Bin res/cursor-rotate.png | Bin 0 -> 374 bytes res/{cursor3.png => cursor-scroll.png} | Bin res/{cursor2.png => cursor-select-poly.png} | Bin res/{cursor1.png => cursor-select.png} | Bin res/{cursor4.png => cursor-zoom.png} | Bin res/cursor5.png | Bin 259 -> 0 bytes res/tool1.xpm | 21 -------- res/tool2.xpm | 21 -------- res/tool3.xpm | 22 -------- res/toolpal1.png | Bin 694 -> 953 bytes res/toolpal1.xpm | 53 -------------------- src/editwindow.cpp | 10 ++-- src/editwindow.h | 2 +- src/mainwindow.cpp | 23 --------- src/toolwindow.cpp | 15 +++--- src/toolwindow.h | 5 +- ttedit.qrc | 18 +++---- 30 files changed, 38 insertions(+), 491 deletions(-) delete mode 100755 res/cur1.xpm delete mode 100755 res/cur2.xpm delete mode 100755 res/cur3.xpm delete mode 100755 res/cur4.xpm delete mode 100755 res/cur5.xpm delete mode 100755 res/cur6.xpm delete mode 100755 res/cur7.xpm delete mode 100755 res/cur8.xpm rename res/{cursor6.png => cursor-add-point.png} (100%) rename res/{cursor7.png => cursor-add-poly.png} (100%) rename res/{cursor8.png => cursor-del-point.png} (100%) rename res/{cursor9.png => cursor-del-poly.png} (100%) create mode 100644 res/cursor-rotate.png rename res/{cursor3.png => cursor-scroll.png} (100%) rename res/{cursor2.png => cursor-select-poly.png} (100%) rename res/{cursor1.png => cursor-select.png} (100%) rename res/{cursor4.png => cursor-zoom.png} (100%) delete mode 100644 res/cursor5.png delete mode 100755 res/tool1.xpm delete mode 100755 res/tool2.xpm delete mode 100755 res/tool3.xpm delete mode 100755 res/toolpal1.xpm diff --git a/Makefile b/Makefile index d5dcd62..315a073 100755 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: ttedit -# Generated by qmake (2.01a) (Qt 4.8.3) on: Sat Nov 17 12:34:10 2012 +# Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Nov 19 18:59:51 2012 # Project: ttedit.pro # Template: app # Command: /usr/bin/qmake -o Makefile ttedit.pro @@ -229,21 +229,21 @@ compiler_rcc_make_all: obj/qrc_ttedit.cpp compiler_rcc_clean: -$(DEL_FILE) obj/qrc_ttedit.cpp obj/qrc_ttedit.cpp: ttedit.qrc \ - res/cursor3.png \ + res/cursor-zoom.png \ res/toolpal1.xpm \ - res/cursor5.png \ - res/cursor1.png \ + res/cursor-add-point.png \ + res/cursor-del-poly.png \ res/toolpal1.png \ + res/cursor-add-poly.png \ + res/cursor-rotate.png \ res/act-back.png \ res/ttedit.png \ - res/cursor6.png \ - res/cursor8.png \ - res/cursor7.png \ + res/cursor-del-point.png \ + res/cursor-select-poly.png \ res/act-charwin.png \ res/act-forward.png \ - res/cursor2.png \ - res/cursor9.png \ - res/cursor4.png + res/cursor-select.png \ + res/cursor-scroll.png /usr/bin/rcc -name ttedit ttedit.qrc -o obj/qrc_ttedit.cpp compiler_image_collection_make_all: obj/qmake_image_collection.cpp @@ -273,20 +273,7 @@ obj/mainwindow.o: src/mainwindow.cpp src/mainwindow.h \ src/types.h \ src/editwindow.h \ src/toolwindow.h \ - src/ttedit.h \ - src/debug.h \ - res/cur1.xpm \ - res/cur2.xpm \ - res/cur3.xpm \ - res/cur4.xpm \ - res/cur5.xpm \ - res/cur6.xpm \ - res/cur7.xpm \ - res/cur8.xpm \ - res/ttedit.xpm \ - res/tool1.xpm \ - res/tool2.xpm \ - res/tool3.xpm + src/ttedit.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/mainwindow.o src/mainwindow.cpp obj/editwindow.o: src/editwindow.cpp src/editwindow.h \ diff --git a/res/cur1.xpm b/res/cur1.xpm deleted file mode 100755 index 20b4cac..0000000 --- a/res/cur1.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -static const char *cur1_xpm[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -".#..............................", -"#a#.............................", -"#aa#............................", -"#aaa#...........................", -"#aaaa#..........................", -"#aaaaa#.........................", -"#aaaaaa#........................", -"#aaaaaaa#.......................", -"#aaaaaaaa#......................", -"#aaaaaaaaa#.....................", -"#aaaaaaaaaa#....................", -"#aaaaaa####.....................", -"#aaaaaa#........................", -"#aa##aaa#.......................", -"#a#.#aaa#.......................", -".#...#aaa#......................", -".....#aaa#......................", -"......#a#.......................", -".......#........................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; diff --git a/res/cur2.xpm b/res/cur2.xpm deleted file mode 100755 index a966a26..0000000 --- a/res/cur2.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -static const char *cur2_xpm[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -".#..............................", -"#a#.............................", -"#aa#............................", -"#aaa#...........................", -"#aaaa#..........................", -"#aaaaa#.........................", -"#aaaaaa#........................", -"#aaaaaaa#.......................", -"#aaaaaaaa#......................", -"#aaaaaaaaa#.....................", -"#aaaaaaaaaa#....................", -"#aaaaaa####.....................", -"#aaaaaa#........................", -"#aa##aaa#..#######..............", -"#a#.#aaa#..#aaaaaa#.............", -".#...#aaa#.#aaaaaaa#............", -".....#aaa#.#aa###aa#............", -"......#a#..#aa#.#aa#............", -".......#...#aa###aa#............", -"...........#aaaaaaa#............", -"...........#aaaaaa#.............", -"...........#aa####..............", -"...........#aa#.................", -"...........#aa#.................", -"...........####.................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; diff --git a/res/cur3.xpm b/res/cur3.xpm deleted file mode 100755 index f842d8f..0000000 --- a/res/cur3.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -static const char *cur3_xpm[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -"...........##...................", -"..........#aa#..................", -"..........#aa#..................", -".........#aaaa#.................", -".........#aaaa#.................", -"........#aaaaaa#................", -"......###a#aa#a###..............", -"......#a###aa###a#..............", -".....####.#aa#.####.............", -"...##aa#..#aa#..#aa##...........", -".##aaa####a##a####aaa##.........", -"#aaaaaaaaa#aa#aaaaaaaaa#........", -"#aaaaaaaaa#aa#aaaaaaaaa#........", -".##aaa####a##a####aaa##.........", -"...##aa#..#aa#..#aa##...........", -".....####.#aa#.####.............", -"......#a###aa###a#..............", -"......###a#aa#a###..............", -"........#aaaaaa#................", -"........#aaaaa#.................", -".........#aaaa#.................", -"..........#aa#..................", -"..........#aa#..................", -"...........##...................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; diff --git a/res/cur4.xpm b/res/cur4.xpm deleted file mode 100755 index f34992b..0000000 --- a/res/cur4.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -static const char *cur4_xpm[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -"..####..........................", -"..#aa#..........................", -"###aa###........................", -"#aaaaaa#........................", -"#aaaaaa#........................", -"###aa###........................", -"..#aa#........###...............", -"..####......##aaa##.............", -"..#aa#.....#aa###aa#............", -"..#aa#....#aa##..#aa#...........", -".#aaaa#...#a##a#..#a#...........", -".#aaaa#..#a##a#....#a#..........", -"#aaaaaa#.#a#a#.....#a#..........", -"#a#aa#a#.#a#a#.....#a#..........", -".##aa##..#a##......#a#..........", -"..#aa#...#a#.......#a#..........", -"..#aa#....#a#.....#a#...........", -"..#aa#....#aa#...#aa#...........", -"..#aa#.....#aa###aaa#...........", -".##aa##.....##aaa###a#..........", -"#a#aa#a#......###...#a##........", -"#aaaaaa#.............#aa#.......", -".#aaaa#..............#aaa#......", -".#aaaa#...............#aaa#.....", -"..#aa#.................#aaa#....", -"..#aa#..................#a#.....", -"...##....................#......", -"########........................", -"#aaaaaa#........................", -"#aaaaaa#........................", -"########........................", -"................................"}; diff --git a/res/cur5.xpm b/res/cur5.xpm deleted file mode 100755 index e13a52e..0000000 --- a/res/cur5.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -static const char *cur5_xpm[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -".#..............................", -"#a#.............................", -"#aa#............................", -"#aaa#...........................", -"#aaaa#..........................", -"#aaaaa#.........................", -"#aaaaaa#........................", -"#aaaaaaa#.......................", -"#aaaaaaaa#......................", -"#aaaaaaaaa#...#.................", -"#aaaaaaaaaa#.#a#................", -"#aaaaaa####.##a##...............", -"#aaaaaa#...#aaaaa#..............", -"#aa##aaa#...##a##...............", -"#a#.#aaa#....#a#................", -".#...#aaa#...####...............", -".....#aaa#..#aaaa#..............", -"......#a#..#aaaaaa#.............", -".......#...#aa##aa#.............", -"...........#aa##aa#.............", -"...........#aaaaaa#.............", -"............#aaaa#..............", -".............####...............", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; diff --git a/res/cur6.xpm b/res/cur6.xpm deleted file mode 100755 index b6ae043..0000000 --- a/res/cur6.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -static const char *cur6_xpm[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -".#..............................", -"#a#.............................", -"#aa#............................", -"#aaa#...........................", -"#aaaa#..........................", -"#aaaaa#......#..................", -"#aaaaaa#....#a#.................", -"#aaaaaaa#..##a##................", -"#aaaaaaaa##aaaaa#...............", -"#aaaaaaaaa###a##................", -"#aaaaaaaaaa##a#.................", -"#aaaaaa####..#.##...............", -"#aaaaaa#......#aa#..............", -"#aa##aaa#....#aaaa#.............", -"#a#.#aaa#....#aaaa#.............", -".#...#aaa#..#aa##aa#............", -".....#aaa#..#aa##aa#............", -"......#a#..#aa#..#aa#...........", -".......#...#aa#..#aa#...........", -"..........#aa######aa#..........", -"..........#aaaaaaaaaa#..........", -"...........#aaaaaaaa#...........", -"............########............", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; diff --git a/res/cur7.xpm b/res/cur7.xpm deleted file mode 100755 index 7271575..0000000 --- a/res/cur7.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -static const char *cur7_xpm[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -".#..............................", -"#a#.............................", -"#aa#............................", -"#aaa#...........................", -"#aaaa#..........................", -"#aaaaa#.........................", -"#aaaaaa#........................", -"#aaaaaaa#.......................", -"#aaaaaaaa#......................", -"#aaaaaaaaa#.....................", -"#aaaaaaaaaa#....................", -"#aaaaaa####.#####...............", -"#aaaaaa#...#aaaaa#..............", -"#aa##aaa#...#####...............", -"#a#.#aaa#.......................", -".#...#aaa#...####...............", -".....#aaa#..#aaaa#..............", -"......#a#..#aaaaaa#.............", -".......#...#aa##aa#.............", -"...........#aa##aa#.............", -"...........#aaaaaa#.............", -"............#aaaa#..............", -".............####...............", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; diff --git a/res/cur8.xpm b/res/cur8.xpm deleted file mode 100755 index 9ac8f5a..0000000 --- a/res/cur8.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -static const char *cur8_xpm[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -".#..............................", -"#a#.............................", -"#aa#............................", -"#aaa#...........................", -"#aaaa#..........................", -"#aaaaa#.........................", -"#aaaaaa#........................", -"#aaaaaaa#..#####................", -"#aaaaaaaa##aaaaa#...............", -"#aaaaaaaaa######................", -"#aaaaaaaaaa#....................", -"#aaaaaa####....##...............", -"#aaaaaa#......#aa#..............", -"#aa##aaa#....#aaaa#.............", -"#a#.#aaa#....#aaaa#.............", -".#...#aaa#..#aa##aa#............", -".....#aaa#..#aa##aa#............", -"......#a#..#aa#..#aa#...........", -".......#...#aa#..#aa#...........", -"..........#aa######aa#..........", -"..........#aaaaaaaaaa#..........", -"...........#aaaaaaaa#...........", -"............########............", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; diff --git a/res/cursor6.png b/res/cursor-add-point.png similarity index 100% rename from res/cursor6.png rename to res/cursor-add-point.png diff --git a/res/cursor7.png b/res/cursor-add-poly.png similarity index 100% rename from res/cursor7.png rename to res/cursor-add-poly.png diff --git a/res/cursor8.png b/res/cursor-del-point.png similarity index 100% rename from res/cursor8.png rename to res/cursor-del-point.png diff --git a/res/cursor9.png b/res/cursor-del-poly.png similarity index 100% rename from res/cursor9.png rename to res/cursor-del-poly.png diff --git a/res/cursor-rotate.png b/res/cursor-rotate.png new file mode 100644 index 0000000000000000000000000000000000000000..80dd32a6c3465324f65b2440039f567d50daa1c1 GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwITUdz-F#`et*QI?9IMa5wvS0eukt!+{^ zf9dsDFEHWsnaz=@+4IZK@H9u>l|PyuzlH|!>(sTQ}|^d~;{e~wT7$h3`5`z%w( S*?GVaV(@hJb6Mw<&;$U&Y?uoG literal 0 HcmV?d00001 diff --git a/res/cursor3.png b/res/cursor-scroll.png similarity index 100% rename from res/cursor3.png rename to res/cursor-scroll.png diff --git a/res/cursor2.png b/res/cursor-select-poly.png similarity index 100% rename from res/cursor2.png rename to res/cursor-select-poly.png diff --git a/res/cursor1.png b/res/cursor-select.png similarity index 100% rename from res/cursor1.png rename to res/cursor-select.png diff --git a/res/cursor4.png b/res/cursor-zoom.png similarity index 100% rename from res/cursor4.png rename to res/cursor-zoom.png diff --git a/res/cursor5.png b/res/cursor5.png deleted file mode 100644 index f6e85fe49a9e0a3369e0f7ca0a8df9f8f4a24b46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Y)RhkE({MD z0vG~bD``Eqvo3EX*n-Clz9Btn7LE($qPT0vW>P{x>+#|^BcsJpV<{>S!Rq3ipspdrw7W4-;P|6yGKw)=0#i$>SXA;uy>~aHRBT-> y{_&&JHo<#snN$D&oS*R0ereFk5Ur^pR*Y|XV?OQJJ*N-o90pHUKbLh*2~7a$6j9;; diff --git a/res/tool1.xpm b/res/tool1.xpm deleted file mode 100755 index 214f4f8..0000000 --- a/res/tool1.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char * tool1_xpm[] = { -"16 15 3 1", -" c None", -". c #A0A0A0", -"+ c #000000", -" ", -" ", -" ", -" ", -" ++ ", -" ++ ", -" ++++ ", -" ++++++++++++++ ", -" ++++ ", -" ++ ", -" ++ ", -" ", -" ", -" ", -" "}; diff --git a/res/tool2.xpm b/res/tool2.xpm deleted file mode 100755 index 465c680..0000000 --- a/res/tool2.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char * tool2_xpm[] = { -"16 15 3 1", -" c None", -". c #C0C0C0", -"+ c #000000", -" ", -" ", -" ", -" ", -" ++ ", -" ++ ", -" ++++ ", -" ++++++++++++++ ", -" ++++ ", -" ++ ", -" ++ ", -" ", -" ", -" ", -" "}; diff --git a/res/tool3.xpm b/res/tool3.xpm deleted file mode 100755 index 397668e..0000000 --- a/res/tool3.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char * tool3_xpm[] = { -"16 15 3 1", -" c None", -". c #C0C0C0", -"+ c #000000", -"++++++++++++++++", -"+ +", -"+ ++++++++ +", -"+ ++++++++++ +", -"+ ++ ++ +", -"+ ++ +", -"+ +++++++++ +", -"+ ++++++++++ +", -"+ ++ ++ +", -"+ ++ ++ +", -"+ ++ +++ +", -"+ ++++++++++ +", -"+ ++++++ ++ +", -"+ +", -"++++++++++++++++"}; - diff --git a/res/toolpal1.png b/res/toolpal1.png index 1abc5b7001250e38086fdf4625f9bdb6893aa682..54ca026c5d06a84e4e830609af43cd8c3a894778 100644 GIT binary patch delta 899 zcmV-}1AP3p1-S>17YaxS1^@s631{$QkuETQ+zS&H01S;uEPVg~14cp|t?s?-=lD8WgMa{WgsJXpjSyPrG%|NNs{fB_3A zrGywGE5Z*?=RfD4D5iKT#Td=4DN+5Q6A!QnIso^CHH5@H{v-HO%CAeo@=jVpyWO&X zYQfi8QXM;30k|22Hh^M^Jg>@&!kR&@bJHp!CvX!$)sO-nn?T7ZN=xOhH%dKwM=3_4Ex-8R*Q@XVIAW5>d3 zp>Vhg4A{@#5dH}|5F|)qCy(Vx5!NVwBjJo;y?Ow;uB7d5R#^&19B4t{P9RomoPm%q z!soVvkp{hmAo5D#BLua&)5%4qnzQ60-ewK6_2e%J$l|>HNYYXv=7;9z`MU)uQ*sfw z3vw6adZ=sx-nXO2-(!FW;lG-}vB!kvBmMj=t|UvsUrm-Pm|~w91><_(zxM-w8RL~M z2)b)q|BrGa2I0Rtam!R~;y#dX7sYW}Rcj~|FzOgH;Ai~Ft%)~uwm~}_B*)l3l7yNt zm-a)=+af_NjvNEt-Xd};@S6$3vjBCg6_6@nDRjS15O1;76|v)vpuL+n0pE6TK<1sO zNZt?&qzW;}_n{zUPIKba{x;Wt#?}RpJRH-(Mgb2p_iSB5clkow)2RTj-UV2Jpppeq zTMVrfVyy+Q(sTB<6fF>>cuPM&`;MOnXeSE6k0k9BVt#0Tp1)gwGIsHIDe-b6WkkT`a9*|M|XN0N3dzz@yO^LGnS ZrXQ8mbEwsohSdN7002ovPDHLkV1g#^rNsaM delta 638 zcmV-^0)hRx2et)}7Z)%H1^@s6?iPQ~00001b5ch_0Itp)>5(BYf7t^J0u?uSAGKNl z00K5iL_t(|+U;9GlEfegRLlQ=**&@Cx`{T30TZm6!(@_HX%GlZ3?Y=@Lv7^tODQs3 z#27EHJN|$C=oVnW0!k?%#wf~g#dQ2Je&U$osUyZ{ZcmAO9{P|WHlY(pFIYoJ((_lr zmr{O@6e@Po658pOf7J@Ujgng5Axgl>B=ioHDkN1Oa5@Qh(aQ=6vxta-op&r?6;C1& zYC}jwP?Gy$XTp|9Sh;6rVWVrvo@RLgMK;OO@zLW|r>3QyW-VZcK%_7$&Xq=^*U)+T zXZuhW!OWJmW5vQ+p-3DR6te4g1V5n@Ax@IIcq%4GSa%VLf20q)$_LPWCGF#87Ntn| zfu02E0AjYs5ebPRd}%AV)1bEuL|!R;WS~~}ba0Wm=Dc$gZ?lHce)5+DWO3bIlC+eF zdC~lNe76AQkz53R1o;u@kt@L$c4c*jJ=*?s@WuOv&tpDk9(nNsh$ zbH?p^|Emu&f5$72AoQ(m`x~bshTzXCZkel1(gpc`QxesxRzp$3xO0q%AK|lG6Hn-D zLpvOH&aqsQL`_&q`%&|@I8cjY`+&E%h&<)^%{bwagF4j;SefuHcE3K5(_*PBV&ynO zdpA!azVF~b)}6Rap5P01C1S|)C<$58oFuiskF}|JTmce?Q##l<EZyD2Ur)XeANrEqE55i?^j{k+2JU_x+=1ydIz(C|vpeE> 2)); - QPoint pt(sizeStamp.x() * (prevTool % 5), sizeStamp.y() * (prevTool / 5)); + QPoint pt(sizeStamp.x() * (prevTool % 4), sizeStamp.y() * (prevTool / 4)); p.drawImage(pt.x(), pt.y(), img, pt.x(), pt.y(), sizeStamp.x(), sizeStamp.y()); } } @@ -77,11 +78,11 @@ ToolType ToolWindow::FindSelectedTool(void) ToolType newTool = TOOLNone; // NOTE: This works because x and y are UNSIGNED - if (x < 5 && y < 2) - newTool = (ToolType)((y * 5) + x); + if (x < 4 && y < 3) + newTool = (ToolType)((y * 4) + x); - // We don't have 10 yet, so fix this if the user selected the blank space - if (newTool == 9) + // We don't have 11 yet, so fix this if the user selected the blank space + if (newTool > 9) newTool = TOOLNone; return newTool; diff --git a/src/toolwindow.h b/src/toolwindow.h index 27a0cb3..323b563 100755 --- a/src/toolwindow.h +++ b/src/toolwindow.h @@ -18,11 +18,12 @@ enum ToolType { TOOLPolySelect, // Polygon selection tool TOOLScroll, // Scroll window tool TOOLZoom, // Zoom window tool - TOOLRotate, // Rotate tool TOOLAddPt, // Add point tool TOOLAddPoly, // Polygon creation tool TOOLDelPt, // Delete point tool - TOOLDelPoly // Delete polygon tool + TOOLDelPoly, // Delete polygon tool + TOOLRotate, // Rotate tool + TOOLRotatePoly // ROtate polygon around centroid tool }; class ToolWindow: public QWidget diff --git a/ttedit.qrc b/ttedit.qrc index 27c4f83..13b9131 100644 --- a/ttedit.qrc +++ b/ttedit.qrc @@ -1,14 +1,14 @@ - res/cursor1.png - res/cursor2.png - res/cursor3.png - res/cursor4.png - res/cursor5.png - res/cursor6.png - res/cursor7.png - res/cursor8.png - res/cursor9.png + res/cursor-select.png + res/cursor-select-poly.png + res/cursor-scroll.png + res/cursor-zoom.png + res/cursor-add-point.png + res/cursor-add-poly.png + res/cursor-del-point.png + res/cursor-del-poly.png + res/cursor-rotate.png res/act-back.png res/act-forward.png res/act-charwin.png -- 2.37.2