Skip to content

Commit

Permalink
File save fix & adjustable activity widget responsiveness
Browse files Browse the repository at this point in the history
  • Loading branch information
@MizPlusPlus
MizPlusPlus committed Mar 31, 2016
1 parent 627d0da commit c502a48
Show file tree
Hide file tree
Showing 10 changed files with 241 additions and 164 deletions.
30 changes: 15 additions & 15 deletions DemoLayouts/AllWidgets.oscwidgets.txt
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
2, 10.101.90.101, 8000, 9000, 1, 0, 100
0, 11, 34, 404, 84, 0, 1, 5, 1, Buttons, , ff282828, 0
1, /button/1, , , , , 1, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, , 1, 0, 1,
1, /button/2, , , , , 2, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/3, , , , , 3, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/4, , , , , 4, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/5, , , , , 5, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, 429, 51, 164, 110, 0, 1, 2, 1, Pedals, , ff282828, 0
0, 3, 4, 404, 84, 0, 1, 5, 1, Buttons, , ff282828, 0
1, /button/1, , , , , 1, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/2, , , , , 2, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/3, , , , , 3, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/4, , , , , 4, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/5, , , , , 5, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, 421, 21, 164, 110, 0, 1, 2, 1, Pedals, , ff282828, 0
1, /pedal/1, , , , , 1, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 250, 1000,
1, /pedal/2, , , , , 2, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 250, 1000,
2, 18, 163, 304, 254, 0, 1, 5, 1, Faders, , ff282828, 0
2, 10, 133, 304, 254, 0, 1, 5, 1, Faders, , ff282828, 0
1, /fader/1, , , , , 1, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /fader/2, , , , , 2, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /fader/3, , , , , 3, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /fader/4, , , , , 4, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /fader/5, , , , , 5, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
3, 1073, 224, 148, 531, 0, 1, 1, 4, Encoders, , ff282828, 0
3, 1065, 194, 148, 531, 0, 1, 1, 4, Encoders, , ff282828, 0
1, /encoder/1, , , , , 1, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, -1, 1, 0, 1,
1, /encoder/2, , , , , 2, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, -1, 1, 0, 1,
1, /encoder/3, , , , , 3, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, -1, 1, 0, 1,
1, /encoder/4, , , , , 4, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, -1, 1, 0, 1,
4, 18, 454, 314, 269, 0, 1, 1, 1, XYs, , ff282828, 0
4, 10, 424, 314, 269, 0, 1, 1, 1, XYs, , ff282828, 0
1, /xy/1, , , , , 1, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, -1, 1, -1, 1,
6, 343, 650, 504, 210, 0, 1, 1, 6, Commands, , ff282828, 0
6, 335, 620, 504, 210, 0, 1, 1, 6, Commands, , ff282828, 0
1, /cmd/1, , , , , Send, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /cmd, , , , , no args, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /cmd=1.0, , , , , float arg, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /cmd=1, , , , , integer arg, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /cmd=hello world, , , , , string arg, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, "/cmd=1.0,hello world", , , , , multiple args, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
7, 618, 20, 247, 155, 0, 1, 1, 1, Sine Waves, , ff282828, 0
7, 610, 0, 247, 155, 0, 1, 1, 1, Sine Waves, , ff282828, 0
1, /sine/1, , , , , 1, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1, 60
5, 901, 22, 324, 150, 0, 1, 4, 1, Metronomes, , ff282828, 0
5, 893, 0, 324, 150, 0, 1, 4, 1, Metronomes, , ff282828, 0
1, /metro/1, , , , , 1, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, , 1, 0, 1, 60
1, /metro/2, , , , , 2, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, , 1, 0, 1, 60
1, /metro/3, , , , , 3, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, , 1, 0, 1, 60
1, /metro/4, , , , , 4, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, , 1, 0, 1, 60
8, 1268, 32, 116, 260, 0, 1, 1, 1, Flicker, , ff282828, 0
8, 1260, 2, 116, 260, 0, 1, 1, 1, Flicker, , ff282828, 0
1, /flicker/1, , , , , 1, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, , , 600
9, 888, 653, 137, 195, 0, 1, 2, 4, Activity, , ff282828, 0
9, 880, 623, 137, 195, 0, 1, 2, 4, Activity, , ff282828, 0
1, , , , /activity/1, , 1, , , ff368bff, ff000000, ffffffff, ff000000, 0.001, 1000.0, 0, 1,
1, , , , /activity/2, , 2, , , ff368bff, ff000000, ffffffff, ff000000, 0.001, 1000.0, 0, 1,
1, , , , /activity/3, , 3, , , ff368bff, ff000000, ffffffff, ff000000, 0.001, 1000.0, 0, 1,
Expand Down
92 changes: 46 additions & 46 deletions DemoLayouts/EosDemo.oscwidgets.txt
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
2, 10.101.90.101, 8000, 9000, 1, 0, 100
0, 754, 124, 617, 347, 0, 1, 8, 5, Direct Selects, , ff282828, 0
1, /eos/ds/1/1, , /eos/out/ds/1/1, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/2, , /eos/out/ds/1/2, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/3, , /eos/out/ds/1/3, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/4, , /eos/out/ds/1/4, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/5, , /eos/out/ds/1/5, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/page/-1, , , , , ▲, , , ffa0a0a0, ffc8c8c8, ff282828, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/chan/25, , , , , Chans, , , ff26415c, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/6, , /eos/out/ds/1/6, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/7, , /eos/out/ds/1/7, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/8, , /eos/out/ds/1/8, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/9, , /eos/out/ds/1/9, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/10, , /eos/out/ds/1/10, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/page/1, , , , , ▼, , , ffa0a0a0, ffc8c8c8, ff282828, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/group/25, , , , , Groups, , , ff334352, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/11, , /eos/out/ds/1/11, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/12, , /eos/out/ds/1/12, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/13, , /eos/out/ds/1/13, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/14, , /eos/out/ds/1/14, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/15, , /eos/out/ds/1/15, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/ip/25, , , , , Intensity Palettes, , , ffa6732b, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/fp/25, , , , , Focus Palettes, , , ff00784e, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/16, , /eos/out/ds/1/16, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/17, , /eos/out/ds/1/17, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/18, , /eos/out/ds/1/18, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/19, , /eos/out/ds/1/19, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/20, , /eos/out/ds/1/20, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/cp/25, , , , , Color Palettes, , , ff5c5c70, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/bp/25, , , , , Beam Palettes, , , ff112a8f, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/21, , /eos/out/ds/1/21, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/22, , /eos/out/ds/1/22, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/23, , /eos/out/ds/1/23, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/24, , /eos/out/ds/1/24, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/25, , /eos/out/ds/1/25, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/preset/25, , , , , Presets, , , ff167991, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, 0, 1,
1, /eos/ds/1/macro/25, , , , , Macros, , , ff3a3332, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, 0, 1,
2, 741, 528, 616, 254, 0, 1, 10, 1, Faders, , ff282828, 0
0, 746, 94, 617, 347, 0, 1, 8, 5, Direct Selects, , ff282828, 0
1, /eos/ds/1/1, , /eos/out/ds/1/1, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/2, , /eos/out/ds/1/2, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/3, , /eos/out/ds/1/3, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/4, , /eos/out/ds/1/4, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/5, , /eos/out/ds/1/5, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/page/-1, , , , , ▲, , , ffa0a0a0, ffc8c8c8, ff282828, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/chan/25, , , , , Chans, , , ff26415c, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/6, , /eos/out/ds/1/6, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/7, , /eos/out/ds/1/7, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/8, , /eos/out/ds/1/8, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/9, , /eos/out/ds/1/9, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/10, , /eos/out/ds/1/10, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/page/1, , , , , ▼, , , ffa0a0a0, ffc8c8c8, ff282828, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/group/25, , , , , Groups, , , ff334352, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/11, , /eos/out/ds/1/11, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/12, , /eos/out/ds/1/12, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/13, , /eos/out/ds/1/13, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/14, , /eos/out/ds/1/14, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/15, , /eos/out/ds/1/15, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/ip/25, , , , , Intensity Palettes, , , ffa6732b, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/fp/25, , , , , Focus Palettes, , , ff00784e, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/16, , /eos/out/ds/1/16, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/17, , /eos/out/ds/1/17, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/18, , /eos/out/ds/1/18, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/19, , /eos/out/ds/1/19, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/20, , /eos/out/ds/1/20, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/cp/25, , , , , Color Palettes, , , ff5c5c70, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/bp/25, , , , , Beam Palettes, , , ff112a8f, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/21, , /eos/out/ds/1/21, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/22, , /eos/out/ds/1/22, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/23, , /eos/out/ds/1/23, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/24, , /eos/out/ds/1/24, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/25, , /eos/out/ds/1/25, , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
0, , , , , , , , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/preset/25, , , , , Presets, , , ff167991, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, , ,
1, /eos/ds/1/macro/25, , , , , Macros, , , ff3a3332, ffc8c8c8, ffffffff, ff3c3c3c, 0, 1, , ,
2, 733, 498, 616, 254, 0, 1, 10, 1, Faders, , ff282828, 0
1, /eos/fader/1/1, , /eos/out/fader/1/1/name, /eos/fader/1/1, , , , , ffffaa00, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /eos/fader/1/2, , /eos/out/fader/1/2/name, /eos/fader/1/2, , , , , ffffaa00, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /eos/fader/1/3, , /eos/out/fader/1/3/name, /eos/fader/1/3, , , , , ffffaa00, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
Expand All @@ -51,12 +51,12 @@
1, /eos/fader/1/8, , /eos/out/fader/1/8/name, /eos/fader/1/8, , , , , ffffaa00, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /eos/fader/1/9, , /eos/out/fader/1/9/name, /eos/fader/1/9, , , , , ffffaa00, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /eos/fader/1/10, , /eos/out/fader/1/10/name, /eos/fader/1/10, , , , , ffffaa00, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
6, 102, 640, 504, 94, 0, 0, 1, 2, Startup Commands, , ff282828, 1
6, 94, 610, 504, 94, 0, 0, 1, 2, Startup Commands, , ff282828, 1
1, /eos/ds/1/chan/25, , , , , Set, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, , , 0, 1,
1, /eos/fader/1/config/10, , , , , Set, , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, , , 0, 1,
0, 275, 27, 799, 41, 0, 1, 1, 1, Eos Command Line, , ff282828, 0
1, , , /eos/out/cmd, , , , , , ff0f1923, ffc8c8c8, ffffdc96, ff3c3c3c, 0, 1, 0, 1,
3, 27, 149, 161, 648, 0, 1, 1, 3, Encoders, , ff282828, 0
0, 267, 0, 799, 41, 0, 1, 1, 1, Eos Command Line, , ff282828, 0
1, , , /eos/out/cmd, , , , , , ff0f1923, ffc8c8c8, ffffdc96, ff3c3c3c, 0, 1, , ,
3, 19, 119, 161, 648, 0, 1, 1, 3, Encoders, , ff282828, 0
1, /eos/wheel/pan, , , , , Pan, , , ff00557f, ff000000, ffc8c8c8, ff000000, -1, 1, 0, 1,
1, /eos/wheel/tilt, , , , , Tilt, , , ff55aa7f, ff000000, ffc8c8c8, ff000000, -1, 1, 0, 1,
1, /eos/wheel/level, , , , , Level, , , ffff557f, ff000000, ffc8c8c8, ff000000, -1, 1, 0, 1,
20 changes: 10 additions & 10 deletions DemoLayouts/Frameless.oscwidgets.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
2, 10.101.90.101, 8000, 9000, 0, 0, 100
0, 0, 23, 82, 873, 0, 1, 1, 10, Buttons, , ffd4d4d4, 0
1, /button/1, , , , , 1, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/2, , , , , 2, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/3, , , , , 3, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/4, , , , , 4, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/5, , , , , 5, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/6, , , , , 6, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/7, , , , , 7, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/8, , , , , 8, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/9, , , , , 9, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/10, , , , , 10, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, 0, 1,
1, /button/1, , , , , 1, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/2, , , , , 2, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/3, , , , , 3, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/4, , , , , 4, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/5, , , , , 5, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/6, , , , , 6, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/7, , , , , 7, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/8, , , , , 8, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/9, , , , , 9, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
1, /button/10, , , , , 10, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, 0, 1, , ,
2, 451, 23, 464, 69, 0, 1, 10, 1, Faders, , ffd4d4d4, 0
1, /fader/1, , , , , , , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
1, /fader/2, , , , , , , , ff3c3c3c, ff000000, ffc8c8c8, ff000000, 0, 1, 0, 1,
Expand Down
2 changes: 1 addition & 1 deletion DemoLayouts/ToggleButtons.oscwidgets.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
2, 10.101.90.101, 8000, 9000, 1, 0, 100
0, 534, 108, 404, 84, 0, 1, 5, 1, Buttons, , ff282828, 0
0, 526, 78, 404, 84, 0, 1, 5, 1, Buttons, , ff282828, 0
1, /button/1, , , , , 1, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, , 0, , 1,
1, /button/2, , , , , 2, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, , 2, , 3,
1, /button/3, , , , , 3, , , ff3c3c3c, ffc8c8c8, ffc8c8c8, ff3c3c3c, , 4, , 5,
Expand Down
19 changes: 14 additions & 5 deletions OSCWidgets/EditPanel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ void ButtonRow::AddWidget(QWidget *w)

EditPanel::EditPanel(QWidget *parent)
: QWidget(parent, Qt::Window)
, m_IgnoreEdits(0)
{
QGridLayout *layout = new QGridLayout(this);

Expand Down Expand Up @@ -421,9 +422,9 @@ void EditPanel::SetImagePath2Enabled(bool b)

void EditPanel::UpdateLocal(bool primaryPath)
{
if( m_Path->isEnabled() )
if(m_Path->isEnabled() && !m_Path->text().isEmpty())
{
if( m_Path2->isEnabled() )
if(m_Path2->isEnabled() && !m_Path2->text().isEmpty())
{
// both enabled
QString path;
Expand All @@ -444,7 +445,7 @@ void EditPanel::UpdateLocal(bool primaryPath)
m_Local->setEnabled(true);
}
}
else if( m_Path2->isEnabled() )
else if(m_Path2->isEnabled() && !m_Path2->text().isEmpty())
{
if( !primaryPath )
{
Expand Down Expand Up @@ -474,7 +475,10 @@ void EditPanel::GetPath(QString &path) const

void EditPanel::SetPath(const QString &path)
{
m_IgnoreEdits++;
m_Path->setText(path);
m_IgnoreEdits--;

UpdateLocal(/*primaryPath*/true);
}

Expand All @@ -498,7 +502,10 @@ void EditPanel::GetPath2(QString &path) const

void EditPanel::SetPath2(const QString &path)
{
m_IgnoreEdits++;
m_Path2->setText(path);
m_IgnoreEdits--;

UpdateLocal(/*primaryPath*/false);
}

Expand Down Expand Up @@ -814,14 +821,16 @@ void EditPanel::onHiddenStateChanged(int /*state*/)

void EditPanel::onPathTextChanged(const QString& /*text*/)
{
UpdateLocal(/*primaryPath*/true);
if(m_IgnoreEdits == 0)
UpdateLocal(/*primaryPath*/true);
}

////////////////////////////////////////////////////////////////////////////////

void EditPanel::onPath2TextChanged(const QString& /*text*/)
{
UpdateLocal(/*primaryPath*/false);
if(m_IgnoreEdits == 0)
UpdateLocal(/*primaryPath*/false);
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
69 changes: 35 additions & 34 deletions OSCWidgets/EditPanel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,40 +155,41 @@ private slots:
void onDoneClicked(bool checked);

protected:
QLabel *m_GridLabel;
QSpinBox *m_Cols;
QSpinBox *m_Rows;
QLineEdit *m_Text;
FadeButton *m_ImagePathButton;
QString m_ImagePath;
FadeButton *m_ImagePath2Button;
QString m_ImagePath2;
QLabel *m_PathLabel;
QLineEdit *m_Path;
QLabel *m_Path2Label;
QLineEdit *m_Path2;
QCheckBox *m_Local;
QLabel *m_LabelPathLabel;
QLineEdit *m_LabelPath;
QLabel *m_FeedbackPathLabel;
QLineEdit *m_FeedbackPath;
QLabel *m_TriggerPathLabel;
QLineEdit *m_TriggerPath;
QPushButton *m_Color;
QPushButton *m_Color2;
QPushButton *m_TextColor;
QPushButton *m_TextColor2;
QLabel *m_MinMaxLabel;
QLineEdit *m_Min;
QLineEdit *m_Max;
QLabel *m_MinMax2Label;
QLineEdit *m_Min2;
QLineEdit *m_Max2;
QLabel *m_BPMLabel;
QLineEdit *m_BPM;
QLabel *m_HiddenLabel;
QCheckBox *m_Hidden;
QLabel *m_Help;
QLabel *m_GridLabel;
QSpinBox *m_Cols;
QSpinBox *m_Rows;
QLineEdit *m_Text;
FadeButton *m_ImagePathButton;
QString m_ImagePath;
FadeButton *m_ImagePath2Button;
QString m_ImagePath2;
QLabel *m_PathLabel;
QLineEdit *m_Path;
QLabel *m_Path2Label;
QLineEdit *m_Path2;
QCheckBox *m_Local;
QLabel *m_LabelPathLabel;
QLineEdit *m_LabelPath;
QLabel *m_FeedbackPathLabel;
QLineEdit *m_FeedbackPath;
QLabel *m_TriggerPathLabel;
QLineEdit *m_TriggerPath;
QPushButton *m_Color;
QPushButton *m_Color2;
QPushButton *m_TextColor;
QPushButton *m_TextColor2;
QLabel *m_MinMaxLabel;
QLineEdit *m_Min;
QLineEdit *m_Max;
QLabel *m_MinMax2Label;
QLineEdit *m_Min2;
QLineEdit *m_Max2;
QLabel *m_BPMLabel;
QLineEdit *m_BPM;
QLabel *m_HiddenLabel;
QCheckBox *m_Hidden;
QLabel *m_Help;
unsigned int m_IgnoreEdits;

virtual void closeEvent(QCloseEvent *event);
virtual void UpdateLocal(bool primaryPath);
Expand Down
2 changes: 1 addition & 1 deletion OSCWidgets/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

////////////////////////////////////////////////////////////////////////////////

#define APP_VERSION "0.4"
#define APP_VERSION "0.5"

#define MIN_OPACITY 10

Expand Down
Loading

0 comments on commit c502a48

Please sign in to comment.