Commit Graph

34 Commits

Author SHA1 Message Date
Bastian Schindler
9af9969c2f Merge branch 'Helper_Variablen' into 'dev-stupidrenderer'
# Conflicts:
#   src/Image/IntelliImage.h
#   src/IntelliPhoto.pro
#   src/Layer/PaintingArea.h
2020-01-08 23:47:37 +00:00
Jan Schuffenhauer
7ed8e858af Now everything is Indexe 8 😲
Job done.
2020-01-08 19:56:56 +01:00
Jan Schuffenhauer
78272a5790 now working 100% :D
Fixed a bug where a not activatet tool caused trouble.
2020-01-08 19:40:35 +01:00
Jan Schuffenhauer
c04d8d6815 [W.I.P.] Added a FasterRenderOption
Still completly buggy. and it crashes imediatly after input
2020-01-08 19:01:05 +01:00
AshBastian
52a72c05c5 ToolSettings 2020-01-08 15:47:16 +01:00
AshBastian
e540bd64f2 Polygon Fixes
Polygon kann jetzt im Shaped-Image nicht außerhalb des Polygons gestartet werden
2020-01-07 17:39:52 +01:00
AshBastian
c06a4aa87e Absturz behoben
Bei Mausraddrehen kam es zu Absturz, wenn Tool nullptr, weil Zugriff auf Tool
2020-01-07 16:03:54 +01:00
AshBastian
28b8d92d72 BugFixes 2020-01-07 15:23:14 +01:00
8efe6836bf Reworked some method names 2019-12-20 10:42:49 +01:00
86a01eb9ae Merge branch 'dev-variable-refractor' into dev 2019-12-20 10:13:59 +01:00
d81afbb8ee Refractoring Update 2
- Adjusted variable names to naming conventions
- Concluded header files
2019-12-20 10:05:57 +01:00
Mienek
7a604c805a some fixes
only unused Variable and shadowing left
2019-12-20 10:02:56 +01:00
52292ebfe7 Refractoring Update 1
- Refractored switchColor to slotSwapColor
- Corrected spelling mistake in variable name (weight-->width)
- Unified variable names
2019-12-20 09:50:30 +01:00
a838e3869f Restyled project for uncrustify 2019-12-19 18:27:46 +01:00
91fc9a4308 Refraktored another misspelled variable
- hightOffset --> heightOffset
2019-12-19 17:39:24 +01:00
dcd26f76ef Fixed misspelled variable 2019-12-19 17:32:07 +01:00
Sonaion
9bc45dedfd gui changes for tool anwendung 2019-12-19 14:33:28 +01:00
Sonaion
ec37be62fc Tool anpassungen 2019-12-19 13:54:17 +01:00
a3c19e9851 Merge branch 'dev' into dev-docs 2019-12-19 12:43:22 +01:00
2da9e15d36 Minor Code Style Update + Documentation Spelling Fix 2019-12-19 12:03:21 +01:00
d52dd552f3 Merge branch 'dev' into dev_PolygonTool 2019-12-19 11:31:34 +01:00
Mienek
c9a88909ad FloodFill
ist fertig
2019-12-18 19:41:11 +01:00
AshBastian
89b9e44677 PolygonTool fertig 2019-12-18 15:47:23 +01:00
Conrad
38f89f30f9 Merge branch 'hotfix' into 'dev'
Fixed the Linux color picker and system dialog bugs

See merge request creyd/intelliphoto!20
2019-12-18 12:55:56 +00:00
5534522440 Refractoring of "Rechteck" to "rectangle" 2019-12-18 12:42:10 +01:00
a0f1203fb1 Fixed a bug where the system dialogs wouldn't show up on linux
Thx to @Jan for this contribution and testing
2019-12-18 13:02:25 +01:00
AshBastian
3525261e1e Polygon Update 2019-12-17 17:45:42 +01:00
Sonaion
67a72fe487 Scroll implemented 2019-12-16 19:23:56 +01:00
Sonaion
1c29d564c7 rectangle tool 2019-12-13 13:47:32 +01:00
Sonaion
ce331cafa8 testing for tools 2019-12-13 13:24:42 +01:00
Sonaion
4dac816505 Merge branch 'CyrcleTool' into dev 2019-12-13 13:22:15 +01:00
Sonaion
ca9395901b Cryle Tool 2019-12-13 13:20:55 +01:00
fbffc331d4 Code Style Update
- Everything is beautiful now
2019-12-13 09:13:19 +01:00
9f9315c8a4 Moved up src/ one level 2019-12-13 08:57:53 +01:00