Commit Graph

49 Commits

Author SHA1 Message Date
Giovanni JOSSERAND b9aa141763 adapt style function to work with PlainTextEdit 2025-06-20 22:18:33 +02:00
Giovanni JOSSERAND fe5623b804 add of color selector 2025-06-20 16:30:24 +02:00
Giovanni JOSSERAND 65e391412e add of setbold, setItalic, setUnderlined and setFontColor functions 2025-06-20 11:54:36 +02:00
T'JAMPENS QUENTIN p2406187 f8cac1aeff Merge branch 'feature/editTool' into 'main'
Feature/edit tool

See merge request p2406187/sae201!10
2025-06-19 20:56:32 +00:00
T'JAMPENS QUENTIN p2406187 2aa518bc1d Add cut function 2025-06-19 22:55:11 +02:00
T'JAMPENS QUENTIN p2406187 f4454d513e Add paste function 2025-06-19 22:38:00 +02:00
T'JAMPENS QUENTIN p2406187 44c858805c Add copy function 2025-06-19 22:30:01 +02:00
T'JAMPENS QUENTIN p2406187 84217adccf Merge branch 'feature/undoredo' into 'main'
Feature/undoredo

See merge request p2406187/sae201!9
2025-06-19 17:30:38 +00:00
T'JAMPENS QUENTIN p2406187 0cd4f95865 Undo and Redo command 2025-06-19 19:29:12 +02:00
T'JAMPENS QUENTIN p2406187 57d77cf7cf scale image 2025-06-19 12:04:56 +02:00
T'JAMPENS QUENTIN p2406187 957956a92e Fix toolbar open icon 2025-06-19 11:41:24 +02:00
T'JAMPENS QUENTIN p2406187 730d0850f3 delete test file 2025-06-19 11:23:56 +02:00
T'JAMPENS QUENTIN p2406187 564551b117 Fix images 2025-06-19 11:23:56 +02:00
T'JAMPENS QUENTIN p2406187 ebdd205d8c Delete .qmake.stash 2025-06-19 08:42:49 +00:00
T'JAMPENS QUENTIN p2406187 c40e50cc5c Show app 2025-06-19 10:41:39 +02:00
T'JAMPENS QUENTIN p2406187 e3f79d95b7 Extract loadPath function 2025-06-19 10:41:10 +02:00
T'JAMPENS QUENTIN p2406187 29054c76a2 Merge branch 'feature/openFile' into 'main'
Feature/open file

See merge request p2406187/sae201!8
2025-06-19 08:26:57 +00:00
T'JAMPENS QUENTIN p2406187 6b4191057f Merge branch 'main' into 'feature/openFile'
# Conflicts:
#   path.h
2025-06-19 08:26:49 +00:00
T'JAMPENS QUENTIN p2406187 078ca3a983 Add getters 2025-06-19 10:24:45 +02:00
LEBLOND MALO p2405951 d1f05f0115 Merge branch 'feature/step' into 'main'
Feature/step

See merge request p2406187/sae201!7
2025-06-19 08:24:04 +00:00
T'JAMPENS QUENTIN p2406187 37000d8281 Load data 2025-06-19 10:23:50 +02:00
p2405951 96321942f0 final constructeur (copie) step 2025-06-19 10:22:43 +02:00
LEBLOND MALO p2405951 016927b34a Merge branch 'main' into 'feature/step'
Main

See merge request p2406187/sae201!6
2025-06-19 08:06:05 +00:00
p2405951 ae0d443a13 modif constr json 2025-06-19 10:02:20 +02:00
p2405951 2383b88846 Merge branch 'feature/step' of https://iutbg-gitlab.iutbourg.univ-lyon1.fr/p2406187/sae201 into feature/step 2025-06-19 09:57:16 +02:00
p2405951 b2f95da02c constrcuteur parse json 2025-06-19 09:51:06 +02:00
iutbgdin 7bf2dc2d08 ad of default value in addStep 2025-06-19 09:49:24 +02:00
JOSSERAND GIOVANNI p2405212 8fd2dc0df7 Merge branch 'feature/Path' into 'main'
add of data directory and first path

See merge request p2406187/sae201!5
2025-06-19 07:39:23 +00:00
T'JAMPENS QUENTIN p2406187 938a7798b6 Merge branch 'feature/Terraventura' into 'main'
Feature/terraventura

See merge request p2406187/sae201!4
2025-06-19 07:38:07 +00:00
T'JAMPENS QUENTIN p2406187 d9ccb54768 Merge branch 'main' into 'feature/Terraventura'
# Conflicts:
#   sae201.pro
2025-06-19 07:37:58 +00:00
iutbgdin db54336904 add of data directory and first path 2025-06-19 09:37:10 +02:00
T'JAMPENS QUENTIN p2406187 1f1181e565 Add build to gitignore 2025-06-19 09:35:57 +02:00
T'JAMPENS QUENTIN p2406187 81b4209118 Create open btn 2025-06-19 09:35:28 +02:00
JOSSERAND GIOVANNI p2405212 0be1ffc72d Merge branch 'feature/Path' into 'main'
Feature/path

See merge request p2406187/sae201!3
2025-06-19 07:30:09 +00:00
iutbgdin f6d2929140 end of addStep and constructor per parameter 2025-06-19 09:28:29 +02:00
T'JAMPENS QUENTIN p2406187 332fa2bc0b Create function, add path data and interaction 2025-06-18 23:13:05 +02:00
T'JAMPENS QUENTIN p2406187 3048920666 Add image 2025-06-18 17:08:29 +02:00
T'JAMPENS QUENTIN p2406187 fa52281d2b Add path information 2025-06-18 16:49:40 +02:00
T'JAMPENS QUENTIN p2406187 269f96a56b Add path class 2025-06-18 15:26:37 +02:00
LEBLOND MALO p2405951 7722dde604 Merge branch 'feature/step' into 'feature/Path'
Feature/step

See merge request p2406187/sae201!2
2025-06-18 13:13:32 +00:00
LEBLOND MALO p2405951 1063962e61 Merge branch 'feature/Path' into 'feature/step'
# Conflicts:
#   sae201.pro
2025-06-18 13:13:17 +00:00
iutbgdin 7ce7ca9df5 First step for copy constructor 2025-06-18 15:09:29 +02:00
p2405951 5f2bb19da9 constructeur step 2025-06-18 15:07:36 +02:00
p2405951 fd004988d6 classe step 2025-06-18 14:48:58 +02:00
T'JAMPENS QUENTIN p2406187 148e774c83 Merge branch 'feature/Path' into 'main'
initialise path.h

See merge request p2406187/sae201!1
2025-06-18 12:36:50 +00:00
T'JAMPENS QUENTIN p2406187 6d45acc357 Initialize mainWindows class 2025-06-18 14:34:57 +02:00
iutbgdin 9b02342369 initialise path.h 2025-06-18 14:34:53 +02:00
T'JAMPENS QUENTIN p2406187 cb03e1f91f Initial commit 2025-06-18 14:19:11 +02:00
T'JAMPENS QUENTIN p2406187 bde01ae1b2 Initial commit 2025-06-18 14:17:48 +02:00