Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #193 from MightyCreak/add-docs-theme 

Use GitHub Pages for the Diffuse website
This commit is contained in:
Creak 2023-04-03 13:56:44 -04:00 committed by GitHub
parent 22f4c95bbe 2b2a788aec
commit 194f411b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -1,6 +1,5 @@
<h1 align="center"> <h1 align="center">
<img src="data/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg" alt="Diffuse" width="192" height="192"/><br/> <img src="data/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg" alt="Diffuse" width="192" height="192"/><br/>
Diffuse
</h1> </h1>
<p align="center" style="margin-top: 2em"> <p align="center" style="margin-top: 2em">
@ -61,6 +60,9 @@ is licensed under the [FSF-AP](https://www.gnu.org/prep/maintain/html_node/Licen
license. license.
Copyright (C) 2006-2019 Derrick Moser <derrick_moser@yahoo.com> Copyright (C) 2006-2019 Derrick Moser <derrick_moser@yahoo.com>
Copyright (C) 2015-2021 Romain Failliot <romain.failliot@foolstep.com> Copyright (C) 2015-2023 Romain Failliot <romain.failliot@foolstep.com>
Icon made by [@jimmac](https://github.com/jimmac). Icon made by [@jimmac](https://github.com/jimmac).
This repository is a fork of the original project on SourceForge, which doesn't
seem to be maintained anymore: <https://sourceforge.net/projects/diffuse/>.

2
_config.yml Normal file
View File

@ -0,0 +1,2 @@
remote_theme: pages-themes/cayman@v0.2.0
title: Diffuse

13
data/io.github.mightycreak.Diffuse.appdata.xml.in
View File

@ -8,6 +8,11 @@
Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories. Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
</p> </p>
</description> </description>
<supports>
<control>pointing</control>
<control>keyboard</control>
<control>console</control>
</supports>
<metadata_license>FSFAP</metadata_license> <metadata_license>FSFAP</metadata_license>
<project_license>GPL-2.0-or-later</project_license> <project_license>GPL-2.0-or-later</project_license>
@ -18,8 +23,12 @@
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<caption>Main window: diff between two files</caption> <image type="source">https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.7_main_window.png</image>
<image>https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.0.png</image> <caption>Main window</caption>
</screenshot>
<screenshot>
<image type="source">https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.7_about_window.png</image>
<caption>About window</caption>
</screenshot> </screenshot>
</screenshots> </screenshots>

BIN
docs/images/screenshot_v0.7.7_about_window.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 178 KiB

BIN
docs/images/screenshot_v0.7.7_main_window.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 KiB

2
src/diffuse/constants.py
View File

@ -22,7 +22,7 @@ from typing import Final
APP_NAME: Final[str] = 'Diffuse' APP_NAME: Final[str] = 'Diffuse'
COPYRIGHT: Final[str] = '''{copyright} © 2006-2019 Derrick Moser COPYRIGHT: Final[str] = '''{copyright} © 2006-2019 Derrick Moser
{copyright} © 2015-2021 Romain Failliot'''.format(copyright=_("Copyright")) {copyright} © 2015-2023 Romain Failliot'''.format(copyright=_("Copyright"))
WEBSITE: Final[str] = 'https://mightycreak.github.io/diffuse/' WEBSITE: Final[str] = 'https://mightycreak.github.io/diffuse/'
# Constants are set in main() # Constants are set in main()