Skip to content
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

Add icons for editor menus #1820

Merged
merged 2 commits into from Sep 14, 2018

Conversation

@akortunov
Copy link
Collaborator

commented Jul 27, 2018

Implements #912.
Editor menus also take icons from UniversalId tables.

@Capostrophic

This comment has been minimized.

Copy link
Collaborator

commented Jul 27, 2018

Damn, this is what I never knew was sorely missing.

View submenu looks weird, but you're probably already aware of that.

@akortunov akortunov force-pushed the akortunov:editoricons branch from 90c0cea to f5c1594 Jul 28, 2018

@akortunov akortunov force-pushed the akortunov:editoricons branch 2 times, most recently from d948f78 to eb6a60b Sep 6, 2018

@akortunov akortunov force-pushed the akortunov:editoricons branch from eb6a60b to 275d10e Sep 12, 2018

@akortunov akortunov changed the title [WIP] Add icons for editor menus Add icons for editor menus Sep 12, 2018

@akortunov

This comment has been minimized.

Copy link
Collaborator Author

commented Sep 12, 2018

Ready for review and testing. @zinnschlag, can you take a look?

{ CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_MetaDatas, "Metadata", ":./metadata.png" },
{ CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_Redo, "Redo", ":./menu-redo.png" },
{ CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_Undo, "Undo", ":./menu-undo.png" },
{ CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_Preferences, "Preferences", ":./menu-preferences.png" },

This comment has been minimized.

Copy link
@zinnschlag

zinnschlag Sep 13, 2018

Contributor

This looks odd. UniversalIDs are used for stuff that either can have a subview or can be dragged around as icons, representing some part of the content data. Menu items do not get an UniversalID.

This comment has been minimized.

Copy link
@akortunov

akortunov Sep 13, 2018

Author Collaborator

Better now?

@@ -66,6 +66,9 @@ namespace CSVDoc

void closeEvent (QCloseEvent *event);

QAction* createMenuEntry(CSMWorld::UniversalId::Type type, QMenu* menu, const char* shortcutName);

This comment has been minimized.

Copy link
@zinnschlag

zinnschlag Sep 14, 2018

Contributor

Good idea to factor out the menu item creation into a function. I should have done that in the first place.

@zinnschlag zinnschlag merged commit 6066f02 into OpenMW:master Sep 14, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
zinnschlag added a commit that referenced this pull request Sep 14, 2018

@akortunov akortunov deleted the akortunov:editoricons branch Oct 25, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.