Skip to content

Commit 194f411

Browse files
authored
Merge pull request #193 from MightyCreak/add-docs-theme
Use GitHub Pages for the Diffuse website
2 parents 22f4c95 + 2b2a788 commit 194f411

File tree

6 files changed

+18
-5
lines changed

6 files changed

+18
-5
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<h1 align="center">
22
<img src="data/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg" alt="Diffuse" width="192" height="192"/><br/>
3-
Diffuse
43
</h1>
54

65
<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
6160
license.
6261

6362
Copyright (C) 2006-2019 Derrick Moser <[email protected]>
64-
Copyright (C) 2015-2021 Romain Failliot <[email protected]>
63+
Copyright (C) 2015-2023 Romain Failliot <[email protected]>
6564

6665
Icon made by [@jimmac](https://github.com/jimmac).
66+
67+
This repository is a fork of the original project on SourceForge, which doesn't
68+
seem to be maintained anymore: <https://sourceforge.net/projects/diffuse/>.

_config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
remote_theme: pages-themes/[email protected]
2+
title: Diffuse

data/io.github.mightycreak.Diffuse.appdata.xml.in

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
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.
99
</p>
1010
</description>
11+
<supports>
12+
<control>pointing</control>
13+
<control>keyboard</control>
14+
<control>console</control>
15+
</supports>
1116

1217
<metadata_license>FSFAP</metadata_license>
1318
<project_license>GPL-2.0-or-later</project_license>
@@ -18,8 +23,12 @@
1823

1924
<screenshots>
2025
<screenshot type="default">
21-
<caption>Main window: diff between two files</caption>
22-
<image>https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.0.png</image>
26+
<image type="source">https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.7_main_window.png</image>
27+
<caption>Main window</caption>
28+
</screenshot>
29+
<screenshot>
30+
<image type="source">https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.7_about_window.png</image>
31+
<caption>About window</caption>
2332
</screenshot>
2433
</screenshots>
2534

179 KB
Loading
146 KB
Loading

src/diffuse/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
APP_NAME: Final[str] = 'Diffuse'
2424
COPYRIGHT: Final[str] = '''{copyright} © 2006-2019 Derrick Moser
25-
{copyright} © 2015-2021 Romain Failliot'''.format(copyright=_("Copyright"))
25+
{copyright} © 2015-2023 Romain Failliot'''.format(copyright=_("Copyright"))
2626
WEBSITE: Final[str] = 'https://mightycreak.github.io/diffuse/'
2727

2828
# Constants are set in main()

0 commit comments

Comments
 (0)