search

mate-desktop / mate-screensaver

MATE screen saver and locker
https://mate-desktop.org
GNU General Public License v2.0
48 stars 40 forks source link

Add the lock screen time function after updating and activating the screen save #293

Closed zhuyaliang closed 3 months ago

cwendling commented 3 months ago

@zhuyaliang I ended up making quite a few changes, see https://github.com/mate-desktop/mate-screensaver/compare/lock-delay...cwendling:mate-screensaver:lock-delay What do you think of those?

[edit] if that looks good, maybe I should split them into different PRs, given one is a somewhat orthogonal simplification/cleanup/improvement, and one is entirely unrelated (apart from being in the same dialog)

zhuyaliang commented 3 months ago

@cwendling It looks great. Please merge this PR and initiate a new one. I will review the code as soon as possible

cwendling commented 3 months ago

Please merge this PR and initiate a new one.

merge this one first, or replace it with one containing the fixes?

zhuyaliang commented 3 months ago

My suggestion is to merge this first, and then review and merge your repair PR

cwendling commented 3 months ago

OK, I wouldn't have done it this way but given you changes do work, why not.

zhuyaliang commented 3 months ago

@cwendling

I ended up making quite a few changes, see https://github.com/mate-desktop/mate-screensaver/compare/lock-delay...cwendling:mate-screensaver:lock-delay What do you think of those?

This is your labor success, I need your consent

cwendling commented 3 months ago

I'm not so worried about attribution :slightly_smiling_face:

Anyway, I opened 3 independent PRs for now:

There's only one change left after these which is removing the "Never" string, but that would conflict with #295 so I'll submit it after this one is either merged or rejected.