sugarlabs / write-activity

A simple word processor for the Sugar learning environment
GNU General Public License v2.0
2 stars 25 forks source link

Implement superscript/subscript #7

Closed tckmn closed 5 years ago

tckmn commented 8 years ago

The only thing of interest here is the new icons--they're handmade by me, and I'm a terrible artist, so they can almost certainly be improved.

This was for this GCI task, by the way.

samdroid-apps commented 8 years ago

Nice icons BTW! Plus one for the helpful comments.

Looks good, just get back to me about the icon path thing.

tckmn commented 8 years ago

Alright, icon-related code has been cleaned up. (/cc @samdroid-apps)

samdroid-apps commented 8 years ago

Great! I'll test later today. In the mean time, please rebase the 2 commits into 1 and force push the new commit.

tckmn commented 8 years ago

@samdroid-apps Alright, done.

samdroid-apps commented 8 years ago

Great. I still need to test this and arrange with the maintainer to got this merged. I'll tick your task though.

rhl-bthr commented 5 years ago

@nswarup14, would you like to take this up ?

nswarup14 commented 5 years ago

@pro-panda Yes, I shall take it up during the phase 3 of my GSoC. Thanks

nswarup14 commented 5 years ago

@pro-panda @quozl @chimosky Tested #7 on Sugar v0.114 and Ubuntu 18.04

User experience 1) Clicking Ctrl+shift+^ enables superscript and Ctrl+shift+_ enables subscript. 2) On navigation the string that contains a {super, sub}script, the mouse cursor is changed automatically. Changing the cursor by force can be done by clicking the ToolBar buttons. Included screenshot with sample string

Screenshot from 2019-08-18 11-14-53

Thanks

rhl-bthr commented 5 years ago

@nswarup14 Thanks for testing. Please proceed to resolve merge conflicts

quozl commented 5 years ago

@nswarup14, I've added you as a collaborator. This will let you push to the branch.

nswarup14 commented 5 years ago

@quozl Thanks! How do I push more changes to this PR #7? I googled ways to push changes to a PR opened by another user, but I could not find any satisfactory answers.

I do not want to push anything by mistake that can leave the master in a broken state. Kindly advise.

quozl commented 5 years ago

Thanks for asking. Here's what we'd normally do;

git remote add tckmn git@github.com:tckmn/write-activity
git fetch tckmn
git checkout -b tckmn-master tckmn/master
git push --set-upstream tckmn :master

However, this causes

To github.com:tckmn/write-activity
 ! [remote rejected] master (permission denied)
error: failed to push some refs to 'git@github.com:tckmn/write-activity'

Which might be caused by @tckmn using a master branch for pull request. We advise against this in our guide to contributing.

Workaround is either;

Given that a few years have passed, the latter may be appropriate, but let's see what @tckmn wants to do first, as they made the pull request in the first place. Meanwhile, you can work on your own branch.

nswarup14 commented 5 years ago

@quozl Thanks, I shall create a new PR based of #7 I would wait for @tckmn as well.

tckmn commented 5 years ago

Either way works - I've invited @nswarup14 as a collaborator on the fork, but it's their decision what to do.