ImageProcessing-ElectronicPublications / photoquick

Light-weight image viewer with crop,resize,collage, photogrid and filters
GNU General Public License v3.0
4 stars 0 forks source link

Synchronization? #34

Closed zvezdochiot closed 3 years ago

zvezdochiot commented 3 years ago

diff

I can clone your repo by making all the differences in the code with the last summary commit. This will result in the loss of own story and comments, but will return the ability to compare differences normally.

How do you like this proposal?

ksharindam commented 3 years ago

I like the idea, because the thing "50 commits ahead, 26 commits behind" is irritating me also. But I am thinking if the same thing may happen again ?

zvezdochiot commented 3 years ago

OK. Let it repeat itself. Nothing prevents me from repeating.

Don't change anything for 1 hour. I am doing a shenanigans.

ksharindam commented 3 years ago

Dont do this today. I have not commited the last change (move icons to data/) in my repo

ksharindam commented 3 years ago

I am working on creating AppImage. It may take one or two days to commit the last change.

zvezdochiot commented 3 years ago

Ok. I noticed. I'll wait.

PS: Add a message when ready.

ksharindam commented 3 years ago

Ok. One more thing, I want to use that 96px photoquick icon for desktop icon (instead of 32px). Because in desktop (both windows and linux) the 32px is scaled and becomes little hazy.

zvezdochiot commented 3 years ago

Although what to pull. I'll do a trial sync now, no tags sync. And after a couple of days, full.

zvezdochiot commented 3 years ago

✔️ sync

Now you can compare.

zvezdochiot commented 3 years ago

@ksharindam .

⚠️ If you are working on the code of the current repo, rename it, clone it anew and replace the code with the one you are working with. (git history changed: .git directory)

PS: ℹ️ On your repo, apply:

sed -i -e 's/\t/    /g' *.cpp *.h
zvezdochiot commented 3 years ago

@ksharindam .

Is GPL-3.0 really important to you? Or is the question of changing to PDM-1.0 (https://github.com/ImageProcessing-ElectronicPublications/python-pdf-jpeg-extract/blob/master/LICENSE) appropriate?

ksharindam commented 3 years ago

Yes, i like to keep it GPL licenced.

On Sat, 5 Jun, 2021, 2:18 PM звездочёт, @.***> wrote:

@ksharindam https://github.com/ksharindam .

Is GPL-3.0 really important to you? Or is the question of changing to PDM-1.0 ( https://github.com/ImageProcessing-ElectronicPublications/python-pdf-jpeg-extract/blob/master/LICENSE) appropriate?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/ImageProcessing-ElectronicPublications/photoquick/issues/34#issuecomment-855207621, or unsubscribe https://github.com/notifications/unsubscribe-auth/AEKWXPTHTPEGJNX4JTB7B6TTRHQFVANCNFSM46EGAIRA .

zvezdochiot commented 3 years ago

👍 Ok. No comment.

zvezdochiot commented 3 years ago

@ksharindam .

It is necessary to bring the documentation to the original. Don't spare commits. I will still do sync after fine-tuning.

And PS: ℹ️ On your repo, apply:

sed -i -e 's/\t/    /g' *.cpp *.h
ksharindam commented 3 years ago

You have done sync, now what to do ?

zvezdochiot commented 3 years ago

Hi @ksharindam .

Synchronization is rather poor, most of the differences are related to tabs. You not did:

sed -i -e 's/\t/    /g' *.cpp *.h

Because of this, significant differences are difficult to see.

zvezdochiot commented 3 years ago

@ksharindam .

Now all the differences are visible. At this stage, that's enough. Then you can repeat.