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

Toolbar menu #1386

Merged
merged 2 commits into from
May 3, 2020
Merged

Toolbar menu #1386

merged 2 commits into from
May 3, 2020

Conversation

ARYA-BHARDWAJ
Copy link
Contributor

This PR is regarding issue no #733. Now "View" -> "Toolbar" menu item is active.

@ARYA-BHARDWAJ
Copy link
Contributor Author

@ice0 please have a look

@ice0
Copy link
Collaborator

ice0 commented Apr 29, 2020

Looks good to me.

@morevnaproject should the command show/hide the toolbar for all windows or only for the selected one?

@ankit-kumar-dwivedi
Copy link
Member

ankit-kumar-dwivedi commented Apr 29, 2020 via email

@morevnaproject
Copy link
Member

Reviewing now! ^__^

Copy link
Member

@morevnaproject morevnaproject left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have checked the function - it works well!
Please check one comment regarding function names.
Thank you! ^__^

synfig-studio/src/gui/mainwindow.cpp Outdated Show resolved Hide resolved
@morevnaproject
Copy link
Member

@ARYA-BHARDWAJ Looks good to me now! Can you please rebase your branch on top of current master, so I can make a clean merge?

@ARYA-BHARDWAJ
Copy link
Contributor Author

ARYA-BHARDWAJ commented May 2, 2020

@morevnaproject I have rebased the branch on top of current master. I hope this branch can be merged now.

@morevnaproject
Copy link
Member

@ARYA-BHARDWAJ Hmm... I see it is still not rebased yet. Please make sure that you fetched the latest master commits. You can do this with following commands (I assume that you have main synfig repo as "upstream" remote):

git fetch upstream
git rebase upstream/master
git push --force

@ARYA-BHARDWAJ
Copy link
Contributor Author

@morevnaproject sorry my bad I forget to push. I hope I have done it correctly

@morevnaproject morevnaproject merged commit 9ad7d22 into synfig:master May 3, 2020
@morevnaproject
Copy link
Member

Merged now. Thank you! ^__^

@ice0 ice0 added this to the v1.4.1 milestone Dec 2, 2020
ice0 pushed a commit to ice0/synfig that referenced this pull request Dec 30, 2020
@ice0 ice0 mentioned this pull request Dec 30, 2020
ice0 pushed a commit to ice0/synfig that referenced this pull request Feb 28, 2021
morevnaproject added a commit that referenced this pull request Apr 20, 2021
@rodolforg rodolforg removed the Backport label Feb 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants