Skip to content

Commit

Permalink
[Jumpbar] code improvements (v2) (#1036)
Browse files Browse the repository at this point in the history 
* [Jumpbar] code improvements

* Update Includes_Furniture.xml

* [Code] update

* Update Includes_Furniture.xml

* Update Includes_Furniture.xml

* [Code] update

* Update Includes_Furniture.xml

* Update Includes_Furniture.xml

* Update Includes_Furniture.xml

* Update Includes_Furniture.xml

* [Code] update

* Update Includes_Furniture.xml

* [Code] update

* [Test]

* [Update]

* [Code] update

* Update Includes_Furniture.xml

* Update Includes_Furniture.xml

* Revert "[Update]"

This reverts commit 763c614.

* [code] update

* Revert "[Code] update"

This reverts commit 2d79c1d.

* Update Includes_Furniture.xml

* Update Includes_Furniture.xml

* [SkinSettings] changed defaults

* Update Includes_Furniture.xml

* [Code] cleanup
  • Loading branch information
@beatmasterRS
beatmasterRS authored Aug 15, 2023
1 parent e3bc8cd commit 6b1c37a
Show file tree
Hide file tree
Showing 4 changed files with 249 additions and 353 deletions.
37 changes: 2 additions & 35 deletions 1080i/Includes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@
| Window.IsActive(games)
| Container.Content(games) ]
</expression>


<expression name="SortLetterIsNumber">[String.IsEqual(ListItem.SortLetter,$NUMBER[0]) | String.IsEqual(ListItem.SortLetter,$NUMBER[1]) | String.IsEqual(ListItem.SortLetter,$NUMBER[2]) | String.IsEqual(ListItem.SortLetter,$NUMBER[3]) | String.IsEqual(ListItem.SortLetter,$NUMBER[4]) | String.IsEqual(ListItem.SortLetter,$NUMBER[5]) | String.IsEqual(ListItem.SortLetter,$NUMBER[6]) | String.IsEqual(ListItem.SortLetter,$NUMBER[7]) | String.IsEqual(ListItem.SortLetter,$NUMBER[8]) | String.IsEqual(ListItem.SortLetter,$NUMBER[9])]</expression>

<include name="ScrolltimeDetailsList">
<scrolltime tween="quadratic">300</scrolltime>
Expand Down Expand Up @@ -2988,40 +2989,6 @@
<defaultcontrol always="false">300</defaultcontrol>
</include>

<include name="JumpbarHelper">
<control type="button" id="390000">
<include>HiddenButton</include>
<onfocus condition="!String.IsEqual(ListItem.SortLetter,A) + !String.IsEqual(ListItem.SortLetter,B) + !String.IsEqual(ListItem.SortLetter,C) + !String.IsEqual(ListItem.SortLetter,D) + !String.IsEqual(ListItem.SortLetter,E) + !String.IsEqual(ListItem.SortLetter,F) + !String.IsEqual(ListItem.SortLetter,G) + !String.IsEqual(ListItem.SortLetter,H) + !String.IsEqual(ListItem.SortLetter,I) + !String.IsEqual(ListItem.SortLetter,J) + !String.IsEqual(ListItem.SortLetter,K) + !String.IsEqual(ListItem.SortLetter,L) + !String.IsEqual(ListItem.SortLetter,M) + !String.IsEqual(ListItem.SortLetter,N) + !String.IsEqual(ListItem.SortLetter,O) + !String.IsEqual(ListItem.SortLetter,P) + !String.IsEqual(ListItem.SortLetter,Q) + !String.IsEqual(ListItem.SortLetter,R) + !String.IsEqual(ListItem.SortLetter,S) + !String.IsEqual(ListItem.SortLetter,T) + !String.IsEqual(ListItem.SortLetter,U) + !String.IsEqual(ListItem.SortLetter,V) + !String.IsEqual(ListItem.SortLetter,W) + !String.IsEqual(ListItem.SortLetter,X) + !String.IsEqual(ListItem.SortLetter,Y) + !String.IsEqual(ListItem.SortLetter,Z) + [Integer.IsGreater(Container(290001).NumItems,0) | Container(290001).IsUpdating]">SetFocus(290001,0,absolute)</onfocus>
<onfocus condition="!String.IsEqual(ListItem.SortLetter,A) + !String.IsEqual(ListItem.SortLetter,B) + !String.IsEqual(ListItem.SortLetter,C) + !String.IsEqual(ListItem.SortLetter,D) + !String.IsEqual(ListItem.SortLetter,E) + !String.IsEqual(ListItem.SortLetter,F) + !String.IsEqual(ListItem.SortLetter,G) + !String.IsEqual(ListItem.SortLetter,H) + !String.IsEqual(ListItem.SortLetter,I) + !String.IsEqual(ListItem.SortLetter,J) + !String.IsEqual(ListItem.SortLetter,K) + !String.IsEqual(ListItem.SortLetter,L) + !String.IsEqual(ListItem.SortLetter,M) + !String.IsEqual(ListItem.SortLetter,N) + !String.IsEqual(ListItem.SortLetter,O) + !String.IsEqual(ListItem.SortLetter,P) + !String.IsEqual(ListItem.SortLetter,Q) + !String.IsEqual(ListItem.SortLetter,R) + !String.IsEqual(ListItem.SortLetter,S) + !String.IsEqual(ListItem.SortLetter,T) + !String.IsEqual(ListItem.SortLetter,U) + !String.IsEqual(ListItem.SortLetter,V) + !String.IsEqual(ListItem.SortLetter,W) + !String.IsEqual(ListItem.SortLetter,X) + !String.IsEqual(ListItem.SortLetter,Y) + !String.IsEqual(ListItem.SortLetter,Z) + !Integer.IsGreater(Container(290001).NumItems,0) + !Container(290001).IsUpdating">SetFocus(50)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,A)">SetFocus(290001,1,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,B)">SetFocus(290001,2,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,C)">SetFocus(290001,3,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,D)">SetFocus(290001,4,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,E)">SetFocus(290001,5,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,F)">SetFocus(290001,6,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,G)">SetFocus(290001,7,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,H)">SetFocus(290001,8,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,I)">SetFocus(290001,9,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,J)">SetFocus(290001,10,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,K)">SetFocus(290001,11,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,L)">SetFocus(290001,12,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,M)">SetFocus(290001,13,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,N)">SetFocus(290001,14,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,O)">SetFocus(290001,15,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,P)">SetFocus(290001,16,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,Q)">SetFocus(290001,17,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,R)">SetFocus(290001,18,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,S)">SetFocus(290001,19,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,T)">SetFocus(290001,20,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,U)">SetFocus(290001,21,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,V)">SetFocus(290001,22,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,W)">SetFocus(290001,23,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,X)">SetFocus(290001,24,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,Y)">SetFocus(290001,25,absolute)</onfocus>
<onfocus condition="String.IsEqual(ListItem.SortLetter,Z)">SetFocus(290001,26,absolute)</onfocus>
</control>
</include>

<include name="ProgressBar">
<control type="ranges">
<visible>Skin.HasSetting(cutlist.markers)</visible>
Expand Down
204 changes: 0 additions & 204 deletions 1080i/Includes_Defs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3227,210 +3227,6 @@
</control>
</include>

<include name="NewJumpbar">
<content>plugin://script.embuary.helper/?info=jumptoletter&amp;showall=true&amp;reload=$INFO[Container.NumItems]</content>
</include>

<include name="OldJumpbar">
<content>
<item id="0">
<label>#</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS2</onclick>
<onclick>JumpSMS2</onclick>
<onclick>JumpSMS2</onclick>
<onclick>JumpSMS2</onclick>
</item>
<item id="1">
<label>A</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS2</onclick>
</item>
<item id="2">
<label>B</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS2</onclick>
<onclick>JumpSMS2</onclick>
</item>
<item id="4">
<label>C</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS2</onclick>
<onclick>JumpSMS2</onclick>
<onclick>JumpSMS2</onclick>
</item>
<item id="5">
<label>D</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS3</onclick>
</item>
<item id="6">
<label>E</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS3</onclick>
<onclick>JumpSMS3</onclick>
</item>
<item id="7">
<label>F</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS3</onclick>
<onclick>JumpSMS3</onclick>
<onclick>JumpSMS3</onclick>
</item>
<item id="8">
<label>G</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS4</onclick>
</item>
<item id="9">
<label>H</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS4</onclick>
<onclick>JumpSMS4</onclick>
</item>
<item id="10">
<label>I</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS4</onclick>
<onclick>JumpSMS4</onclick>
<onclick>JumpSMS4</onclick>
</item>
<item id="11">
<label>J</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS5</onclick>
</item>
<item id="12">
<label>K</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS5</onclick>
<onclick>JumpSMS5</onclick>
</item>
<item id="13">
<label>L</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS5</onclick>
<onclick>JumpSMS5</onclick>
<onclick>JumpSMS5</onclick>
</item>
<item id="14">
<label>M</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS6</onclick>
</item>
<item id="15">
<label>N</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS6</onclick>
<onclick>JumpSMS6</onclick>
</item>
<item id="16">
<label>O</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS6</onclick>
<onclick>JumpSMS6</onclick>
<onclick>JumpSMS6</onclick>
</item>
<item id="17">
<label>P</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS7</onclick>
</item>
<item id="18">
<label>Q</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS7</onclick>
</item>
<item id="19">
<label>R</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS7</onclick>
</item>
<item id="20">
<label>S</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS7</onclick>
</item>
<item id="21">
<label>T</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS8</onclick>
</item>
<item id="22">
<label>U</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS8</onclick>
<onclick>JumpSMS8</onclick>
</item>
<item id="23">
<label>V</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS8</onclick>
<onclick>JumpSMS8</onclick>
<onclick>JumpSMS8</onclick>
</item>
<item id="24">
<label>W</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS9</onclick>
</item>
<item id="25">
<label>X</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS9</onclick>
</item>
<item id="26">
<label>Y</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS9</onclick>
</item>
<item id="27">
<label>Z</label>
<onclick>$VAR[ClickToJump]</onclick>
<onclick>JumpSMS7</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS9</onclick>
<onclick>JumpSMS9</onclick>
</item>
</content>
</include>

<include name="Def_Flag">
<param name="left" value="$PARAM[left]" default="0"/>
<param name="visible" value="$PARAM[visible]" default="true"/>
Expand Down
Loading

0 comments on commit 6b1c37a

Please sign in to comment.