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

Notifications widget #132

Merged
merged 16 commits into from Sep 20, 2022
Merged

Conversation

NamorNiradnug
Copy link
Collaborator

@NamorNiradnug NamorNiradnug commented Aug 1, 2022

This PR adds notifications center widget for wf-panel. I'm opening the PR before it's fully ready because it requires much of code review, as well as some help with improvements such as config options.

@NamorNiradnug NamorNiradnug marked this pull request as draft August 1, 2022 22:06
@NamorNiradnug NamorNiradnug marked this pull request as ready for review August 1, 2022 22:06
@NamorNiradnug NamorNiradnug marked this pull request as draft August 1, 2022 22:08
@NamorNiradnug NamorNiradnug marked this pull request as ready for review August 2, 2022 15:18
Copy link
Member

@ammen99 ammen99 left a comment

Choose a reason for hiding this comment

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

Hi, I've been receiving notifications about your work here, unfortunately I do not have the time to review this PR properly. It would be sad to see your work go to waste, so if someone else could test this and confirm it works as intended, we can merge the PR as-is.

An idea for easier discovery of this feature: you could add a comment to the sample configuration file, so that users can see that notifications can be enabled. Otherwise, I'm not sure many people would start looking at the source code to see which widgets are available ..

@marcusbritanicus
Copy link
Contributor

@ammen99 I just got a chance to check this out. Works great. :) Find a screenshot attached.
Few rough edges here and there, but nothing major. It can be merged.

@NamorNiradnug Great work...! Looking forward for features like activation/buttons etc, if you're planning to add them :)

2022-09-18_13:46:19

@ammen99
Copy link
Member

ammen99 commented Sep 19, 2022

@NamorNiradnug do you plan to push more commits or should I merge the PR?

@NamorNiradnug
Copy link
Collaborator Author

NamorNiradnug commented Sep 19, 2022

@ammen99 I'm going to push one today, I'll ping you when it's ready.

@NamorNiradnug
Copy link
Collaborator Author

NamorNiradnug commented Sep 19, 2022

@ammen99 It can be merged.

@ammen99
Copy link
Member

ammen99 commented Sep 19, 2022

This branch cannot be rebased due to conflicts

Can you also rebase this branch on top of master so that it can be cleanly merged?

@ammen99
Copy link
Member

ammen99 commented Sep 19, 2022

@NamorNiradnug Can you rebase, not merge? With git rebase origin/master after a git pull.

@NamorNiradnug
Copy link
Collaborator Author

NamorNiradnug commented Sep 20, 2022

@NamorNiradnug Can you rebase, not merge? With git rebase origin/master after a git pull.

What do I do if there are some other commits on origin/master?

@ammen99
Copy link
Member

ammen99 commented Sep 20, 2022

@NamorNiradnug Can you rebase, not merge? With git rebase origin/master after a git pull.

What do I do if there are some other commits on origin/master?

When you rebase on top of origin/master, your commits are added one by one on top of origin/master (and you'll have to fix any conflicts which come up). This way, the history becomes linear and we don't have any merge commits.

@NamorNiradnug
Copy link
Collaborator Author

@NamorNiradnug Can you rebase, not merge? With git rebase origin/master after a git pull.

What do I do if there are some other commits on origin/master?

When you rebase on top of origin/master, your commits are added one by one on top of origin/master (and you'll have to fix any conflicts which come up). This way, the history becomes linear and we don't have any merge commits.

Has I done it correctly?

@ammen99
Copy link
Member

ammen99 commented Sep 20, 2022

@NamorNiradnug Can you rebase, not merge? With git rebase origin/master after a git pull.

What do I do if there are some other commits on origin/master?

When you rebase on top of origin/master, your commits are added one by one on top of origin/master (and you'll have to fix any conflicts which come up). This way, the history becomes linear and we don't have any merge commits.

Has I done it correctly?

I don't think so, there shouldn't be any merge commits in the git log. It seems to me you rebased on top of an older master version (or you rebased master on top of notification-widget, and then merged the result). Did you try the two commands I listed above (git fetch origin && git rebase origin/master while on the notification-widget branch)? That should do the trick.

@NamorNiradnug
Copy link
Collaborator Author

@NamorNiradnug Can you rebase, not merge? With git rebase origin/master after a git pull.

What do I do if there are some other commits on origin/master?

When you rebase on top of origin/master, your commits are added one by one on top of origin/master (and you'll have to fix any conflicts which come up). This way, the history becomes linear and we don't have any merge commits.

Has I done it correctly?

I don't think so, there shouldn't be any merge commits in the git log. It seems to me you rebased on top of an older master version (or you rebased master on top of notification-widget, and then merged the result). Did you try the two commands I listed above (git fetch origin && git rebase origin/master while on the notification-widget branch)? That should do the trick.

I rebased on top of upstream/master, that merge commit is clear... No idea why it is there.

@ammen99
Copy link
Member

ammen99 commented Sep 20, 2022

@NamorNiradnug I just force-pushed the rebased commits to your branch, unfortunately, I cannot say what went wrong when you tried rebasing. Here, the only issue was that many commits were appearing as duplicates and I had to remove them (happens sometimes when rebasing with merge commits).

Aside from that, thank you for the work so far!

@ammen99 ammen99 merged commit bad121a into WayfireWM:master Sep 20, 2022
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.

None yet

3 participants