Various GUI fixes (and probably some breakages ;D).
This was SVN commit r2768.
This commit is contained in:
parent
a7e0c3d0ac
commit
a88915825f
@ -55,21 +55,98 @@
|
|||||||
</object>
|
</object>
|
||||||
|
|
||||||
<!-- GROUP: MINIMAP -->
|
<!-- GROUP: MINIMAP -->
|
||||||
<object name="snMiniMap"
|
<object name="snMiniMap"
|
||||||
style="snObject"
|
|
||||||
type="minimap"
|
|
||||||
hotkey="session.minimap.toggle"
|
hotkey="session.minimap.toggle"
|
||||||
>
|
>
|
||||||
<action on="Load"><![CDATA[
|
|
||||||
addCrd (this.name, rb, 100, 100, 0, 0, 180, 180);
|
|
||||||
addCrd (this.name, lb, 0, 100);
|
|
||||||
addCrd (this.name, lt, 0, 0);
|
|
||||||
addCrd (this.name, rt, 100, 0);
|
|
||||||
]]></action>
|
|
||||||
|
|
||||||
<action on="Press"><![CDATA[
|
<action on="Press"><![CDATA[
|
||||||
guiToggle (this.name);
|
guiToggle (this.name);
|
||||||
]]></action>
|
]]></action>
|
||||||
|
|
||||||
|
<object name="snMiniMapBorder"
|
||||||
|
style="skin*Hele*Window"
|
||||||
|
type="image"
|
||||||
|
>
|
||||||
|
<action on="Load"><![CDATA[
|
||||||
|
addCrd (this.name, rb, 100, 100, 0, 0, 180, 180);
|
||||||
|
addCrd (this.name, lb, 0, 100);
|
||||||
|
addCrd (this.name, lt, 0, 0);
|
||||||
|
addCrd (this.name, rt, 100, 0);
|
||||||
|
]]></action>
|
||||||
|
|
||||||
|
<object name="snMiniMapDisplay"
|
||||||
|
style="snObject"
|
||||||
|
type="minimap"
|
||||||
|
>
|
||||||
|
<action on="Load"><![CDATA[
|
||||||
|
addCrd (this.name, rb, 100, 100, 5, 5, 170, 170);
|
||||||
|
addCrd (this.name, lb, 0, 100);
|
||||||
|
addCrd (this.name, lt, 0, 0);
|
||||||
|
addCrd (this.name, rt, 100, 0);
|
||||||
|
]]></action>
|
||||||
|
|
||||||
|
<object name="snMiniMapEdge"
|
||||||
|
style="skin*Hele*BorderBlack"
|
||||||
|
type="image"
|
||||||
|
ghost="true"
|
||||||
|
/>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
|
||||||
|
<object name="snMiniMapButtonGroup"
|
||||||
|
style="skin*Hele*BorderBlack"
|
||||||
|
type="image"
|
||||||
|
ghost="true"
|
||||||
|
>
|
||||||
|
<action on="Load"><![CDATA[
|
||||||
|
addCrd (this.name, rb, 100, 100, getCrd ("snMiniMapBorder").coord[rb].width+1, 0,
|
||||||
|
20, getCrd ("snMiniMapBorder").coord[rb].height);
|
||||||
|
addCrd (this.name, lb, 0, 100);
|
||||||
|
addCrd (this.name, lt, 0, 0);
|
||||||
|
addCrd (this.name, rt, 100, 0);
|
||||||
|
]]></action>
|
||||||
|
|
||||||
|
<object name="snMiniMapButton1"
|
||||||
|
style="skin*Hele*Button"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
</object>
|
||||||
|
<object name="snMiniMapButton2"
|
||||||
|
style="skin*Hele*Button"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
</object>
|
||||||
|
<object name="snMiniMapButton3"
|
||||||
|
style="skin*Hele*Button"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
</object>
|
||||||
|
<object name="snMiniMapButton4"
|
||||||
|
style="skin*Hele*Button"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<action on="Load"><![CDATA[
|
||||||
|
// Seek through this group of buttons (determining length from last object's name).
|
||||||
|
max = this.name.substring (this.name.lastIndexOf ("n")+1, this.name.length);
|
||||||
|
for (loop = 1; loop <= max; loop++)
|
||||||
|
{
|
||||||
|
tempName = this.name.substring (0, this.name.lastIndexOf ("n")+1) + loop;
|
||||||
|
// Set size/position.
|
||||||
|
addCrd (tempName,
|
||||||
|
rb, 100, 100, 0,
|
||||||
|
getCrd ("snMiniMapButtonGroup").coord[rb].y+(getCrd ("snMiniMapButtonGroup").coord[rb].height/max)*(loop-1),
|
||||||
|
getCrd ("snMiniMapButtonGroup").coord[rb].width,
|
||||||
|
getCrd ("snMiniMapButtonGroup").coord[rb].height/max);
|
||||||
|
addCrd (tempName, lb, 0, 100);
|
||||||
|
addCrd (tempName, lt, 0, 0);
|
||||||
|
addCrd (tempName, rt, 100, 0);
|
||||||
|
// Set tooltip.
|
||||||
|
getGUIObjectByName (tempName).tooltip = "This button doesn't do anything ... yet.";
|
||||||
|
getGUIObjectByName (tempName).tooltip_style = "snToolTip";
|
||||||
|
}
|
||||||
|
]]></action>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
<!-- GROUP: RESOURCE COUNTER -->
|
<!-- GROUP: RESOURCE COUNTER -->
|
||||||
@ -180,6 +257,9 @@
|
|||||||
<action on="Load"><![CDATA[
|
<action on="Load"><![CDATA[
|
||||||
addCrd (this.name, rb, 0, 0, 5, 5,
|
addCrd (this.name, rb, 0, 0, 5, 5,
|
||||||
snConst.Portrait.Lrg.Width, snConst.Portrait.Lrg.Height);
|
snConst.Portrait.Lrg.Width, snConst.Portrait.Lrg.Height);
|
||||||
|
addCrd (this.name, lb, 100, 100);
|
||||||
|
addCrd (this.name, lt, 100, 0);
|
||||||
|
addCrd (this.name, rt, 0, 0);
|
||||||
]]></action>
|
]]></action>
|
||||||
<action on="Press"><![CDATA[
|
<action on="Press"><![CDATA[
|
||||||
// Focus the camera on the unit when his portrait is clicked.
|
// Focus the camera on the unit when his portrait is clicked.
|
||||||
@ -356,7 +436,7 @@
|
|||||||
]]></action>
|
]]></action>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
<!--
|
||||||
<object name="snStatusPaneCommandProgress"
|
<object name="snStatusPaneCommandProgress"
|
||||||
style="snPortraitProgress"
|
style="snPortraitProgress"
|
||||||
type="progressbar"
|
type="progressbar"
|
||||||
@ -366,14 +446,14 @@
|
|||||||
addCrd (this.name, rb, 0, 100,
|
addCrd (this.name, rb, 0, 100,
|
||||||
getCrd ("snStatusPaneBkg").coord[rb].x
|
getCrd ("snStatusPaneBkg").coord[rb].x
|
||||||
+getCrd ("snStatusPaneBkg").coord[rb].width,
|
+getCrd ("snStatusPaneBkg").coord[rb].width,
|
||||||
getCrd ("snStatusPaneBkg").coord[rb].y,
|
getCrd ("snStatusPaneBkg").coord[rb].y+getCrd ("snStatusPaneBkg").coord[rb].height,
|
||||||
snConst.Portrait.Sml.Width, snConst.Portrait.Sml.Height);
|
snConst.Portrait.Sml.Width, snConst.Portrait.Sml.Height);
|
||||||
addCrd (this.name, lb, 100, 100);
|
addCrd (this.name, lb, 100, 100);
|
||||||
addCrd (this.name, lt, 100, 0);
|
addCrd (this.name, lt, 100, 0);
|
||||||
addCrd (this.name, rt, 0, 0);
|
addCrd (this.name, rt, 0, 0);
|
||||||
]]></action>
|
]]></action>
|
||||||
</object>
|
</object>
|
||||||
|
-->
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
@ -333,7 +333,6 @@ function refreshCommandButtons()
|
|||||||
guiHide("snStatusPaneCommand" + "Group" + commandClearLoop);
|
guiHide("snStatusPaneCommand" + "Group" + commandClearLoop);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// Update production queue.
|
// Update production queue.
|
||||||
GUIObject = getGUIObjectByName("snStatusPaneCommandProgress");
|
GUIObject = getGUIObjectByName("snStatusPaneCommandProgress");
|
||||||
|
@ -60,10 +60,10 @@ function addCrd (name, group, rx, ry, x, y, width, height)
|
|||||||
// Return coordinate object with a given name.
|
// Return coordinate object with a given name.
|
||||||
function getCrd (name)
|
function getCrd (name)
|
||||||
{
|
{
|
||||||
for (loop = 0; loop < Crd.last; loop++)
|
for (getCrdLoop = 0; getCrdLoop <= Crd.last; getCrdLoop++)
|
||||||
{
|
{
|
||||||
if (Crd[loop].name == name)
|
if (Crd[getCrdLoop].name == name)
|
||||||
return Crd[loop];
|
return Crd[getCrdLoop];
|
||||||
}
|
}
|
||||||
|
|
||||||
console.write ("Coordinate " + name + " not found in call to getCrd().");
|
console.write ("Coordinate " + name + " not found in call to getCrd().");
|
||||||
|
@ -64,6 +64,22 @@
|
|||||||
text_valign="top"
|
text_valign="top"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<style name="skin*Hele*BorderBlack"
|
||||||
|
sprite="bkBorderBlack"
|
||||||
|
sprite_selectarea="bkFillGray"
|
||||||
|
textcolor="black"
|
||||||
|
textcolor_selected="white"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<style name="skin*Hele*Button"
|
||||||
|
sprite="bkGrayBorderBlack"
|
||||||
|
sprite_disabled="wheatButtonDisabled"
|
||||||
|
sprite_over="wheatButtonOver"
|
||||||
|
sprite_pressed="wheatButtonOver"
|
||||||
|
text_align="center"
|
||||||
|
text_valign="center"
|
||||||
|
/>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
==========================================
|
==========================================
|
||||||
- STYLE - GLOBAL - WHEAT SKIN - CONTROLS
|
- STYLE - GLOBAL - WHEAT SKIN - CONTROLS
|
||||||
|
Loading…
Reference in New Issue
Block a user