diff options
author | 2020-09-09 21:48:36 +1000 | |
---|---|---|
committer | 2020-09-09 21:48:36 +1000 | |
commit | 46f111eaf2876f371e11d39ac8d9c0370c7cca73 (patch) | |
tree | e6c17847e56ef03afee6f76443e80a7366fcd01b /src | |
parent | b2158bd6ed6d7bb1ed0e7cf665b04f56ecbe3403 (diff) |
Migrate layouts in src/emu as well
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/layout/ex800.lay | 10 | ||||
-rw-r--r-- | src/emu/layout/exorterm155.lay | 42 | ||||
-rw-r--r-- | src/emu/layout/hp9122c.lay | 6 | ||||
-rw-r--r-- | src/emu/layout/ie15.lay | 83 | ||||
-rw-r--r-- | src/emu/layout/lx800.lay | 36 | ||||
-rw-r--r-- | src/emu/layout/noscreens.lay | 4 |
6 files changed, 87 insertions, 94 deletions
diff --git a/src/emu/layout/ex800.lay b/src/emu/layout/ex800.lay index 9028413c9c4..013ea3c4e4c 100644 --- a/src/emu/layout/ex800.lay +++ b/src/emu/layout/ex800.lay @@ -4,15 +4,7 @@ license:CC0 copyright-holders:Dirk Best --> <mamelayout version="2"> - <element name="background"> - <rect> - <bounds left="0" top="0" right="1" bottom="1" /> - <color red="0.0" green="0.0" blue="0.0" /> - </rect> - </element> <view name="Default Layout"> - <bezel element="background"> - <bounds left="0" top="0" right="1" bottom="1" /> - </bezel> + <bounds left="0" top="0" right="1" bottom="1" /> </view> </mamelayout> diff --git a/src/emu/layout/exorterm155.lay b/src/emu/layout/exorterm155.lay index b3f7e2b7f7c..6a47f6869e7 100644 --- a/src/emu/layout/exorterm155.lay +++ b/src/emu/layout/exorterm155.lay @@ -41,40 +41,40 @@ LEDs for the Motorola EXORterm 155 </element> <view name="Keyboard LEDs"> - <bezel name="auto_lf_txt" element="AUTO_LF"> + <screen index="0"> + <bounds x="0" y="0" width="720" height="512" /> + </screen> + <element name="auto_lf_txt" ref="AUTO_LF"> <bounds left="0" right="70" top="520" bottom="528" /> - </bezel> - <bezel name="auto_lf_led" element="red_led"> + </element> + <element name="auto_lf_led" ref="red_led"> <bounds left="31" right="39" top="532" bottom="540" /> - </bezel> + </element> - <bezel name="online_txt" element="ON_LINE"> + <element name="online_txt" ref="ON_LINE"> <bounds left="70" right="140" top="520" bottom="528" /> - </bezel> - <bezel name="online_led" element="red_led"> + </element> + <element name="online_led" ref="red_led"> <bounds left="101" right="109" top="532" bottom="540" /> - </bezel> + </element> - <bezel name="page_mode_txt" element="PAGE_MODE"> + <element name="page_mode_txt" ref="PAGE_MODE"> <bounds left="140" right="210" top="520" bottom="528" /> - </bezel> - <bezel name="page_mode_led" element="red_led"> + </element> + <element name="page_mode_led" ref="red_led"> <bounds left="171" right="179" top="532" bottom="540" /> - </bezel> + </element> - <bezel name="insert_char_txt" element="INS_CHAR"> + <element name="insert_char_txt" ref="INS_CHAR"> <bounds left="281" right="351" top="520" bottom="528" /> - </bezel> - <bezel name="insert_char_led" element="red_led"> + </element> + <element name="insert_char_led" ref="red_led"> <bounds left="312" right="320" top="532" bottom="540" /> - </bezel> + </element> - <bezel element="background"> + <element ref="background"> <bounds left="0" top="540" right="720" bottom="544" /> - </bezel> - <screen index="0"> - <bounds x="0" y="0" width="720" height="512" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/emu/layout/hp9122c.lay b/src/emu/layout/hp9122c.lay index 72ce2ef1b43..46c197908fc 100644 --- a/src/emu/layout/hp9122c.lay +++ b/src/emu/layout/hp9122c.lay @@ -16,13 +16,13 @@ Hewlett-Packard HP 9122C floppy drive Layout <element name="led2_s"> <text string="E"> <color red="1.0" green="1.0" blue="1.0" /></text></element> <group name="panel"> - <bezel element="background"><bounds x="0" y="0" width="~scr0width~" height="64"/></bezel> + <element ref="background"><bounds x="0" y="0" width="~scr0width~" height="64"/></element> <repeat count="3"> <param name="left" start="20" increment="20" /> <param name="right" start="36" increment="20" /> <param name="num" start="0" increment="1" /> - <bezel name="led~num~_s" element="led~num~_s"><bounds left="~left~" right="~right~" top="8" bottom="24"/></bezel> - <bezel name="led~num~" element="ledr"><bounds left="~left~" right="~right~" top="32" bottom="48"/></bezel> + <element name="led~num~_s" ref="led~num~_s"><bounds left="~left~" right="~right~" top="8" bottom="24"/></element> + <element name="led~num~" ref="ledr"><bounds left="~left~" right="~right~" top="32" bottom="48"/></element> </repeat> </group> diff --git a/src/emu/layout/ie15.lay b/src/emu/layout/ie15.lay index 5e545344294..90ed8816edb 100644 --- a/src/emu/layout/ie15.lay +++ b/src/emu/layout/ie15.lay @@ -59,70 +59,71 @@ license:CC0 </element> <view name="Keyboard LEDs"> - <bezel name="lat_txt" element="e_LAT"> + <screen tag="screen"> + <bounds x="0" y="0" width="800" height="550" /> + </screen> + +<!-- + <element ref="e_background"> + <bounds left="0" right="800" top="550" bottom="600" /> + </element> +--> + + <element name="lat_txt" ref="e_LAT"> <bounds left="0" right="100" top="550" bottom="570" /> - </bezel> - <bezel name="lat_led" element="e_led"> + </element> + <element name="lat_led" ref="e_led"> <bounds left="40" right="60" top="580" bottom="600" /> - </bezel> + </element> - <bezel name="nr_txt" element="e_NR"> + <element name="nr_txt" ref="e_NR"> <bounds left="100" right="200" top="550" bottom="570" /> - </bezel> - <bezel name="nr_led" element="e_led"> + </element> + <element name="nr_led" ref="e_led"> <bounds left="140" right="160" top="580" bottom="600" /> - </bezel> + </element> - <bezel name="pch_txt" element="e_PCH"> + <element name="pch_txt" ref="e_PCH"> <bounds left="200" right="300" top="550" bottom="570" /> - </bezel> - <bezel name="pch_led" element="e_led"> + </element> + <element name="pch_led" ref="e_led"> <bounds left="240" right="260" top="580" bottom="600" /> - </bezel> + </element> - <bezel name="dup_txt" element="e_DUP"> + <element name="dup_txt" ref="e_DUP"> <bounds left="300" right="400" top="550" bottom="570" /> - </bezel> - <bezel name="dup_led" element="e_led"> + </element> + <element name="dup_led" ref="e_led"> <bounds left="340" right="360" top="580" bottom="600" /> - </bezel> + </element> - <bezel name="lin_txt" element="e_LIN"> + <element name="lin_txt" ref="e_LIN"> <bounds left="400" right="500" top="550" bottom="570" /> - </bezel> - <bezel name="lin_led" element="e_led"> + </element> + <element name="lin_led" ref="e_led"> <bounds left="440" right="460" top="580" bottom="600" /> - </bezel> + </element> - <bezel name="red_txt" element="e_RED"> + <element name="red_txt" ref="e_RED"> <bounds left="500" right="600" top="550" bottom="570" /> - </bezel> - <bezel name="red_led" element="e_led"> + </element> + <element name="red_led" ref="e_led"> <bounds left="540" right="560" top="580" bottom="600" /> - </bezel> + </element> - <bezel name="sdv_txt" element="e_SDV"> + <element name="sdv_txt" ref="e_SDV"> <bounds left="600" right="700" top="550" bottom="570" /> - </bezel> - <bezel name="sdv_led" element="e_led"> + </element> + <element name="sdv_led" ref="e_led"> <bounds left="640" right="660" top="580" bottom="600" /> - </bezel> + </element> - <bezel name="prd_txt" element="e_PRD"> + <element name="prd_txt" ref="e_PRD"> <bounds left="700" right="800" top="550" bottom="570" /> - </bezel> - <bezel name="prd_led" element="e_led"> + </element> + <element name="prd_led" ref="e_led"> <bounds left="740" right="760" top="580" bottom="600" /> - </bezel> - -<!-- - <bezel element="e_background"> - <bounds left="0" right="800" top="550" bottom="600" /> - </bezel> ---> - <screen tag="screen"> - <bounds x="0" y="0" width="800" height="550" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/emu/layout/lx800.lay b/src/emu/layout/lx800.lay index f6ce4fa92ea..90a7dbbc742 100644 --- a/src/emu/layout/lx800.lay +++ b/src/emu/layout/lx800.lay @@ -61,32 +61,32 @@ copyright-holders:Dirk Best </element> <view name="Control panel"> - <bezel element="background"> + <element ref="background"> <bounds x="0" y="0" width="67" height="52" /> - </bezel> - <bezel name="power_led" element="power_led"> + </element> + <element name="power_led" ref="power_led"> <bounds x="8" y="9" width="8" height="4" /> - </bezel> - <bezel name="power_str" element="power_str"> + </element> + <element name="power_str" ref="power_str"> <bounds x="18" y="9" width="17" height="4" /> - </bezel> - <bezel name="ready_led" element="green_led"> + </element> + <element name="ready_led" ref="green_led"> <bounds x="8" y="20" width="8" height="4" /> - </bezel> - <bezel name="ready_str" element="ready_str"> + </element> + <element name="ready_str" ref="ready_str"> <bounds x="18" y="20" width="17" height="4" /> - </bezel> - <bezel name="paperout_led" element="red_led"> + </element> + <element name="paperout_led" ref="red_led"> <bounds x="8" y="31" width="8" height="4" /> - </bezel> - <bezel name="paperout_str" element="paperout_str"> + </element> + <element name="paperout_str" ref="paperout_str"> <bounds x="18" y="31" width="25" height="4" /> - </bezel> - <bezel name="online_led" element="green_led"> + </element> + <element name="online_led" ref="green_led"> <bounds x="8" y="42" width="8" height="4" /> - </bezel> - <bezel name="online_str" element="online_str"> + </element> + <element name="online_str" ref="online_str"> <bounds x="18" y="42" width="18" height="4" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/emu/layout/noscreens.lay b/src/emu/layout/noscreens.lay index 4d95752da92..39913376cbb 100644 --- a/src/emu/layout/noscreens.lay +++ b/src/emu/layout/noscreens.lay @@ -10,8 +10,8 @@ license:CC0 </element> <view name="No screens attached"> <bounds left="0" top="0" right="280" bottom="150" /> - <bezel name="warning_txt" element="warning"> + <element name="warning_txt" ref="warning"> <bounds left="50" right="230" top="50" bottom="65" /> - </bezel> + </element> </view> </mamelayout> |