Skip to content

Commit 60794ba

Browse files
AlexandrePTJAlexandrePTJ
committed
Merge branch 'hotfix/0.7.1'
2 parents 1f1db76 + 0559d1d commit 60794ba

14 files changed

Lines changed: 320 additions & 288 deletions

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.11)
2-
project(KemaiProject VERSION 0.7.0 LANGUAGES CXX)
2+
project(KemaiProject VERSION 0.7.1 LANGUAGES CXX)
33

44
# Point CMake to the custom modules
55
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -9,7 +9,7 @@ include(FetchContent)
99
FetchContent_Declare(
1010
spdlog
1111
GIT_REPOSITORY https://github.com/gabime/spdlog.git
12-
GIT_TAG v1.9.2)
12+
GIT_TAG v1.10.0)
1313
FetchContent_GetProperties(spdlog)
1414
if (NOT spdlog_POPULATED)
1515
FetchContent_Populate(spdlog)

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
## How to use
1010

11-
_Kemai_ connect to your _Kimai_ instance through its API. As credentials for API are not the same as login, here is how
12-
to create them:
11+
_Kemai_ connects to your _Kimai_ instance through its API. As credentials for API are not the same as login, here is how to create them:
1312

1413
![API password](https://github.com/AlexandrePTJ/kemai/blob/master/docs/api_password.gif)
1514

@@ -19,7 +18,7 @@ Then, you can set this credentials to _Kemai_ settings :
1918

2019
## How to build
2120

22-
_Kemai_ is Qt5 based application and it uses CMake to build. So regular cmake process will work.
21+
_Kemai_ is Qt6 based application and it uses CMake to build. So regular cmake process will work.
2322

2423
```shell script
2524
> cmake . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=<path to Qt installation>

‎docs/kemai_settings.gif‎

529 KB
Loading

‎docs/screenshots/windows_add_project.jpg‎

29 KB
Loading

‎docs/screenshots/windows_running.jpg‎

19.7 KB
Loading

‎docs/screenshots/windows_settings.jpg‎

41.9 KB
Loading

‎src/app/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ set(UIS
3838
include(LocalizationTools)
3939
set(KEMAI_TS_FILES
4040
l10n/kemai_de.ts
41+
l10n/kemai_el.ts
4142
l10n/kemai_fr.ts
4243
l10n/kemai_hr.ts
4344
l10n/kemai_nb_NO.ts)

‎src/app/l10n/kemai_de.ts‎

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -164,51 +164,61 @@
164164
</message>
165165
</context>
166166
<context>
167-
<name>SettingsWidget</name>
167+
<name>SettingsDialog</name>
168168
<message>
169-
<location filename="../settingswidget.ui" line="14"/>
169+
<location filename="../settingsdialog.ui" line="14"/>
170170
<source>Settings</source>
171171
<translation>Einstellungen</translation>
172172
</message>
173173
<message>
174-
<location filename="../settingswidget.ui" line="25"/>
175-
<source>Host</source>
176-
<translation>Server</translation>
174+
<location filename="../settingsdialog.ui" line="41"/>
175+
<source>General</source>
176+
<translation type="unfinished"></translation>
177177
</message>
178178
<message>
179-
<location filename="../settingswidget.ui" line="39"/>
180-
<source>Username</source>
181-
<translation>Benutzername</translation>
179+
<location filename="../settingsdialog.ui" line="46"/>
180+
<source>Profiles</source>
181+
<translation type="unfinished"></translation>
182182
</message>
183183
<message>
184-
<location filename="../settingswidget.ui" line="49"/>
185-
<source>Token</source>
186-
<translation>API Passwort</translation>
184+
<location filename="../settingsdialog.ui" line="61"/>
185+
<source>Close to system tray</source>
186+
<translation>In die Taskleiste schließen</translation>
187187
</message>
188188
<message>
189-
<location filename="../settingswidget.ui" line="63"/>
189+
<location filename="../settingsdialog.ui" line="68"/>
190+
<source>Minimize to system tray</source>
191+
<translation type="unfinished"></translation>
192+
</message>
193+
<message>
194+
<location filename="../settingsdialog.ui" line="75"/>
190195
<source>Language</source>
191-
<translation>Sprache</translation>
196+
<translation type="unfinished">Sprache</translation>
192197
</message>
193198
<message>
194-
<location filename="../settingswidget.ui" line="70"/>
195-
<source>Close to system tray</source>
196-
<translation>In die Taskleiste schließen</translation>
199+
<location filename="../settingsdialog.ui" line="150"/>
200+
<source>Name</source>
201+
<translation>Name</translation>
197202
</message>
198203
<message>
199-
<location filename="../settingswidget.ui" line="110"/>
200-
<source>Test</source>
201-
<translation>Testen</translation>
204+
<location filename="../settingsdialog.ui" line="170"/>
205+
<source>Host</source>
206+
<translation>Server</translation>
202207
</message>
203208
<message>
204-
<location filename="../settingswidget.ui" line="130"/>
205-
<source>Cancel</source>
206-
<translation>Abbrechen</translation>
209+
<location filename="../settingsdialog.ui" line="187"/>
210+
<source>Username</source>
211+
<translation>Benutzername</translation>
207212
</message>
208213
<message>
209-
<location filename="../settingswidget.ui" line="137"/>
210-
<source>Save</source>
211-
<translation>Speichern</translation>
214+
<location filename="../settingsdialog.ui" line="201"/>
215+
<source>Token</source>
216+
<translation>API Passwort</translation>
217+
</message>
218+
<message>
219+
<location filename="../settingsdialog.ui" line="242"/>
220+
<source>Test</source>
221+
<translation>Testen</translation>
212222
</message>
213223
</context>
214224
<context>
@@ -235,69 +245,74 @@
235245
</message>
236246
<message>
237247
<location filename="../taskwidget.ui" line="73"/>
238-
<source>Done</source>
239-
<translation>Fertig</translation>
248+
<source>Close</source>
249+
<translation type="unfinished"></translation>
240250
</message>
241251
</context>
242252
<context>
243253
<name>kemai::app::MainWindow</name>
244254
<message>
245-
<location filename="../mainwindow.cpp" line="38"/>
255+
<location filename="../mainwindow.cpp" line="47"/>
246256
<source>&amp;Quit</source>
247257
<translation>&amp;Beenden</translation>
248258
</message>
249259
<message>
250-
<location filename="../mainwindow.cpp" line="39"/>
260+
<location filename="../mainwindow.cpp" line="48"/>
251261
<source>&amp;Settings</source>
252262
<translation>&amp;Einstellungen</translation>
253263
</message>
254264
<message>
255-
<location filename="../mainwindow.cpp" line="40"/>
265+
<location filename="../mainwindow.cpp" line="49"/>
256266
<source>Check for updates...</source>
257267
<translation>Auf Updates überprüfen...</translation>
258268
</message>
259269
<message>
260-
<location filename="../mainwindow.cpp" line="41"/>
270+
<location filename="../mainwindow.cpp" line="50"/>
261271
<source>Open Kimai instance</source>
262272
<translation>Öffne Kimai im Browser</translation>
263273
</message>
264274
<message>
265-
<location filename="../mainwindow.cpp" line="42"/>
275+
<location filename="../mainwindow.cpp" line="51"/>
266276
<source>Activities</source>
267277
<translation>Tätigkeiten</translation>
268278
</message>
269279
<message>
270-
<location filename="../mainwindow.cpp" line="43"/>
280+
<location filename="../mainwindow.cpp" line="52"/>
271281
<source>Tasks</source>
272282
<translation>Aufgaben</translation>
273283
</message>
274284
<message>
275-
<location filename="../mainwindow.cpp" line="72"/>
285+
<location filename="../mainwindow.cpp" line="83"/>
276286
<source>&amp;File</source>
277287
<translation>&amp;Datei</translation>
278288
</message>
279289
<message>
280-
<location filename="../mainwindow.cpp" line="77"/>
290+
<location filename="../mainwindow.cpp" line="88"/>
291+
<source>&amp;Profile</source>
292+
<translation type="unfinished"></translation>
293+
</message>
294+
<message>
295+
<location filename="../mainwindow.cpp" line="90"/>
281296
<source>&amp;View</source>
282297
<translation>&amp;Ansehen</translation>
283298
</message>
284299
<message>
285-
<location filename="../mainwindow.cpp" line="81"/>
300+
<location filename="../mainwindow.cpp" line="94"/>
286301
<source>&amp;Help</source>
287302
<translation>&amp;Hilfe</translation>
288303
</message>
289304
<message>
290-
<location filename="../mainwindow.cpp" line="86"/>
305+
<location filename="../mainwindow.cpp" line="99"/>
291306
<source>About Qt</source>
292307
<translation>Über Qt</translation>
293308
</message>
294309
<message>
295-
<location filename="../mainwindow.cpp" line="287"/>
310+
<location filename="../mainwindow.cpp" line="410"/>
296311
<source>New version available</source>
297312
<translation>Neue Version verfügbar</translation>
298313
</message>
299314
<message>
300-
<location filename="../mainwindow.cpp" line="287"/>
315+
<location filename="../mainwindow.cpp" line="410"/>
301316
<source>Version %1 is available.
302317

303318
%2</source>
@@ -306,43 +321,32 @@
306321
%2</translation>
307322
</message>
308323
<message>
309-
<location filename="../mainwindow.cpp" line="309"/>
324+
<location filename="../mainwindow.cpp" line="432"/>
310325
<source>No update</source>
311326
<translation>Kein Update</translation>
312327
</message>
313328
<message>
314-
<location filename="../mainwindow.cpp" line="309"/>
329+
<location filename="../mainwindow.cpp" line="432"/>
315330
<source>%1 is latest version.</source>
316331
<translation>%1 ist die aktuelle Version.</translation>
317332
</message>
318333
</context>
319334
<context>
320-
<name>kemai::app::SettingsWidget</name>
335+
<name>kemai::app::SettingsDialog</name>
321336
<message>
322-
<location filename="../settingswidget.cpp" line="57"/>
337+
<location filename="../settingsdialog.cpp" line="71"/>
323338
<source>Language changed. Application restart is required.</source>
324339
<translation>Sprache wurde gewechselt, das Programm muss neu gestartet werden.</translation>
325340
</message>
326341
<message>
327-
<location filename="../settingswidget.cpp" line="78"/>
342+
<location filename="../settingsdialog.cpp" line="171"/>
328343
<source>Invalid reply.</source>
329344
<translation>Ungültige Antwort.</translation>
330345
</message>
331346
<message>
332-
<location filename="../settingswidget.cpp" line="83"/>
347+
<location filename="../settingsdialog.cpp" line="176"/>
333348
<source>Connected to Kimai %1</source>
334349
<translation>Verbunden mit Kimai %1</translation>
335350
</message>
336351
</context>
337-
<context>
338-
<name>kemai::client::KimaiClient::KimaiClientPrivate</name>
339-
<message>
340-
<source>Error on request [%1]: %2</source>
341-
<translation type="vanished">Erreur sur la requête [%1] : %2</translation>
342-
</message>
343-
<message>
344-
<source>Unknown request [%1]</source>
345-
<translation type="vanished">Requête inconnue [%1]</translation>
346-
</message>
347-
</context>
348352
</TS>

0 commit comments

Comments
 (0)