From f5f763d32c15679ed60aedb95955a0770823549b Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 11 Sep 2018 20:52:57 -0400 Subject: [PATCH 1/4] add move drag mode with changing cursor --- editor.cpp | 2 + editor.h | 3 ++ mainwindow.cpp | 83 +++++++++++++++++++++++++++++++++++++++ mainwindow.h | 9 +++++ mainwindow.ui | 76 +++++++++++++++++++++++++++++------ map.cpp | 5 ++- map.h | 3 ++ resources/icons/move.ico | Bin 0 -> 1150 bytes resources/images.qrc | 1 + 9 files changed, 167 insertions(+), 15 deletions(-) create mode 100644 resources/icons/move.ico diff --git a/editor.cpp b/editor.cpp index 962907d9..a3652d10 100755 --- a/editor.cpp +++ b/editor.cpp @@ -1484,9 +1484,11 @@ void MapPixmapItem::updateCurHoveredTile(QPointF pos) { void MapPixmapItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { updateCurHoveredTile(event->pos()); + setCursor(editor->cursor); } void MapPixmapItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { map->clearHoveredTile(); + unsetCursor(); } void MapPixmapItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { QPointF pos = event->pos(); diff --git a/editor.h b/editor.h index 863b096f..0bc22ddb 100755 --- a/editor.h +++ b/editor.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "project.h" #include "ui_mainwindow.h" @@ -108,6 +109,8 @@ public: QList *copiedMetatileSelection = new QList; QString map_edit_mode; + QString prev_edit_mode; + QCursor cursor; void objectsView_onMousePress(QMouseEvent *event); void objectsView_onMouseMove(QMouseEvent *event); diff --git a/mainwindow.cpp b/mainwindow.cpp index b9979dc3..e47eb792 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -17,6 +17,8 @@ #include #include #include +#include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -31,6 +33,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->newEventToolButton, SIGNAL(newEventAdded(QString)), this, SLOT(addNewEvent(QString))); new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Z), this, SLOT(redo())); + new QShortcut(Qt::Key_M, this, SLOT(toggleEditModeMove())); editor = new Editor(ui); connect(editor, SIGNAL(objectsChanged()), this, SLOT(updateSelectedObjects())); @@ -589,6 +592,31 @@ void MainWindow::on_actionRedo_triggered() redo(); } +void MainWindow::on_actionZoom_In_triggered() { + scaleMapView(1); +} + +void MainWindow::on_actionZoom_Out_triggered() { + scaleMapView(-1); +} + +void MainWindow::scaleMapView(int s) { + editor->map->scale_exp += s; + + double base = (double)editor->map->scale_base; + double exp = editor->map->scale_exp; + double sfactor = pow(base,s); + + ui->graphicsView_Map->scale(sfactor,sfactor); + ui->graphicsView_Objects_Map->scale(sfactor,sfactor); + + ui->graphicsView_Map->setFixedSize((editor->scene->width() + 2) * pow(base,exp), + (editor->scene->height() + 2) * pow(base,exp)); + + ui->graphicsView_Objects_Map->setFixedSize((editor->scene->width() + 2) * pow(base,exp), + (editor->scene->height() + 2) * pow(base,exp)); +} + void MainWindow::addNewEvent(QString event_type) { if (editor) { @@ -876,24 +904,60 @@ 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); + + ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); + ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + QScroller::ungrabGesture(ui->scrollArea); + checkToolButtons(); } void MainWindow::on_toolButton_Select_clicked() { editor->map_edit_mode = "select"; + editor->cursor = QCursor(QPixmap(":/icons/cursor.ico"), 0, 0); + + ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); + ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + QScroller::ungrabGesture(ui->scrollArea); + checkToolButtons(); } void MainWindow::on_toolButton_Fill_clicked() { editor->map_edit_mode = "fill"; + editor->cursor = QCursor(QPixmap(":/icons/fill_color.ico"), 12, 10); + + ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); + ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + QScroller::ungrabGesture(ui->scrollArea); + checkToolButtons(); } void MainWindow::on_toolButton_Dropper_clicked() { editor->map_edit_mode = "pick"; + editor->cursor = QCursor(QPixmap(":/icons/pipette.ico"), 1, 14); + + ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); + ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + QScroller::ungrabGesture(ui->scrollArea); + + checkToolButtons(); +} + +void MainWindow::on_toolButton_Move_clicked() +{ + editor->map_edit_mode = "move"; + editor->cursor = QCursor(QPixmap(":/icons/move.ico"), 7, 7); + + ui->scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + QScroller::grabGesture(ui->scrollArea, QScroller::LeftMouseButtonGesture); + checkToolButtons(); } @@ -902,6 +966,25 @@ void MainWindow::checkToolButtons() { ui->toolButton_Select->setChecked(editor->map_edit_mode == "select"); ui->toolButton_Fill->setChecked(editor->map_edit_mode == "fill"); ui->toolButton_Dropper->setChecked(editor->map_edit_mode == "pick"); + ui->toolButton_Move->setChecked(editor->map_edit_mode == "move"); +} + +void MainWindow::toggleEditModeMove() { + if (editor->map_edit_mode == "move") { + if (editor->prev_edit_mode == "paint") { + on_toolButton_Paint_clicked(); + } else if (editor->prev_edit_mode == "fill") { + on_toolButton_Fill_clicked(); + } else if (editor->prev_edit_mode == "pick") { + on_toolButton_Dropper_clicked(); + } else if (editor->prev_edit_mode == "select") { + on_toolButton_Select_clicked(); + } + } + else { + editor->prev_edit_mode = editor->map_edit_mode; + on_toolButton_Move_clicked(); + } } void MainWindow::onLoadMapRequested(QString mapName, QString fromMapName) { diff --git a/mainwindow.h b/mainwindow.h index b8a12f8b..d6509a50 100755 --- a/mainwindow.h +++ b/mainwindow.h @@ -37,6 +37,8 @@ private slots: void undo(); void redo(); + void toggleEditModeMove(); + void onLoadMapRequested(QString, QString); void onMapChanged(Map *map); void onMapNeedsRedrawing(Map *map); @@ -58,6 +60,9 @@ private slots: void on_actionRedo_triggered(); + void on_actionZoom_In_triggered(); + void on_actionZoom_Out_triggered(); + void on_toolButton_deleteObject_clicked(); void addNewEvent(QString); @@ -71,6 +76,8 @@ private slots: void on_toolButton_Dropper_clicked(); + void on_toolButton_Move_clicked(); + void onOpenMapListContextMenu(const QPoint &point); void onAddNewMapToGroupClick(QAction* triggeredAction); void onTilesetChanged(QString); @@ -124,6 +131,8 @@ private: void displayMapProperties(); void checkToolButtons(); + + void scaleMapView(int); }; enum MapListUserRoles { diff --git a/mainwindow.ui b/mainwindow.ui index f3f19222..ad6b7925 100755 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -245,6 +245,23 @@ + + + + <html><head/><body><p>Move</p><p>Click to drag map around.</p></body></html> + + + ... + + + + :/icons/move.ico:/icons/move.ico + + + true + + + @@ -334,8 +351,8 @@ 0 0 - 429 - 620 + 492 + 599 @@ -362,9 +379,18 @@ 0 + + false + false + + QAbstractScrollArea::AdjustIgnored + + + QGraphicsView::NoDrag + @@ -708,7 +734,7 @@ 0 0 - 315 + 222 86 @@ -812,10 +838,10 @@ - 0 + 8 0 - 365 - 405 + 293 + 368 @@ -1050,8 +1076,8 @@ 0 0 - 381 - 657 + 371 + 643 @@ -1216,8 +1242,8 @@ 0 0 - 420 - 584 + 410 + 560 @@ -1849,8 +1875,8 @@ 0 0 - 826 - 557 + 818 + 539 @@ -2022,7 +2048,7 @@ 0 0 1117 - 21 + 22 @@ -2044,8 +2070,16 @@ + + + View + + + + + @@ -2104,6 +2138,22 @@ Export Map Image... + + + Zoom In + + + + + + + + + Zoom Out + + + - + + diff --git a/map.cpp b/map.cpp index f114884f..626724f2 100755 --- a/map.cpp +++ b/map.cpp @@ -608,10 +608,11 @@ bool Map::hasUnsavedChanges() { } void Map::hoveredTileChanged(int x, int y, int block) { - emit statusBarMessage(QString("X: %1, Y: %2, Metatile: 0x%3") + emit statusBarMessage(QString("X: %1, Y: %2, Metatile: 0x%3, Scale = %4x") .arg(x) .arg(y) - .arg(QString("%1").arg(block, 3, 16, QChar('0')).toUpper())); + .arg(QString("%1").arg(block, 3, 16, QChar('0')).toUpper()) + .arg(QString::number(pow(this->scale_base,this->scale_exp)))); } void Map::clearHoveredTile() { diff --git a/map.h b/map.h index 82e70675..550e6a9b 100755 --- a/map.h +++ b/map.h @@ -9,6 +9,7 @@ #include #include #include +#include class HistoryItem { public: @@ -134,6 +135,8 @@ public: QString show_location; QString battle_scene; MapLayout *layout; + int scale_exp = 0; + double scale_base = sqrt(2); // adjust scale factor with this bool isPersistedToFile = true; diff --git a/resources/icons/move.ico b/resources/icons/move.ico new file mode 100644 index 0000000000000000000000000000000000000000..1d2474018e984fc151bb21044c5cba022e77e6f5 GIT binary patch literal 1150 zcmb7Bu}Z{H5S#;hud>zBK7|khwg)Nl1xcq^`3s7I*!d+MXlrjFL9r8$6e1!XqLvoo zb0+updBxV39-HC9;|8RW2-Z7_yc}d+VFVq6XVqQ zfBcWE-O8h*NZjkLj1AcR+q~b$o4k4>)Afn!ktB)B^SpkeK3>ztajbbY|Cyhu)BN(& z^Db|&gE7A!YGSsR`Mt=yfS2#ayaBH{4ukJS{*$)XJc_Ix5O+kw&+jR56l(vsAIre&22gU${lTwN Nxj5CNkyajge*iccQeOZ7 literal 0 HcmV?d00001 diff --git a/resources/images.qrc b/resources/images.qrc index dfca147d..59c14728 100755 --- a/resources/images.qrc +++ b/resources/images.qrc @@ -9,6 +9,7 @@ icons/map.ico icons/cursor.ico icons/fill_color.ico + icons/move.ico icons/pencil.ico icons/pipette.ico images/Entities_16x16.png From 5b96af47db19b878078b001f25514baf430ee264 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 12 Sep 2018 08:52:24 -0500 Subject: [PATCH 2/4] 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 From ece612a86550123419669e80a8ffd151caad850e Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 12 Sep 2018 20:43:04 -0400 Subject: [PATCH 3/4] using different cursors is checkable and added to settings --- editor.cpp | 8 ++++++-- mainwindow.cpp | 9 +++++++++ mainwindow.h | 1 + mainwindow.ui | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/editor.cpp b/editor.cpp index a3652d10..1afbf783 100755 --- a/editor.cpp +++ b/editor.cpp @@ -1484,11 +1484,15 @@ void MapPixmapItem::updateCurHoveredTile(QPointF pos) { void MapPixmapItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { updateCurHoveredTile(event->pos()); - setCursor(editor->cursor); + if (editor->ui->actionBetter_Cursors->isChecked()){ + setCursor(editor->cursor); + } } void MapPixmapItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { map->clearHoveredTile(); - unsetCursor(); + if (editor->ui->actionBetter_Cursors->isChecked()){ + unsetCursor(); + } } void MapPixmapItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { QPointF pos = event->pos(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 65c36747..85dd6403 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -54,6 +54,10 @@ MainWindow::MainWindow(QWidget *parent) : openProject(default_dir); } } + + if (settings.contains("cursor_mode") && settings.value("cursor_mode") == "0") { + ui->actionBetter_Cursors->setChecked(false); + } } MainWindow::~MainWindow() @@ -600,6 +604,11 @@ void MainWindow::on_actionZoom_Out_triggered() { scaleMapView(-1); } +void MainWindow::on_actionBetter_Cursors_triggered() { + QSettings settings; + settings.setValue("cursor_mode", QString::number(ui->actionBetter_Cursors->isChecked())); +} + void MainWindow::scaleMapView(int s) { editor->map->scale_exp += s; diff --git a/mainwindow.h b/mainwindow.h index d6509a50..b8f9169d 100755 --- a/mainwindow.h +++ b/mainwindow.h @@ -62,6 +62,7 @@ private slots: void on_actionZoom_In_triggered(); void on_actionZoom_Out_triggered(); + void on_actionBetter_Cursors_triggered(); void on_toolButton_deleteObject_clicked(); diff --git a/mainwindow.ui b/mainwindow.ui index ad6b7925..160b223c 100755 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2076,6 +2076,7 @@ + @@ -2154,6 +2155,20 @@ - + + + true + + + true + + + Better Cursors + + + <html><head/><body><p>Use reticule-styled cursors with icon showing currently selected tool.</p></body></html> + + From 0932ce671186a8b79a2ec45f19dc4d67e0960dcc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 13 Sep 2018 17:01:49 -0500 Subject: [PATCH 4/4] Change text to 'Cursor Icons' --- mainwindow.ui | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mainwindow.ui b/mainwindow.ui index 65b1adfd..09e9f9d1 100755 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -351,8 +351,8 @@ 0 0 - 462 - 599 + 429 + 620 @@ -734,7 +734,7 @@ 0 0 - 222 + 315 86 @@ -838,10 +838,10 @@ - 8 + 0 0 - 323 - 368 + 365 + 405 @@ -1076,8 +1076,8 @@ 0 0 - 371 - 643 + 381 + 657 @@ -1242,8 +1242,8 @@ 0 0 - 410 - 560 + 420 + 584 @@ -1898,8 +1898,8 @@ 0 0 - 818 - 539 + 826 + 557 @@ -2071,7 +2071,7 @@ 0 0 1117 - 22 + 21 @@ -2186,7 +2186,7 @@ true - Better Cursors + Cursor Icons <html><head/><body><p>Use reticule-styled cursors with icon showing currently selected tool.</p></body></html>