Merge pull request #2369 from tigercat2000/hmm_fancy

Radio NanoUI improvements
This commit is contained in:
Fox McCloud
2015-10-16 17:19:22 -04:00
2 changed files with 46 additions and 24 deletions
@@ -144,7 +144,7 @@ var/global/list/default_medbay_channels = list(
var/chan_stat = channels[ch_name]
var/listening = !!(chan_stat & FREQ_LISTENING) != 0
dat.Add(list(list("chan" = ch_name, "display_name" = ch_name, "secure_channel" = 1, "sec_channel_listen" = !listening)))
dat.Add(list(list("chan" = ch_name, "display_name" = ch_name, "secure_channel" = 1, "sec_channel_listen" = !listening, "chan_span" = frequency_span_class(radiochannels[ch_name]))))
return dat
@@ -152,7 +152,7 @@ var/global/list/default_medbay_channels = list(
var/dat[0]
for(var/internal_chan in internal_channels)
if(has_channel_access(user, internal_chan))
dat.Add(list(list("chan" = internal_chan, "display_name" = get_frequency_name(text2num(internal_chan)))))
dat.Add(list(list("chan" = internal_chan, "display_name" = get_frequency_name(text2num(internal_chan)), "chan_span" = frequency_span_class(text2num(internal_chan)))))
return dat
+44 -22
View File
@@ -2,15 +2,34 @@
Title: Basic Radio UI
Used In File(s): /code/game/objects/item/devices/radio/radio.dm
-->
<head>
<style type="text/css">
.radio {color: #008000;}
.deptradio {color: #993399;}
.comradio {color: #395A9A;}
.syndradio {color: #6D3F40;}
.centradio {color: #5C5C8A;}
.airadio {color: #FF00FF;}
.secradio {color: #A30000;}
.engradio {color: #A66300;}
.medradio {color: #008160;}
.sciradio {color: #993399;}
.supradio {color: #7F6539;}
.srvradio {color: #6eaa2c;}
</style>
</head>
{{if data.useSyndMode}}
{{:helper.syndicateMode()}}
{{/if}}
<div class="item">
<div class="itemLabel">
<div class="itemLabelWide">
Microphone
</div>
<div class="itemContent">
<div class="itemContentMedium">
{{if data.mic_cut}}
{{:helper.link('On', null, null, 'disabled')}}
{{:helper.link('Off', null, null, 'disabled')}}
@@ -22,10 +41,10 @@ Used In File(s): /code/game/objects/item/devices/radio/radio.dm
</div>
<div class="item">
<div class="itemLabel">
<div class="itemLabelWide">
Speaker
</div>
<div class="itemContent">
<div class="itemContentMedium">
{{if data.spk_cut}}
{{:helper.link('On', null, null, 'disabled')}}
{{:helper.link('Off', null, null, 'disabled')}}
@@ -37,30 +56,34 @@ Used In File(s): /code/game/objects/item/devices/radio/radio.dm
</div>
{{if data.has_subspace}}
<div class="itemLabel">
Subspace Transmission:
</div>
<div class="itemContent">
{{:helper.link('On', null, {'mode' : 1}, data.subspace ? 'selected' : null)}}
{{:helper.link('Off', null, {'mode' : 0}, data.subspace ? null : 'selected')}}
<div class="item">
<div class="itemLabelWide">
Subspace Transmission:
</div>
<div class="itemContentMedium">
{{:helper.link('On', null, {'mode' : 1}, data.subspace ? 'selected' : null)}}
{{:helper.link('Off', null, {'mode' : 0}, data.subspace ? null : 'selected')}}
</div>
</div>
{{/if}}
{{if data.has_loudspeaker}}
<div class="itemLabel">
Loudspeaker:
</div>
<div class="itemContent">
{{:helper.link('On', null, {'shutup' : 0}, data.loudspeaker ? 'selected' : null)}}
{{:helper.link('Off', null, {'shutup' : 1}, data.loudspeaker ? null : 'selected')}}
<div class="item">
<div class="itemLabelWide">
Loudspeaker:
</div>
<div class="itemContentMedium">
{{:helper.link('On', null, {'shutup' : 0}, data.loudspeaker ? 'selected' : null)}}
{{:helper.link('Off', null, {'shutup' : 1}, data.loudspeaker ? null : 'selected')}}
</div>
</div>
{{/if}}
<div class="item">
<div class="itemLabel">
<div class="itemLabelWide">
Frequency: {{:data.freq}}
</div>
<div class="itemContent">
<div class="itemContentMedium">
{{:helper.link('--', null, {'freq' : -10})}}
{{:helper.link('-', null, {'freq' : -2})}}
{{:helper.link('+', null, {'freq' : 2})}}
@@ -72,12 +95,11 @@ Used In File(s): /code/game/objects/item/devices/radio/radio.dm
<h3>Channels</h3>
<div class="item">
{{for data.chan_list}}
<div class="itemLabel">
{{:value.display_name}}
<div class="itemLabelWide">
<span class='{{:value.chan_span}}'>&#9724</span>{{:value.display_name}}
</div>
<div class="itemContent">
<div class="itemContentMedium">
{{if value.secure_channel}}
Speaker:&nbsp;
{{:helper.link('On', null, {'ch_name' : value.chan, 'listen' : value.sec_channel_listen}, value.sec_channel_listen ? null : 'selected')}}
{{:helper.link('Off', null, {'ch_name' : value.chan, 'listen' : value.sec_channel_listen}, value.sec_channel_listen ? 'selected' : null)}}
{{else}}