Przeglądaj źródła

[changed/fixed] code style changes and deactivated the accidental inclusion of new icons

anjuna krokus 3 miesięcy temu
rodzic
commit
307b1935f1
1 zmienionych plików z 50 dodań i 37 usunięć
  1. 50 37
      locations/telefon.qsrc

+ 50 - 37
locations/telefon.qsrc

@@ -39,15 +39,28 @@ $telefon['header'] = {
 	else
 	else
 		$telefon['SMSstatus'] = ''
 		$telefon['SMSstatus'] = ''
 	end
 	end
-	$result = '<center>
-	<b><<$mid(100 + hour, 2, 2)>>:<<$mid(100 + minut, 2, 2)>></b><br>
-	<TABLE cellspacing="0" width="80%">
-		<TR>
-			<TD><img src="images/system/icons/icon_statusbar_left.png"></TD>
-			<TD><<$telefon[''SMSstatus'']>></TD>
-			<TD align="right"><img src="images/system/icons/icon_statusbar_right<<min(max(0, (pcs_sleep + 10) / 20), 5)>>.png"></TD>
-		</TR>
-	</TABLE><br>'
+	if 1:
+		$result = '<center>
+		<b><<$mid(100 + hour, 2, 2)>>:<<$mid(100 + minut, 2, 2)>></b><br>
+		<table cellspacing="0" width="80%">
+			<tr>
+				<td><img src="images/system/icons/icon_statusbar_left.png"></td>
+				<td><<$telefon[''SMSstatus'']>></td>
+				<td align="right"><img src="images/system/icons/icon_statusbar_right.png"></td>
+				end
+			</tr>
+		</table><br>'
+	else
+		$result = '<center>
+		<b><<$mid(100 + hour, 2, 2)>>:<<$mid(100 + minut, 2, 2)>></b><br>
+		<table cellspacing="0" width="80%">
+			<tr>
+				<td><img src="images/system/icons/icon_statusbar_left.png"></td>
+				<td><<$telefon[''SMSstatus'']>></td>
+				<td align="right"><img src="images/system/icons/icon_statusbar_right<<min(max(0, (pcs_sleep + 10) / 20), 5)>>.png"></td>
+			</tr>
+		</table><br>'
+	end
 }
 }
 
 
 !! Footer for phone screen.  Body should be between these two
 !! Footer for phone screen.  Body should be between these two
@@ -93,11 +106,11 @@ $telefon['contact'] = {
 	if dyneval('result = iif(<<$telefon["ContactCallSchedule"]>>,1,0)') = 0:
 	if dyneval('result = iif(<<$telefon["ContactCallSchedule"]>>,1,0)') = 0:
 		$telefon['ContactCallCode'] = "gs 'telefon', 'phone_call_reject'"
 		$telefon['ContactCallCode'] = "gs 'telefon', 'phone_call_reject'"
 	end
 	end
-	$result = '<TR>
-		<TD><img src="<<$telefon[''ContactIcon'']>>" width="75"></TD>
-		<TD><<$telefon[''ContactNickName'']>></TD>
-		<TD align="right"><a href="exec:$callerid = ''<<$telefon[''ContactIcon'']>>'' & <<$telefon[''ContactCallCode'']>>"><b>Call</b></a></TD>
-	</TR>'
+	$result = '<tr>
+		<td><img src="<<$telefon[''ContactIcon'']>>" width="75"></td>
+		<td><<$telefon[''ContactNickName'']>></td>
+		<td align="right"><a href="exec:$callerid = ''<<$telefon[''ContactIcon'']>>'' & <<$telefon[''ContactCallCode'']>>"><b>Call</b></a></td>
+	</tr>'
 }
 }
 
 
 
 
@@ -236,7 +249,7 @@ if $ARGS[0] = 'ContactList':
 	$telefon['body'] = '
 	$telefon['body'] = '
 	<font size=6>Contacts</font><br>
 	<font size=6>Contacts</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_call.png" height="80" width="80"><br><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/icon_call.png" height="80" width="80"><br><br>
-	<TABLE cellspacing="0" width="80%">'
+	<table cellspacing="0" width="80%">'
 
 
 	!!iterating all Contacts
 	!!iterating all Contacts
 	i=0
 	i=0
@@ -266,7 +279,7 @@ if $ARGS[0] = 'ContactList':
 	lover_number += 1
 	lover_number += 1
 	if lover_number < arrsize('pcs_lovers'): jump 'loverloop2'
 	if lover_number < arrsize('pcs_lovers'): jump 'loverloop2'
 
 
-	$telefon['body'] += '</TABLE><br>'
+	$telefon['body'] += '</table><br>'
 	dynamic $telefon['print']
 	dynamic $telefon['print']
 	killvar 'i'
 	killvar 'i'
 	killvar 'lover_number'
 	killvar 'lover_number'
@@ -574,7 +587,7 @@ if $ARGS[0] = 'Phone_sms':
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 
 
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''send_sms''">Send new SMS</a></b><br>'
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''send_sms''">Send new SMS</a></b><br>'
-	$telefon['body'] += '<TABLE cellspacing="0" width="80%"><TR><TH>Icon</TH><TH>Name</TH><TH align="right">Received</TH><TH></TH></TR>'
+	$telefon['body'] += '<table cellspacing="0" width="80%"><tr><th>Icon</th><th>Name</th><th align="right">Received</th><th></th></tr>'
 
 
 	!!iterating all Messages
 	!!iterating all Messages
 	!!reset and recalculate unread messages count, in case they get out of sync
 	!!reset and recalculate unread messages count, in case they get out of sync
@@ -598,7 +611,7 @@ if $ARGS[0] = 'Phone_sms':
 		jump 'smsloop'
 		jump 'smsloop'
 	end
 	end
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''delete_sms'',''0'',''all''">Delete All</a></b><br>'
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''delete_sms'',''0'',''all''">Delete All</a></b><br>'
-	$telefon['body'] += '</TABLE><br>'
+	$telefon['body'] += '</table><br>'
 
 
 	dynamic $telefon['print']
 	dynamic $telefon['print']
 	killvar 'i'
 	killvar 'i'
@@ -735,12 +748,12 @@ $telefon['SMS'] = {
 		$telefon['SMSstyle2'] = ''
 		$telefon['SMSstyle2'] = ''
 	end
 	end
 
 
-	$result = '<TR>
-		<TD><img height=100 src="<<$telefon[''ContactIcon'']>>"></TD>
-		<TD><<$telefon[''SMSstyle1'']>><<$telefon[''ContactNickName'']>><<$telefon[''SMSstyle2'']>></TD>
-		<TD align="right"><<$telefon[''SMSstyle1'']>><a href="exec:gs ''telefon'', ''show_sms'', <<telefon[''SMSid'']>>"><<$telefon[''SMSTime'']>></a><<$telefon[''SMSstyle2'']>></TD>
-		<TD><<$telefon[''SMSstyle1'']>><a href="exec:gs ''telefon'', ''delete_sms'', <<telefon[''SMSid'']>>">Delete</a><<$telefon[''SMSstyle2'']>></TD>
-	</TR>'
+	$result = '<tr>
+		<td><img height=100 src="<<$telefon[''ContactIcon'']>>"></td>
+		<td><<$telefon[''SMSstyle1'']>><<$telefon[''ContactNickName'']>><<$telefon[''SMSstyle2'']>></td>
+		<td align="right"><<$telefon[''SMSstyle1'']>><a href="exec:gs ''telefon'', ''show_sms'', <<telefon[''SMSid'']>>"><<$telefon[''SMSTime'']>></a><<$telefon[''SMSstyle2'']>></td>
+		<td><<$telefon[''SMSstyle1'']>><a href="exec:gs ''telefon'', ''delete_sms'', <<telefon[''SMSid'']>>">Delete</a><<$telefon[''SMSstyle2'']>></td>
+	</tr>'
 }
 }
 
 
 !! List of Contacts that you can send sms messages to
 !! List of Contacts that you can send sms messages to
@@ -755,7 +768,7 @@ if $ARGS[0] = 'send_sms':
 	end
 	end
 !! Colour correction for editor ''''
 !! Colour correction for editor ''''
 
 
-	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
+	$telefon['body'] += '<table cellspacing="0" width="80%">'
 	!!iterating all Contacts
 	!!iterating all Contacts
 	i=0
 	i=0
 	:smscontactloop
 	:smscontactloop
@@ -766,7 +779,7 @@ if $ARGS[0] = 'send_sms':
 		i += 1
 		i += 1
 		jump 'smscontactloop'
 		jump 'smscontactloop'
 	end
 	end
-	$telefon['body'] += '</TABLE><br>'
+	$telefon['body'] += '</table><br>'
 
 
 	dynamic $telefon['print']
 	dynamic $telefon['print']
 	killvar 'i'
 	killvar 'i'
@@ -788,11 +801,11 @@ $telefon['contactsms'] = {
 	end
 	end
 
 
 	$result = '
 	$result = '
-	<TR>
-		<TD><img src="<<$telefon[''ContactIcon'']>>" width="75"></TD>
-		<TD><<$npc_nickname[$telefon[''ContactNPCcode'']]>></TD>
-		<TD><a href="exec:gs ''telefon'', ''npcSendListSms'', ''<<$telefon[''ContactNPCcode'']>>''">New Message</a></TD>
-	</TR>'
+	<tr>
+		<td><img src="<<$telefon[''ContactIcon'']>>" width="75"></td>
+		<td><<$npc_nickname[$telefon[''ContactNPCcode'']]>></td>
+		<td><a href="exec:gs ''telefon'', ''npcSendListSms'', ''<<$telefon[''ContactNPCcode'']>>''">New Message</a></td>
+	</tr>'
 }
 }
 
 
 !! List of SMS messages available to be sent to an NPC
 !! List of SMS messages available to be sent to an NPC
@@ -803,7 +816,7 @@ if $ARGS[0] = 'npcSendListSms':
 	<font size=6>Send SMS</font><br>
 	<font size=6>Send SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 
 
-	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
+	$telefon['body'] += '<table cellspacing="0" width="80%">'
 	!!iterating all send sms messages
 	!!iterating all send sms messages
 	i=0
 	i=0
 	:npcSendListSmsLoop
 	:npcSendListSmsLoop
@@ -814,7 +827,7 @@ if $ARGS[0] = 'npcSendListSms':
 		i += 1
 		i += 1
 		jump 'npcSendListSmsLoop'
 		jump 'npcSendListSmsLoop'
 	end
 	end
-	$telefon['body'] += '</TABLE><br>'
+	$telefon['body'] += '</table><br>'
 
 
 	dynamic $telefon['print']
 	dynamic $telefon['print']
 	killvar 'i'
 	killvar 'i'
@@ -825,10 +838,10 @@ end
 $telefon['smsMessageToSend'] = {
 $telefon['smsMessageToSend'] = {
 	$telefon['ContactNPCcode'] = $SMSSendContact[ARGS[0]]
 	$telefon['ContactNPCcode'] = $SMSSendContact[ARGS[0]]
 	$result = '
 	$result = '
-	<TR>
-		<TD><<$npc_nickname[$telefon[''ContactNPCcode'']]>></TD>
-		<TD><a href="exec: gs ''telefon'', ''smsSendMessage'', ''<<ARGS[0]>>''"><<$SMSSendMessage[ARGS[0]]>></a></TD>
-	</TR>'
+	<tr>
+		<td><<$npc_nickname[$telefon[''ContactNPCcode'']]>></td>
+		<td><a href="exec: gs ''telefon'', ''smsSendMessage'', ''<<ARGS[0]>>''"><<$SMSSendMessage[ARGS[0]]>></a></td>
+	</tr>'
 }
 }
 
 
 if $ARGS[0] = 'smsSendMessage':
 if $ARGS[0] = 'smsSendMessage':