Skip to content

Commit 9fb5e65

Browse files
pascal-niklauspascal-niklaus
authored
Merge branch 'master' into devel_change_tool
2 parents 5385d7b + 040ca1e commit 9fb5e65

15 files changed

+604
-168
lines changed

‎.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
- uses: actions/checkout@v3
1010
- name: Install Build Dependencies
1111
run: |
12+
sudo apt update
1213
sudo apt-get install cmake gettext libgtk-3-dev libappindicator3-dev libxi-dev
1314
- name: Build
1415
run: |

‎AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ bbhtt <[email protected]>
2222
avma <[email protected]>
2323
godmar <[email protected]>
2424
Ashwin Rajesh <[email protected]>
25+
Pascal Niklaus <[email protected]>

‎CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(gromit-mpx LANGUAGES C)
33
include(GNUInstallDirs)
44

55
set(target_name gromit-mpx)
6-
set(version 1.5.1)
6+
set(version 1.6.0)
77
set(LOCALE_DOMAIN ${CMAKE_PROJECT_NAME})
88
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
99
if(CMAKE_GENERATOR MATCHES "Unix Makefiles|Ninja")
@@ -80,6 +80,7 @@ GETTEXT_PROCESS_PO_FILES(es ALL PO_FILES po/es.po)
8080
GETTEXT_PROCESS_PO_FILES(fa ALL PO_FILES po/fa.po)
8181
GETTEXT_PROCESS_PO_FILES(he ALL PO_FILES po/he.po)
8282
GETTEXT_PROCESS_PO_FILES(it ALL PO_FILES po/it.po)
83+
GETTEXT_PROCESS_PO_FILES(pt_BR ALL PO_FILES po/pt_BR.po)
8384

8485
install(TARGETS ${target_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
8586
install(FILES data/net.christianbeier.Gromit-MPX.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
@@ -94,6 +95,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/es.gmo DESTINATION ${CMAKE_INSTALL_DAT
9495
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/it.gmo DESTINATION ${CMAKE_INSTALL_DATADIR}/locale/it/LC_MESSAGES/ RENAME ${LOCALE_DOMAIN}.mo)
9596
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fa.gmo DESTINATION ${CMAKE_INSTALL_DATADIR}/locale/fa/LC_MESSAGES/ RENAME ${LOCALE_DOMAIN}.mo)
9697
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/he.gmo DESTINATION ${CMAKE_INSTALL_DATADIR}/locale/he/LC_MESSAGES/ RENAME ${LOCALE_DOMAIN}.mo)
98+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pt_BR.gmo DESTINATION ${CMAKE_INSTALL_DATADIR}/locale/pt_BR/LC_MESSAGES/ RENAME ${LOCALE_DOMAIN}.mo)
9799

98100
configure_file(
99101
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"

‎ChangeLog

+164
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,167 @@
1+
commit 7db82a00a236f9b5f2dcfa2f660ce1c9b336d0c2
2+
Author: Christian Beier <[email protected]>
3+
Date: Tue Mar 12 08:51:33 2024 +0100
4+
5+
AppStream: add 1.6.0 release notes
6+
7+
commit b2b7fe7a7e687db4322c5367600f58ccad1c23d9
8+
Author: Christian Beier <[email protected]>
9+
Date: Tue Mar 12 08:47:44 2024 +0100
10+
11+
CMake: bump minor version
12+
13+
commit e54b9ba4bc155781a70ccfbb22d2b913c19e007c
14+
Author: Christian Beier <[email protected]>
15+
Date: Tue Mar 12 08:47:12 2024 +0100
16+
17+
NEWS: update
18+
19+
commit 502c1a55d1c0cd62ce8869bd8ed1437a8d7a8b59
20+
Author: Christian Beier <[email protected]>
21+
Date: Mon Mar 11 11:40:14 2024 +0100
22+
23+
README: document arrowtype config
24+
25+
commit aa1c807f80f485f18102598f10b41f22fa1e3058
26+
Author: pascal-niklaus <[email protected]>
27+
Date: Mon Mar 11 08:54:38 2024 +0100
28+
29+
drawing,config,callbacks: add arrowtype option that allows to set arrow position
30+
31+
* drawing, config, callbacks: add arrowtype option allowing arrow heads at both line ends
32+
33+
re #67
34+
35+
* main.h: enum names changed for arrow types
36+
37+
* config: don't set arrow type to none when size is defined
38+
39+
---------
40+
41+
Co-authored-by: Christian Beier <[email protected]>
42+
43+
commit c0886ec86a61e0ef9c3db6119a5d536507bb7ec2
44+
Author: Christian Beier <[email protected]>
45+
Date: Mon Mar 11 08:49:50 2024 +0100
46+
47+
README: fix typo
48+
49+
commit ed1456349e9e13a9ade584514a33b17823c4406b
50+
Author: Christian Beier <[email protected]>
51+
Date: Sat Mar 2 22:47:42 2024 +0100
52+
53+
po: update Portuguese (Brazil) translation
54+
55+
commit 0dd37bd0b1978a8baae2968f99467f07358737b4
56+
Author: Renato Lima <[email protected]>
57+
Date: Fri Oct 15 02:44:46 2021 -0300
58+
59+
po: add Portuguese (Brazil) translation
60+
61+
commit 4cec82eb984ad7bd94ec5339f4ec5222b1743150
62+
Author: Christian Beier <[email protected]>
63+
Date: Sat Mar 2 13:27:55 2024 +0100
64+
65+
README: document LINE and RECT tools
66+
67+
re #67
68+
69+
commit e914dc0bc829077bfdfc4cac7190da81dea78856
70+
Author: Christian Beier <[email protected]>
71+
Date: Sat Mar 2 13:18:04 2024 +0100
72+
73+
callbacks: update copyright year
74+
75+
commit 42c9e30e1f938ac1a278257f28e79dccab6da1f1
76+
Author: Christian Beier <[email protected]>
77+
Date: Sat Mar 2 13:17:24 2024 +0100
78+
79+
callbacks: update authors in About dialog
80+
81+
commit ec726f438e2a81dd02414427cd87ccc1f54c16d7
82+
Author: Christian Beier <[email protected]>
83+
Date: Sat Mar 2 12:37:33 2024 +0100
84+
85+
AUTHORS: update
86+
87+
commit 3cf1116bbbfabce635f196f1c7c98b77c3a04567
88+
Author: Christian Beier <[email protected]>
89+
Date: Sat Mar 2 12:24:34 2024 +0100
90+
91+
main,callbacks: rename temp_buffer to aux_backbuffer
92+
93+
commit 53db4941588a9dfa8764d16270d8e8f2b62172ca
94+
Author: pascal-niklaus <[email protected]>
95+
Date: Thu Feb 22 20:51:04 2024 +0100
96+
97+
config, callbacks: add RECT and LINE tools
98+
99+
commit 1ac43435b222f13c2c7d6221abb5ac97996f1aed
100+
Author: Christian Beier <[email protected]>
101+
Date: Mon Feb 26 10:44:20 2024 +0100
102+
103+
po: add original translator to Persian language team
104+
105+
commit c99df3452f8818487c9bcf8d18313b92afdb7007
106+
Author: Christian Beier <[email protected]>
107+
Date: Mon Feb 26 10:41:29 2024 +0100
108+
109+
po: update all translations w/ report-bug/feature-request string
110+
111+
Closes #138
112+
113+
commit f076166b2c47276749f99de4ec15f65e910e745e
114+
Author: Christian Beier <[email protected]>
115+
Date: Mon Feb 26 10:31:08 2024 +0100
116+
117+
main,callbacks: add a report-bug/request-feature menu item
118+
119+
Re #138
120+
121+
commit 6d4c7f37ab656b758b031e01f81b722fc3241862
122+
Author: Christian Beier <[email protected]>
123+
Date: Mon Feb 26 09:46:17 2024 +0100
124+
125+
flatpak: update GNOME runtime to v44
126+
127+
commit 39994f2e0b1fc78c50ffcd17b81e04d905a833fb
128+
Author: Christian Beier <[email protected]>
129+
Date: Sun Feb 25 20:27:07 2024 +0100
130+
131+
.github: add an apt update step to CI
132+
133+
commit 2446a4f7b7ddefc83c4c68ec0eb0d5a8b5b087c3
134+
Author: pascal-niklaus <[email protected]>
135+
Date: Sun Feb 25 20:22:23 2024 +0100
136+
137+
callbacks: change '!' in comparison to '!='
138+
139+
Closes #188
140+
141+
commit c5d17947d22c4f903bfa3365549d96bc2c0c7430
142+
Author: Christian Beier <[email protected]>
143+
Date: Sun Dec 17 13:09:17 2023 +0100
144+
145+
README: update link to input device manager
146+
147+
commit c88af5ed8baa29107d90b614781025a65b0f5b35
148+
Author: Christian Beier <[email protected]>
149+
Date: Sat Dec 16 09:09:35 2023 +0100
150+
151+
.gitignore: add .cache
152+
153+
commit 6084ce88681ba826b36761dc8574dfaab709a065
154+
Author: Christian Beier <[email protected]>
155+
Date: Sun Nov 5 09:08:27 2023 +0100
156+
157+
README: update release checklist
158+
159+
commit 8da79062a7e1ce7eae06da2daa631e4b5e60bdf4
160+
Author: Christian Beier <[email protected]>
161+
Date: Sun Oct 22 20:51:02 2023 +0200
162+
163+
ChangeLog: update
164+
1165
commit 59605e513beb58445019ddb0cdcaf3f8c7ab60e8
2166
Author: Christian Beier <[email protected]>
3167
Date: Sun Oct 22 20:49:53 2023 +0200

‎NEWS.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# Gromit-MPX 1.6.0 - 2024-03-12
2+
3+
## 🌅 New Features
4+
5+
* Added a report-bug/request-feature menu item.
6+
* Added RECT and LINE tools.
7+
* Added Portuguese (Brazil) translation.
8+
* Added arrowtype option that allows to set arrow position.
9+
110
# Gromit-MPX 1.5.1 - 2023-10-22
211

312
## 🛠 Fixes

‎README.md

+14-3
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,12 @@ not allowed to change size:
176176

177177
"red fixed Marker" = "red Pen" (minsize=10 maxsize=10);
178178

179-
You can also draw lines that end in an arrow head. For this you
180-
have to specify `arrowsize`. This is a factor relative to the width
181-
of the line. For reasonable arrowheads start with 1.
179+
You can also draw lines that start and/or end in an arrow head. For
180+
this you have to specify `arrowsize` and optionally `arrowtype`.
181+
`arrowsize` is a factor relative to the width of the line. For
182+
reasonable arrowheads start with 1.
183+
`arrowtype` can take `start`, `end` or `double` and defaults to `end`
184+
when `arrowsize` is specified and no `arrowtype` given.
182185

183186
"blue Pen" = "blue Arrow" (arrowsize=2);
184187

@@ -192,6 +195,14 @@ the shape. Try it out to see the effect.
192195

193196
"green Marker" = RECOLOR (color = "Limegreen");
194197

198+
A `LINE`-tool draws straight lines.
199+
200+
"green Line" = LINE (color = "green");
201+
202+
A `RECT`-tool draws rectangles.
203+
204+
"red Rectangle" = RECT (color = "red");
205+
195206
If you define a tool with the same name as an input-device
196207
(see the output of `xinput --list`) this input-device uses this tool:
197208

‎data/net.christianbeier.Gromit-MPX.appdata.xml

+11-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>net.christianbeier.Gromit-MPX</id>
55

66
<name>Gromit-MPX</name>
7-
<summary>Gromit-MPX is a tool to make annotations on the screen</summary>
7+
<summary>Make annotations on the screen</summary>
88

99
<metadata_license>CC-BY-4.0</metadata_license>
1010
<project_license>GPL-2.0-only</project_license>
@@ -56,6 +56,16 @@
5656
</screenshots>
5757

5858
<releases>
59+
<release version="1.6.0" date="2024-03-12">
60+
<description>
61+
<p>
62+
Added a report-bug/request-feature menu item and new RECT and LINE tools as well
63+
as an arrowtype option that allows to set arrow position. Furthermore, a translation to
64+
Portuguese (Brazil) was added.
65+
</p>
66+
</description>
67+
</release>
68+
5969
<release version="1.5.1" date="2023-10-22">
6070
<description>
6171
<p>

‎flatpak/net.christianbeier.Gromit-MPX.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id: net.christianbeier.Gromit-MPX
22
runtime: org.gnome.Platform # using GNOME for the time being as we need dconf for setting hotkeys under Wayland
3-
runtime-version: '43'
3+
runtime-version: '44'
44
sdk: org.gnome.Sdk
55
command: gromit-mpx
66
finish-args:
@@ -24,8 +24,8 @@ modules:
2424
- glib-compile-schemas /app/share/glib-2.0/schemas
2525
sources:
2626
- type: archive
27-
url: https://download.gnome.org/sources/gnome-settings-daemon/43/gnome-settings-daemon-43.0.tar.xz
28-
sha256: 3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
27+
url: https://download.gnome.org/sources/gnome-settings-daemon/44/gnome-settings-daemon-44.0.tar.xz
28+
sha256: b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
2929
- name: dconf
3030
buildsystem: meson
3131
config-opts:

0 commit comments

Comments
 (0)