Skip to content

Commit

Permalink
Merge branch 'Update-references-to-GitLab' into 'main'
Browse files Browse the repository at this point in the history
Update references to gitlab

See merge request World/Graphs!740
  • Loading branch information
sstendahl committed Jan 19, 2024
2 parents 74c9851 + 79cac55 commit 8bba86b
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 23 deletions.
10 changes: 7 additions & 3 deletions Graphs.doap
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
Additionally, the option to save plots as vector images allows for easy editing in software like Inkscape for further refinement. Graphs is written with the GNOME environment in mind, but should be suitable for any other desktop environment as well.
</p>
<p>
For any feedback, questions or general issues, please file an issue on the GitHub page.
For any feedback, questions or general issues, please file an issue on the GitLab page.
</p>
</description>

<homepage rdf:resource="https://graphs.sjoerd.se" />
<download-page rdf:resource="https://flathub.org/apps/details/se.sjoerd.Graphs" />
<bug-database rdf:resource="https://github.com/Sjoerd1993/Graphs/issues" />
<bug-database rdf:resource="https://gitlab.gnome.org/World/graphs/-/issues" />

<programming-language>Python</programming-language>
<programming-language>Vala</programming-language>
Expand All @@ -37,12 +37,16 @@
<maintainer>
<foaf:Person>
<foaf:name>Sjoerd Stendahl</foaf:name>
<foaf:mbox rdf:resource="mailto:contact@sjoerd.se" />
<foaf:mbox rdf:resource="mailto:sstendahl@gnome.org" />
<foaf:account>
<foaf:OnlineAccount>
<foaf:accountServiceHomepage rdf:resource="https://github.com"/>
<foaf:accountName>Sjoerd1993</foaf:accountName>
</foaf:OnlineAccount>
<foaf:OnlineAccount>
<foaf:accountServiceHomepage rdf:resource="https://gitlab.gnome.org"/>
<foaf:accountName>Sjoerd1993</foaf:accountName>
</foaf:OnlineAccount>
</foaf:account>
</foaf:Person>
</maintainer>
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Graphs
Plot and manipulate data with Graphs!

![image](https://raw.githubusercontent.com/Sjoerd1993/Graphs/main/data/screenshots/sin_cos.png)
![image](https://gitlab.gnome.org/World/Graphs/-/raw/main/data/screenshots/sin_cos.png?ref_type=heads)


Graphs is a simple, yet powerful tool that allows you to plot and manipulate your data with ease. New data can be imported from a wide variety of filetypes, or generated by equation. All data can be manipulated using a variety of operations.
Expand All @@ -22,7 +22,7 @@ The operations include:
- Fourier Transformations
- Custom transformations

For feedback or general issues, please file an issue [at the Github issue tracker](https://github.com/SjoerdB93/Graphs/issues).
For feedback or general issues, please file an issue [at the GitLab issue tracker](https://gitlab.gnome.org/World/Graphs/-/issues).

## Install Graphs

Expand Down Expand Up @@ -54,7 +54,7 @@ sudo flatpak make-current se.sjoerd.Graphs beta
```
Note that the `sudo` is neccesary here, as it sets the current branch on the system level. To install this on a per-user basis, the flag `--user` can be used in the previous commands.
To switch back to the stable version simply run the above command replacing `beta` with `stable`. A beta version is also available in the beta channel of the Snap Store.
We are always looking for feedback, so feel free to report any issues or suggestions on the Github [issue tracker](https://github.com/Sjoerd1993/Graphs/issues).
We are always looking for feedback, so feel free to report any issues or suggestions on the GitLab [issue tracker](https://gitlab.gnome.org/World/Graphs/-/issues).



Expand All @@ -78,7 +78,7 @@ The actual package names might vary depending on your distribution, and dependin

building:
```
git clone https://github.com/Sjoerd1993/Graphs.git
git clone https://gitlab.gnome.org/World/Graphs.git
cd Graphs
meson setup build
ninja -C build
Expand All @@ -105,12 +105,12 @@ We are incredibly grateful to anyone helping to make Graphs available in differe

### Code

If you wish to contribute to the code of Graphs, feel free to submit a [Pull request](https://github.com/Sjoerd1993/Graphs/pulls).
If you wish to contribute to the code of Graphs, feel free to submit a [Merge Request](https://gitlab.gnome.org/World/Graphs/-/merge_requests).
We are always happy for contributions, and new code is generally reviewed within a few days time.

### Feedback and bug reports

If you found an issue or have general feedback, please file an issue at the [issue tracker](https://github.com/Sjoerd1993/Graphs/issues).
If you found an issue or have general feedback, please file an issue at the [issue tracker](https://gitlab.gnome.org/World/Graphs/-/issues).


## Code of Conduct
Expand Down
16 changes: 8 additions & 8 deletions data/se.sjoerd.Graphs.appdata.xml.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,36 @@
Additionally, the option to save plots as vector images allows for easy editing in software like Inkscape for further refinement. Graphs is written with the GNOME environment in mind, but should be suitable for any other desktop environment as well.
</p>
<p>
For any feedback, questions or general issues, please file an issue on the GitHub page.
For any feedback, questions or general issues, please file an issue on the GitLab page.
</p>
</description>
<launchable type="desktop-id">@APPLICATION_ID@.desktop</launchable>
<translation type="gettext">graphs</translation>
<url type="bugtracker">@ISSUE_URL@</url>
<url type="help">@GITHUB_URL@</url>
<url type="help">@VCS_URL@</url>
<url type="homepage">@HOMEPAGE_URL@</url>
<url type="vcs-browser">@GITHUB_URL@</url>
<url type="vcs-browser">@VCS_URL@</url>
<url type="translate">https://hosted.weblate.org/engage/graphs/</url>
<screenshots>
<screenshot type="default">
<caption>1 - Plot and manipulate any data of choice</caption>
<image>https://raw.githubusercontent.com/Sjoerd1993/Graphs/main/data/screenshots/sin_cos.png</image>
<image>https://gitlab.gnome.org/World/Graphs/-/raw/main/data/screenshots/sin_cos.png</image>
</screenshot>
<screenshot type="default">
<caption>2 - Full support for light and dark mode</caption>
<image>https://raw.githubusercontent.com/Sjoerd1993/Graphs/main/data/screenshots/sin_cos_dark.png</image>
<image>https://gitlab.gnome.org/World/Graphs/-/raw/main/data/screenshots/sin_cos_dark.png</image>
</screenshot>
<screenshot type="default">
<caption>3 - Generate data from an equation</caption>
<image>https://raw.githubusercontent.com/Sjoerd1993/Graphs/main/data/screenshots/add_equation.png</image>
<image>https://gitlab.gnome.org/World/Graphs/-/raw/main/data/screenshots/add_equation.png</image>
</screenshot>
<screenshot type="default">
<caption>4 - Edit plot stylesheets</caption>
<image>https://raw.githubusercontent.com/Sjoerd1993/Graphs/main/data/screenshots/previews.png</image>
<image>https://gitlab.gnome.org/World/Graphs/-/raw/main/data/screenshots/previews.png</image>
</screenshot>
<screenshot>
<caption>5 - Manipulate imported data with ease</caption>
<image>https://raw.githubusercontent.com/Sjoerd1993/Graphs/main/data/screenshots/curve_fitting.png</image>
<image>https://gitlab.gnome.org/World/Graphs/-/raw/main/data/screenshots/curve_fitting.png</image>
</screenshot>
</screenshots>
<releases>
Expand Down
8 changes: 4 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ dependencies = [

application_id = 'se.sjoerd.Graphs'
name = 'Graphs'
copyright = '2022 - 2023'
copyright = '2022 - 2024'
homepage_url = 'https://graphs.sjoerd.se/'
github_url = 'https://github.com/sjoerd1993/Graphs'
issue_url = github_url + '/issues'
vcs_url = 'https://gitlab.gnome.org/World/Graphs'
issue_url = vcs_url + '/issues'
author = 'Sjoerd Stendahl'
description_short = 'Plot and manipulate data'

Expand All @@ -45,7 +45,7 @@ conf.set('APPLICATION_ID', application_id)
conf.set('AUTHOR', author)
conf.set('COPYRIGHT', copyright)
conf.set('DESCRIPTION_SHORT', description_short)
conf.set('GITHUB_URL', github_url)
conf.set('VCS_URL', vcs_url)
conf.set('ISSUE_URL', issue_url)
conf.set('LOCALEDIR', localedir)
conf.set('NAME', name)
Expand Down
2 changes: 1 addition & 1 deletion src/canvas.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def on_draw_event(self, _widget, ctx):
Overwrite super function.
Fixes a UI scaling bug, see
https://github.com/Sjoerd1993/Graphs/issues/259
https://gitlab.gnome.org/World/Graphs/-/issues/259
"""
with (self.toolbar._wait_cursor_for_draw_cm() if self.toolbar
else nullcontext()):
Expand Down
2 changes: 1 addition & 1 deletion src/graphs.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# @DESCRIPTION_SHORT@
#
# @HOMEPAGE_URL@
# @GITHUB_URL@
# @VCS_URL@
#
# Copyright @COPYRIGHT@ @AUTHOR@
#
Expand Down

0 comments on commit 8bba86b

Please sign in to comment.