diff --git a/Appli/TouchGFX/CelloEffects.touchgfx b/Appli/TouchGFX/CelloEffects.touchgfx index 2ae7f8e..d0bd5e0 100644 --- a/Appli/TouchGFX/CelloEffects.touchgfx +++ b/Appli/TouchGFX/CelloEffects.touchgfx @@ -7,26 +7,27 @@ { "Type": "Image", "Name": "image1", + "Y": -1, "Width": 800, - "Height": 480, - "RelativeFilename": "__generated\\glass_theme_images_backgrounds_800x480_gradient_summer.png" + "Height": 483, + "RelativeFilename": "fondHorlogerie1.png" }, { "Type": "ButtonWithIcon", "Name": "buttonWithIcon1", - "X": 233, - "Y": 79, + "X": 329, + "Y": 91, "Width": 334, "Height": 322, - "Pressed": "__generated\\glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png", - "Released": "__generated\\glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png", - "IconPressed": "__generated\\icon_theme_images_action_done_50_50_E8F6FB.svg.png", - "IconReleased": "__generated\\icon_theme_images_av_music_video_50_50_E8F6FB.svg.png", + "Pressed": "__generated\\glass_theme_images_widgets_button_icon_round_huge_fill_pressed.png", + "Released": "__generated\\glass_theme_images_widgets_button_icon_round_huge_fill_normal.png", + "IconPressed": "__generated\\icon_theme_images_action_done_50_50_B5241F.svg.png", + "IconReleased": "__generated\\icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.png", "IconX": 142, "IconY": 136, "IconHeight": 50, "IconWidth": 50, - "Preset": "glass_theme\\presets\\button\\icon\\rounded\\huge_fill_normal.json" + "Preset": "glass_theme\\presets\\button\\icon\\round\\huge_fill_normal.json" } ], "Interactions": [ @@ -47,6 +48,14 @@ { "Name": "Overview", "Components": [ + { + "Type": "Image", + "Name": "image1", + "Y": -1, + "Width": 800, + "Height": 483, + "RelativeFilename": "fondHorlogerie1.png" + }, { "Type": "Box", "Name": "box1", @@ -56,7 +65,8 @@ "Red": 35, "Green": 24, "Blue": 15 - } + }, + "Alpha": 182 }, { "Type": "ButtonWithLabel", @@ -171,6 +181,17 @@ }, "TextRotation": "0", "Preset": "glass_theme\\presets\\button\\regular\\height_50\\large_rounded_normal.json" + }, + { + "Type": "ToggleButton", + "Name": "toggleButton1", + "X": 118, + "Y": 22, + "Width": 170, + "Height": 60, + "Pressed": "__generated\\glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.png", + "Released": "__generated\\glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.png", + "Preset": "glass_theme\\presets\\togglebutton\\large\\rounded_active_text.json" } ], "Interactions": [ @@ -233,12 +254,31 @@ "ScreenTransitionType": "ScreenTransitionNone", "ActionComponent": "Reverb" } + }, + { + "InteractionName": "Interaction6", + "Trigger": { + "Type": "TriggerClicked", + "TriggerComponent": "toggleButton1" + }, + "Action": { + "Type": "ActionCustom", + "FunctionName": "toggleAudioOnOFF" + } } ] }, { "Name": "Overdrive", "Components": [ + { + "Type": "Image", + "Name": "image1", + "Y": -1, + "Width": 800, + "Height": 483, + "RelativeFilename": "fondHorlogerie1.png" + }, { "Type": "Box", "Name": "box1", @@ -248,7 +288,8 @@ "Red": 35, "Green": 24, "Blue": 15 - } + }, + "Alpha": 241 }, { "Type": "ToggleButton", @@ -460,6 +501,14 @@ { "Name": "Saturation", "Components": [ + { + "Type": "Image", + "Name": "image1", + "Y": -1, + "Width": 800, + "Height": 483, + "RelativeFilename": "fondHorlogerie1.png" + }, { "Type": "Box", "Name": "box1", @@ -469,7 +518,8 @@ "Red": 35, "Green": 24, "Blue": 15 - } + }, + "Alpha": 240 }, { "Type": "TextArea", @@ -637,6 +687,14 @@ { "Name": "Echo", "Components": [ + { + "Type": "Image", + "Name": "image1", + "Y": -1, + "Width": 800, + "Height": 483, + "RelativeFilename": "fondHorlogerie1.png" + }, { "Type": "Box", "Name": "box1", @@ -646,7 +704,9 @@ "Red": 35, "Green": 24, "Blue": 15 - } + }, + "Alpha": 240, + "Draggable": true }, { "Type": "TextArea", @@ -858,6 +918,14 @@ { "Name": "Reverb", "Components": [ + { + "Type": "Image", + "Name": "image1", + "Y": -1, + "Width": 800, + "Height": 483, + "RelativeFilename": "fondHorlogerie1.png" + }, { "Type": "Box", "Name": "box1", @@ -867,7 +935,8 @@ "Red": 35, "Green": 24, "Blue": 15 - } + }, + "Alpha": 240 }, { "Type": "TextArea", @@ -1079,6 +1148,14 @@ { "Name": "Equalizer", "Components": [ + { + "Type": "Image", + "Name": "image1", + "Y": -1, + "Width": 800, + "Height": 483, + "RelativeFilename": "fondHorlogerie1.png" + }, { "Type": "Box", "Name": "box1", @@ -1088,58 +1165,56 @@ "Red": 35, "Green": 24, "Blue": 15 - } + }, + "Alpha": 240 }, { "Type": "Slider", "Name": "bandSlider1", - "X": 120, - "Y": 90, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 30, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "Slider", "Name": "bandSlider2", - "X": 120, - "Y": 160, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 105, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "Slider", "Name": "bandSlider3", - "X": 120, - "Y": 230, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 180, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "ButtonWithLabel", @@ -1165,121 +1240,114 @@ { "Type": "Slider", "Name": "bandSlider4", - "X": 120, - "Y": 300, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 255, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "Slider", "Name": "bandSlider5", - "X": 120, - "Y": 370, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 330, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "Slider", "Name": "bandSlider6", - "X": 500, - "Y": 90, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 420, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "Slider", "Name": "bandSlider7", - "X": 500, - "Y": 160, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 495, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "Slider", "Name": "bandSlider8", - "X": 500, - "Y": 230, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 570, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "Slider", "Name": "bandSlider9", - "X": 500, - "Y": 300, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 645, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "Slider", "Name": "bandSlider10", - "X": 500, - "Y": 370, - "Width": 256, - "Height": 52, - "IsHorizontalSlider": true, - "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", - "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", - "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", - "BackgroundX": 28, - "BackgroundY": 21, - "IndicatorMax": 200, + "X": 720, + "Y": 80, + "Width": 56, + "Height": 352, + "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png", + "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png", + "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png", + "BackgroundX": 23, + "BackgroundY": 26, + "IndicatorMax": 300, "ValueMax": 100, - "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" + "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json" }, { "Type": "TextArea", @@ -1300,8 +1368,8 @@ { "Type": "TextArea", "Name": "textArea2", - "X": 74, - "Y": 106, + "X": 47, + "Y": 440, "Width": 22, "Height": 20, "TextId": "EQ_31", @@ -1316,8 +1384,8 @@ { "Type": "TextArea", "Name": "textArea2_1", - "X": 74, - "Y": 176, + "X": 122, + "Y": 440, "Width": 22, "Height": 20, "TextId": "EQ_62", @@ -1332,8 +1400,8 @@ { "Type": "TextArea", "Name": "textArea2_2", - "X": 69, - "Y": 246, + "X": 192, + "Y": 440, "Width": 33, "Height": 20, "TextId": "EQ_125", @@ -1348,8 +1416,8 @@ { "Type": "TextArea", "Name": "textArea2_3", - "X": 69, - "Y": 316, + "X": 267, + "Y": 440, "Width": 33, "Height": 20, "TextId": "EQ_250", @@ -1364,8 +1432,8 @@ { "Type": "TextArea", "Name": "textArea2_4", - "X": 69, - "Y": 386, + "X": 342, + "Y": 440, "Width": 33, "Height": 20, "TextId": "EQ_500", @@ -1380,8 +1448,8 @@ { "Type": "TextArea", "Name": "textArea2_5", - "X": 449, - "Y": 106, + "X": 436, + "Y": 440, "Width": 24, "Height": 20, "TextId": "EQ_1K", @@ -1396,8 +1464,8 @@ { "Type": "TextArea", "Name": "textArea2_6", - "X": 449, - "Y": 176, + "X": 511, + "Y": 440, "Width": 24, "Height": 20, "TextId": "EQ_2K", @@ -1412,8 +1480,8 @@ { "Type": "TextArea", "Name": "textArea2_7", - "X": 449, - "Y": 246, + "X": 586, + "Y": 440, "Width": 24, "Height": 20, "TextId": "EQ_4K", @@ -1428,8 +1496,8 @@ { "Type": "TextArea", "Name": "textArea2_8", - "X": 449, - "Y": 316, + "X": 661, + "Y": 440, "Width": 24, "Height": 20, "TextId": "EQ_8K", @@ -1444,8 +1512,8 @@ { "Type": "TextArea", "Name": "textArea2_9", - "X": 444, - "Y": 386, + "X": 731, + "Y": 440, "Width": 35, "Height": 20, "TextId": "EQ_16K", diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_backgrounds_800x480_gradient_summer.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_backgrounds_800x480_gradient_summer.png deleted file mode 100644 index 51226cf..0000000 Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_backgrounds_800x480_gradient_summer.png and /dev/null differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_round_huge_fill_normal.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_round_huge_fill_normal.png new file mode 100644 index 0000000..198db58 Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_round_huge_fill_normal.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_round_huge_fill_pressed.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_round_huge_fill_pressed.png new file mode 100644 index 0000000..66dc17e Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_round_huge_fill_pressed.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png deleted file mode 100644 index 4916974..0000000 Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png and /dev/null differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png deleted file mode 100644 index 272a734..0000000 Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png and /dev/null differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_horizontal_thick_filler_small.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_horizontal_thick_filler_small.png deleted file mode 100644 index 5b70791..0000000 Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_horizontal_thick_filler_small.png and /dev/null differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_horizontal_thick_track_small.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_horizontal_thick_track_small.png deleted file mode 100644 index 91ff8ce..0000000 Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_horizontal_thick_track_small.png and /dev/null differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_filler_medium.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_filler_medium.png new file mode 100644 index 0000000..04cf122 Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_filler_medium.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png new file mode 100644 index 0000000..fc1e37e Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_track_medium.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_track_medium.png new file mode 100644 index 0000000..94e0f02 Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_track_medium.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.png new file mode 100644 index 0000000..a296cdc Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.png new file mode 100644 index 0000000..38adb0b Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_done_50_50_B5241F.svg.png b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_done_50_50_B5241F.svg.png new file mode 100644 index 0000000..7678573 Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_done_50_50_B5241F.svg.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_done_50_50_E8F6FB.svg.png b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_done_50_50_E8F6FB.svg.png deleted file mode 100644 index e77bc0b..0000000 Binary files a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_done_50_50_E8F6FB.svg.png and /dev/null differ diff --git a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.png b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.png new file mode 100644 index 0000000..ca5ab98 Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.png differ diff --git a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_music_video_50_50_E8F6FB.svg.png b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_music_video_50_50_E8F6FB.svg.png deleted file mode 100644 index fd47706..0000000 Binary files a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_music_video_50_50_E8F6FB.svg.png and /dev/null differ diff --git a/Appli/TouchGFX/assets/images/fondHorlogerie1.png b/Appli/TouchGFX/assets/images/fondHorlogerie1.png new file mode 100644 index 0000000..136990d Binary files /dev/null and b/Appli/TouchGFX/assets/images/fondHorlogerie1.png differ diff --git a/Appli/TouchGFX/gui/src/.DS_Store b/Appli/TouchGFX/gui/src/.DS_Store new file mode 100644 index 0000000..94303ca Binary files /dev/null and b/Appli/TouchGFX/gui/src/.DS_Store differ diff --git a/STM32CubeIDE/Appli/.project b/STM32CubeIDE/Appli/.project index f65205a..bad970e 100644 --- a/STM32CubeIDE/Appli/.project +++ b/STM32CubeIDE/Appli/.project @@ -596,19 +596,14 @@ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/SVGDatabase.cpp - Application/User/generated/image_glass_theme_images_backgrounds_800x480_gradient_summer.cpp + Application/User/generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_normal.cpp 1 - PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_backgrounds_800x480_gradient_summer.cpp + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_normal.cpp - Application/User/generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.cpp + Application/User/generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed.cpp 1 - PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.cpp - - - Application/User/generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.cpp - 1 - PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.cpp + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed.cpp Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.cpp @@ -635,11 +630,6 @@ 1 PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_large.cpp - - Application/User/generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_small.cpp - 1 - PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_small.cpp - Application/User/generated/image_glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.cpp 1 @@ -651,9 +641,19 @@ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_large.cpp - Application/User/generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_small.cpp + Application/User/generated/image_glass_theme_images_widgets_slider_vertical_thick_filler_medium.cpp 1 - PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_small.cpp + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_filler_medium.cpp + + + Application/User/generated/image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark.cpp + 1 + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark.cpp + + + Application/User/generated/image_glass_theme_images_widgets_slider_vertical_thick_track_medium.cpp + 1 + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_track_medium.cpp Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal.cpp @@ -666,14 +666,29 @@ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_round_text_on_active.cpp - Application/User/generated/image_icon_theme_images_action_done_50_50_E8F6FB.svg.cpp + Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.cpp 1 - PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_action_done_50_50_E8F6FB.svg.cpp + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.cpp - Application/User/generated/image_icon_theme_images_av_music_video_50_50_E8F6FB.svg.cpp + Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.cpp 1 - PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_av_music_video_50_50_E8F6FB.svg.cpp + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.cpp + + + Application/User/generated/image_icon_theme_images_action_done_50_50_B5241F.svg.cpp + 1 + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_action_done_50_50_B5241F.svg.cpp + + + Application/User/generated/image_icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.cpp + 1 + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.cpp + + + Application/User/generated/image_fondHorlogerie1.cpp + 1 + PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/image_fondHorlogerie1.cpp Application/User/generated/LanguageGb.cpp