Commit Graph

143 Commits

Author SHA1 Message Date
70ed416dc6 Uncrustified Files 2020-01-15 12:02:36 +01:00
af5a05faf8 Removed Linestyle from the project 2020-01-15 12:01:17 +01:00
c4467b70b8 Removed Rest of the // comments in headers 2020-01-15 11:47:51 +01:00
9d1159a08e Removed First Part of the // comments in headers
- TODO: IntelliPhotoGui
2020-01-15 11:45:57 +01:00
6fec7c26bf Uncrustified Files 2020-01-13 19:59:30 +01:00
Jan Schuffenhauer
048fae53fb Added Colorpalette for most of the things
@AshBastian
@DerAnonymos
2020-01-10 11:16:17 +01:00
Jonas Mucke
2ae679099b Update PaintingArea.h 2020-01-09 20:18:50 +01:00
Jonas Mucke
736ca69245 warning fixen and better circle 2020-01-09 20:09:40 +01:00
Jan Schuffenhauer
d54e1f3700 Added more Hotkeys + edited ColorPalette
TY all for watching
2020-01-09 17:07:27 +01:00
Jan Schuffenhauer
f96f8aabc4 Update IntelliPhotoGui.cpp 2020-01-09 15:29:42 +01:00
Jan Schuffenhauer
37ba19d792 Menuerweiterung 2020-01-09 14:48:24 +01:00
Jan Schuffenhauer
f1b77a48c8 Merge branch 'dev' of https://gitlab.com/creyd/intelliphoto into dev 2020-01-09 14:03:04 +01:00
Jan Schuffenhauer
081ac68d5f Updatet ui fixed bugs, improved performance, just everything
Autors:
@DerAnonymos
@AshBastian
@Sonaion
2020-01-09 13:59:22 +01:00
124dfd7931 Uncrustified header files 2020-01-09 11:44:26 +01:00
624eb0fde6 Uncrustify all .cpp files 2020-01-09 11:35:36 +01:00
Jan Schuffenhauer
e3b2968f4d Fixed Image ENUMs
ty
2020-01-09 10:45:54 +01:00
Jan Schuffenhauer
18aec48e4c Merge branch 'dev' into 'dev-stupidrenderer'
# Conflicts:
#   src/Image/IntelliImage.cpp
#   src/Image/IntelliRasterImage.cpp
#   src/Image/IntelliShapedImage.cpp
#   src/Layer/PaintingArea.cpp
2020-01-09 09:39:38 +00:00
Jan Schuffenhauer
67b623a63a bring the fastrenderer back again...
hihihi
2020-01-09 10:35:01 +01:00
d4313e29a0 Ran Uncrustify Again 2020-01-09 10:18:28 +01:00
ee64fa6997 Unified ENUM Names 2020-01-09 10:15:02 +01:00
37b8642497 Fixed a bug where the index variable rename went wrong 2020-01-09 10:13:58 +01:00
326f9c8948 Unified Index Variable Name 2020-01-09 10:12:38 +01:00
AshBastian
6fdda34d68 Gui Endprodukt 2020-01-09 02:43:43 +01:00
Bastian Schindler
4a6098856f Merge branch 'Helper_Variablen' into 'dev-stupidrenderer'
# Conflicts:
#   src/Image/IntelliImage.h
#   src/IntelliPhoto.pro
#   src/Layer/PaintingArea.h
2020-01-09 00:10:40 +00:00
AshBastian
73500db171 Sorry falscher Merge 2020-01-09 01:07:25 +01:00
AshBastian
46a69024d3 Fix 2020-01-09 00:58:03 +01:00
AshBastian
8b1fd5c3f0 Fixes 2020-01-09 00:52:17 +01:00
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
AshBastian
540e23aadf asdjzh fhg fgghdvbsjasjaffg 2020-01-08 21:07:32 +01:00
Jan Schuffenhauer
7ed8e858af Now everything is Indexe 8 😲
Job done.
2020-01-08 19:56:56 +01:00
AshBastian
a99ad09e8c Dummy Gui 2020-01-08 19:55:34 +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
42f91ca719 Bilder 2020-01-08 18:26:50 +01:00
AshBastian
c321a181b1 Linenverwaltung 2020-01-08 16:41:56 +01:00
AshBastian
6d4a4e52b5 Destructor 2020-01-08 15:53:51 +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
2aa49f1b79 Update IntelliToolPolygon.cpp 2020-01-07 15:35:04 +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
Mienek
d727591977 Merge branch 'dev-warnings' into 'dev'
fixed warnings

See merge request creyd/intelliphoto!24
2019-12-20 09:06:23 +00: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
ab8590c4fe Refractored fileName to more intuitive filePath 2019-12-20 09:15:02 +01:00
0411c49534 Refractored misspelled variable 2019-12-20 09:03:26 +01:00
Sonaion
279b46bc1d Update IntelliHelper.cpp 2019-12-20 08:56:15 +01:00