Commit Graph

37 Commits

Author SHA1 Message Date
Jonas Mucke
2f5a389d46 Merge branch 'dev' into canvas 2020-01-16 16:50:16 +01:00
Mienek
58f679a0b6 added Dimension
added the change and get dimesions stuff
2020-01-16 16:35:30 +01:00
b1600aa3a9 Merge branch 'dev' into UnitTesting 2020-01-16 11:24:44 +01:00
7109948969 Merge branch 'dev-colorpalette' into dev 2020-01-16 11:19:23 +01:00
249cf5d02d Merge branch 'dev' into UnitTesting 2020-01-16 10:45:23 +01:00
Jan Schuffenhauer
add66d368b Merge branch 'dev' into dev-colorpalette 2020-01-16 00:11:24 +01:00
Jan Schuffenhauer
b695a25128 Fixed Inputboxes and Design
Todo pls merge me.
2020-01-16 00:00:27 +01:00
Jonas Mucke
0e6ce309c9 code cleanup #2 2020-01-15 19:04:51 +01:00
Jonas Mucke
72d55b2c8f first Cleanup 2020-01-15 18:40:17 +01:00
AshBastian
b5e05a9c6a Update InputBoxes 2020-01-15 15:48:38 +01:00
Conrad
14233f8484 Merge branch 'dev' into 'dev-rework'
# Conflicts:
#   cppcheck_errors.txt
#   src/GUI/IntelliPhotoGui.h
2020-01-15 13:57:27 +00:00
Jan Schuffenhauer
1f0b856079 FIxed all bugs and removed dead code
my job is done here
ready to be merge
2020-01-15 14:23:14 +01:00
70ed416dc6 Uncrustified Files 2020-01-15 12:02:36 +01:00
9d1159a08e Removed First Part of the // comments in headers
- TODO: IntelliPhotoGui
2020-01-15 11:45:57 +01:00
Jan Schuffenhauer
d8f6f0f8f7 implemented creation of certain image type and alo button for setting poylgon data
TODO implement setPolygon function
2020-01-14 21:02:03 +01:00
Jonas Mucke
5a05aa4a19 start of unit test 2020-01-12 20:23:39 +01:00
AshBastian
7491472962 Schluss 2020-01-10 21:10:49 +01:00
AshBastian
ea7316cb0b Buttonsize Updated 2020-01-10 12:39:01 +01:00
AshBastian
74d2d30fe0 Update 2020-01-10 12:28:55 +01:00
Jan Schuffenhauer
048fae53fb Added Colorpalette for most of the things
@AshBastian
@DerAnonymos
2020-01-10 11:16:17 +01:00
Jan Schuffenhauer
37ba19d792 Menuerweiterung 2020-01-09 14:48:24 +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
AshBastian
6fdda34d68 Gui Endprodukt 2020-01-09 02:43:43 +01:00
AshBastian
46a69024d3 Fix 2020-01-09 00:58:03 +01:00
AshBastian
540e23aadf asdjzh fhg fgghdvbsjasjaffg 2020-01-08 21:07:32 +01:00
AshBastian
a99ad09e8c Dummy Gui 2020-01-08 19:55:34 +01:00
AshBastian
c321a181b1 Linenverwaltung 2020-01-08 16:41: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
c415a53c83 Documented the gui file 2019-12-19 18:16:26 +01:00
Sonaion
9bc45dedfd gui changes for tool anwendung 2019-12-19 14:33:28 +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
AshBastian
89b9e44677 PolygonTool fertig 2019-12-18 15:47:23 +01:00
AshBastian
3525261e1e Polygon Update 2019-12-17 17:45:42 +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