Arin Alexander
1abe679a77
Merge tag '1.7.3' into develop
...
Finish 1.7.3
2023-04-11 13:40:12 +03:00
Arin Alexander
491b78752c
Finish 1.7.3
2023-04-11 13:40:12 +03:00
Arin Alexander
a7cdb28b4a
Keep bottom space has been fixed
2023-04-11 13:39:54 +03:00
rangemastersystems
2b388b02fe
Merge branch 'fralx:master' into master
2023-03-15 09:39:13 +03:00
Dmitry Zagorodnev
87eae706e5
Fix: replace fakeMarginSize() -> marginSize()
...
* В алгоритмах расчета размеров объекта использовалась функция
fakeMarginSize() увеличивающая отступы на 5px.
2023-03-15 09:35:59 +03:00
Dmitry Zagorodnev
fbfe26aa53
Fix: lrtextitem.cpp
...
* fakeMarginSize - убрал +5px постоянный размер прогала
2023-03-14 17:49:38 +03:00
Dmitry Zagorodnev
fede9963be
Fix: lrcompletermodel.h -> child(int row)
2023-03-09 15:32:48 +03:00
Dmitry Zagorodnev
de850125aa
Fix: lrcompletermodel access to null ptr
2023-02-20 14:29:32 +03:00
Dmitry Zagorodnev
56e145ecd8
Fix: lrcompletermodel.h out of range
2023-02-20 14:24:25 +03:00
Arin Alex
7e46851805
Merge tag 'version/1.7.2' into develop
...
Finish version/1.7.2
2023-02-07 19:21:29 +03:00
Arin Alex
a969d3452b
Finish version/1.7.2
2023-02-07 19:21:29 +03:00
Arin Alex
0b830069b2
fix build for c++ < 17
2023-02-07 18:44:00 +03:00
Arin Alex
a9ff344677
Merge tag 'version/1.7.1' into develop
...
Finish version/1.7.1
2023-02-07 01:02:28 +03:00
Arin Alex
4f5c27817c
Finish version/1.7.1
2023-02-07 01:02:28 +03:00
Arin Alex
772a15b867
Temporary removed information label (it should be redesigned)
2023-02-07 01:02:21 +03:00
Arin Alex
b6e4610779
Merge tag 'version/1.7.0' into develop
...
Finish version/1.7.0
# Conflicts:
# limereport/report.qrc
2023-02-07 00:34:52 +03:00
Arin Alex
8ed3fb6344
Finish version/1.7.0
2023-02-07 00:33:27 +03:00
Arin Alex
4bb82ffa52
fix build for c++ < 17
2023-02-07 00:32:58 +03:00
Alexander Arin
9af5af74b3
Merge pull request #428 from rangemastersystems/master
...
Fix: ReportEnginePrivate::exportReport Не работал экспорт при пустом
2023-02-02 11:29:07 +03:00
Alexander Arin
3fbedf0860
Merge pull request #427 from yanis60/master
...
added position info when dragging
2023-02-02 11:28:26 +03:00
Dmitry Zagorodnev
77d9d44df6
Fix: ReportEnginePrivate::exportReport Не работал экспорт при пустом
...
параметре
2023-01-19 15:10:02 +03:00
yanis60
a2f72fdad7
Merge branch 'master' into master
2023-01-19 06:02:04 +00:00
Alexander Arin
d354c8f4c9
Merge pull request #426 from Jihadist/build-fixes
...
Build fixes
2023-01-18 22:58:47 +03:00
yanis60
36d8878f6e
added position info when dragging
2023-01-13 09:26:30 +01:00
Jihadist
3a7f4fef28
remove local CMakeLists.txt.user
2023-01-11 21:56:17 +03:00
Jihadist
266b6795da
fix build without UiTools
2023-01-11 21:56:17 +03:00
Anton
b0d0fd526b
fix cmake install dirs and public headers
2023-01-11 21:55:57 +03:00
Alexander Arin
74758e035b
Merge pull request #424 from Jihadist/patch-1
...
Fix cmake_minimum_required
2023-01-11 00:47:48 +03:00
Alexander Arin
4cbb1a1e66
Merge pull request #425 from yanis60/master
...
Page free space calculation has been updated
2023-01-11 00:47:31 +03:00
yanis60
920037d387
Page free space calculation has been updated
2023-01-09 09:42:19 +00:00
Anton
706eefba7c
Fix cmake_minimum_required
...
https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
Call the cmake_minimum_required() command at the beginning of the top-level CMakeLists.txt file even before calling the project() command. It is important to establish version and policy settings before invoking other commands whose behavior they may affect.
2023-01-05 00:22:53 +00:00
Alexander Arin
f202c57a43
Merge pull request #421 from Jihadist/feature/cmake-doc
...
Update readme for cmake
2022-11-09 16:51:28 +03:00
Anton
288afc44e4
Update readme for cmake
2022-11-09 09:33:42 +00:00
Alexander Arin
fe81e314d3
Finish 1.6.9
2022-11-01 13:30:15 +03:00
Alexander Arin
2aaf467dc1
Cmake fixed
2022-11-01 13:29:52 +03:00
Alexander Arin
09873390e2
Finish 1.6.8
2022-11-01 13:23:09 +03:00
Alexander Arin
934e31ec1c
Cmake fixed
2022-11-01 13:22:20 +03:00
Alexander Arin
29c449e14f
Finish refactor_border_editor
2022-11-01 12:48:42 +03:00
Alexander Arin
9ce8294976
Merge branch 'master' into feature/refactor_border_editor
2022-11-01 12:48:29 +03:00
Alexander Arin
44d31243ab
Border editor little bit refactored
2022-11-01 11:48:47 +03:00
Alexander Arin
33dce7ef27
Merge pull request #417 from rangemastersystems/master
...
Add ImageItem::isEmpty, Fix: ImageItem::paint
2022-11-01 11:45:20 +03:00
Alexander Arin
7bf0ce51e6
Border editor refactoring
2022-10-31 21:20:24 +03:00
Alexander Arin
b1c67651c8
Merge pull request #418 from Jihadist/master
...
Github actions update
2022-10-31 21:15:22 +03:00
Jihadist
e6ead26d31
Cmake fixes: non exported symbols, missing files, shared import, rewrite cmake for demo and designer
2022-10-31 15:30:47 +03:00
Anton
f00f72efa9
Github actions: add support msvc, mingw, macos
2022-10-31 15:30:32 +03:00
Alexander Arin
ba9abc7877
Merge pull request #398 from yanis60/master
...
improved borders
2022-10-26 01:20:33 +03:00
Dmitry Zagorodnev
29189c522d
Merge remote-tracking branch 'refs/remotes/origin/master'
2022-10-24 15:24:38 +03:00
Dmitry Zagorodnev
2c5ed82376
Fix: ImageItem::paint
2022-10-24 14:57:31 +03:00
Dmitry Zagorodnev
4903abc408
+
2022-10-24 13:07:25 +03:00
Dmitry Zagorodnev
2059a2a164
Fix: ImageItem added isEmpty
2022-10-20 14:25:53 +03:00
