-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Suggestions to User in bottom status-bar regarding current active object Tools (not added for insert-template tool) #1907
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left a few comments.
I didn't try out the change yet, but I'm afraid some of these texts are too long. They could change based on which modifier key is pressed, which is how they explain each mode in Inkscape. Also I think there's no need to explain shortcuts like Delete.
using namespace Tiled; | ||
using namespace Tiled::Internal; | ||
|
||
CreatePolylineObjectTool::CreatePolylineObjectTool(QObject *parent) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't re-create this file. It no longer exists since polyline and polygon creation tools have been merged into one tool now.
>>>>>>> 7b9ddd1b... added information to be displayed in status bar for object-tools, except not for template object tool | ||
======= | ||
mtoolInfo = tr("<b>First Click</b> determines the location of object and first point of polygon. <b>Right Click</b> or press <b>Enter</b> to finish creating polygon. press <b>Escape</b> to cancel creation of polygon."); | ||
>>>>>>> 7b9ddd1b... added information to be displayed in status bar for object-tools, except not for template object tool |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These are conflicts markers, indicating you missed to resolve the conflict before committing (or before continuing the rebase). You can resolve these conflicts by either editing the file in your regular editor, or by using a special merge tool. I personally use Meld with git mergetool
for comfortably resolving conflicts.
src/tiled/abstractobjecttool.h
Outdated
@@ -62,7 +62,7 @@ class AbstractObjectTool : public AbstractTool | |||
* an object group. | |||
*/ | |||
void updateEnabledState() override; | |||
|
|||
QString mtoolInfo; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Naming style: mToolInfo
src/tiled/abstractobjecttool.h
Outdated
@@ -89,7 +89,6 @@ private slots: | |||
private: | |||
void showContextMenu(MapObject *clickedObject, | |||
QPoint screenPos); | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't remove the empty line.
src/tiled/editpolygontool.cpp
Outdated
@@ -66,6 +66,7 @@ EditPolygonTool::EditPolygonTool(QObject *parent) | |||
, mClickedObject(nullptr) | |||
, mMode(NoMode) | |||
{ | |||
mtoolInfo=tr("<b>Click</b> on a node to select it, hold <b>Shift</b> to select multiple nodes and holding <b>Alt</b> forces moving current selection. Press <b>Delete key</b> to remove currently selected node(s)"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coding style: should have spaces around =
I've done some very minor changes in the text, but still kept few of them, although they surely make the text a bit longer but I believe these are also essential as, if I talk about my experience with Tiled, it was kind of tough for me to use object tools and often need to refer to online documentation or blind hit some keys on keyboard and so through this PR I tried to put the information that might have benefited me solely. This sure isn't a good decision to see things from my single perspective but I still can't make up my mind as to what part of text I should remove so as to make it shorter, one solution could be, for example changing Left mouse button to "LMB" and likewise use of acronyms at other places but still i think that some users might not be familiar with acronyms. |
384d5ac
to
2e9a0fb
Compare
Added information regarding object tools which is displayed in the bottom Status-bar,
all object tools covered except "Insert Template(V)" tool since I wasn't familiar with it enough.
## UPDATE: this PR is re-created (original PR is closed due to issues as discussed in the comment section there)
now instead of merging content keshav2010:master will use keshav2010:statusBarSuggestionFeature branch which is solely dedicated to this feature.