Skip to content

Commit

Permalink
Merge pull request #25 from badanka/Steam-beta-dev
Browse files Browse the repository at this point in the history 
1.5.79
  • Loading branch information
@badanka
badanka authored Oct 13, 2016
2 parents 52dd78d + fa0af2f commit 3772be0
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 44 deletions.
Binary file modified Steam/Compact_changelog.html
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions Steam/Compact_readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
————————————————————————————————————————————————————————————————————
��������������������������������������������������������������������
Steam Compact
1.5.76
2016-09-03
————————————————————————————————————————————————————————————————————
1.5.79
2016-10-14
��������������������������������������������������������������������

For support and the latest updates go to:

Expand All @@ -17,4 +17,4 @@
settings.ini file and follow the instructions before using this
skin.

————————————————————————————————————————————————————————————————————
��������������������������������������������������������������������
Binary file modified Steam/skins/Compact/Graphics/login_splash.tga
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions Steam/skins/Compact/resource/layout/friendpanel.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,12 @@
padding-left=4
}

VRStatusStyle
{
image="graphics/icon_status_vr"
padding-left=4
}

WebStatusStyleInGame
{
image="graphics/icon_status_web_ingame"
Expand All @@ -236,16 +242,10 @@
image="graphics/icon_status_mobile_ingame"
padding-left=4
}

VRStatusStyle
{
image="graphics/icon_vr_online"
padding-left=4
}

VRStatusStyleInGame
{
image="graphics/icon_vr_happy"
image="graphics/icon_status_vr_ingame"
padding-left=4
}
}
Expand Down
56 changes: 32 additions & 24 deletions Steam/skins/Compact/resource/layout/subpaneloptionsfamily.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,31 @@
controls
{
FamilySharingTitle { controlname=label labeltext=#Steam_Settings_Family_Sharing_Title style=highlight}

FamilySharingTextState { controlname=label labeltext=#Steam_Settings_Family_Sharing_StateNotAuthorized wrap=1 }

AuthorizeDeviceButton { controlname=button labelText=#Steam_Settings_Family_Sharing_AuthorizeDevice command=AuthorizeDevice }
DeauthorizeDeviceButton { controlname=button labelText=#Steam_Settings_Family_Sharing_DeauthorizeDevice command=DeauthorizeDevice }
FamilySharingInfoText { controlname=label labeltext=#Steam_Settings_Family_Sharing_Info wrap=1 }
AuthorizedDeviceCheck { ControlName=checkbutton labeltext=#Steam_Settings_Family_Sharing_AuthorizedDevice tooltiptext=#Steam_Settings_Family_Sharing_AuthorizedDevice_ToolTip }

BorrowersLabel { controlname=label labeltext=#Steam_Settings_Family_Sharing_Borrowers wrap=1 }
BorrowersList { controlname=listpanel }

ManageSharingButton { controlname=button labelText=#Steam_Settings_Family_Sharing_ManageSharing command=ManageSharing }

"ManageSharingLabel"
{
ControlName="URLLabel"
fieldName="ManageSharingLabel"
labelText="#Steam_Settings_Family_Sharing_ManageSharing"
URLText="steam://url/FamilySharing"
}

FamilyOptionsTitle { controlname=label labeltext=#Steam_Settings_Family_Options_Title style=highlight }
FamilyOptionsText { controlname=label labeltext=#Steam_Settings_Family_Options_Text wrap=1 }
FamilyOptionsText { controlname=label labeltext=#Steam_Settings_Family_Options_Text wrap=1 }

"ManageOptionsLabel"
{
ControlName="URLLabel"
fieldName="ManageOptionsLabel"
labelText="#Steam_Parental_Manage"
URLText="steam://url/ParentalSetup"
}

ManageOptionsButton { controlname=button labelText=#Steam_Parental_Manage command=ManageParental }
ShowNotificationsCheck { ControlName=checkbutton labeltext=#Steam_Settings_Family_Show_Notifications }

Divider1 { ControlName=Divider }
Expand All @@ -36,30 +46,28 @@

padded
{
padding-top=0
padding-top=6
}
}

layout
{

region { name=box margin-top=6 margin-bottom=3 margin-left=10 margin-right=10 width=max height=max }
region { name=box margin-top=6 margin-bottom=20 margin-left=10 margin-right=10 width=max height=max }

place { controls="FamilyOptionsText" region=box width=max height=28 dir=down }
place { controls="ManageOptionsButton" region=box start=FamilyOptionsText margin-top=4 height=20 dir=down }
place { controls="FamilyOptionsTitle" region=box dir=down margin-top=0 }
place { controls="FamilyOptionsText" region=box start=FamilyOptionsTitle margin-top=6 width=490 height=32 dir=down }
place { controls="ManageOptionsLabel" region=box start=FamilyOptionsText margin-top=0 width=235 dir=down }

place { controls="Divider1" region=box start=ManageOptionsButton dir=down margin-top=9 width=max }

place { controls="FamilySharingTextState" region=box start=Divider1 margin-top=6 width=max height=84 dir=down }
place { controls="ManageSharingButton" region=box start=FamilySharingTextState height=20 dir=down }
place { controls="Divider1" region=box start=ManageOptionsLabel dir=down margin-top=7 width=max }

place { controls="AuthorizeDeviceButton,DeauthorizeDeviceButton" region=box margin-left=4 start=ManageSharingButton height=20 }
place { controls="FamilySharingTitle" region=box start=Divider1 dir=down margin-top=7 }
place { controls="FamilySharingInfoText" region=box start=FamilySharingTitle margin-top=6 width=490 dir=down }
place { controls="AuthorizedDeviceCheck" region=box margin-top=2 width=300 height=18 start=FamilySharingInfoText dir=down }
place { controls="ManageSharingLabel" region=box margin-top=0 width=235 height=24 start=AuthorizedDeviceCheck dir=down }

place { controls="BorrowersLabel" region=box start=FamilySharingTextState margin-top=29 width=max height=28 dir=down }
place { controls="BorrowersList" region=box start=BorrowersLabel width=max height=126 margin-top=4 dir=down }
place { controls="ShowNotificationsCheck" region=box start=BorrowersList margin-top=3 dir=down height=18 }

place { controls="FamilyOptionsTitle" width=0 }
place { controls="FamilySharingTitle" width=0 }
place { controls="BorrowersLabel" region=box start=ManageSharingLabel width=490 dir=down }
place { controls="BorrowersList" region=box start=BorrowersLabel width=max height=121 margin-top=6 dir=down }
place { controls="ShowNotificationsCheck" region=box start=BorrowersList margin-top=3 height=18 dir=down }
}
}
10 changes: 5 additions & 5 deletions Steam/skins/Compact/resource/layout/subpaneloptionsingame.layout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
{
region { name=box margin-top=2 margin-bottom=20 margin-left=10 margin-right=10 width=max height=max }
region { name=top region=box margin-top=4 }
region { name=topleft region=top y=110 width=190 }
region { name=topright region=top x=200 y=110 }
region { name=topleft region=top y=100 width=190 }
region { name=topright region=top x=200 y=100 }


place { controls=DescriptionLabel width=390 region=top }
place { controls=EnableOverlayCheck region=top start=DescriptionLabel dir=down height=20 margin-top=4 }
place { controls=EnableOverlayCheck region=top start=DescriptionLabel dir=down height=18 margin-top=4 }
place [!$OSX&&!$LINUX] { controls=EnableSCTenfootOverlayCheck region=top start=EnableOverlayCheck dir=down height=18 }
place [!$OSX&&!$LINUX] { controls=EnableVRDesktopGameTheaterCheck region=top start=EnableSCTenfootOverlayCheck dir=down y=-2 height=26 width=400 }
place [!$OSX&&!$LINUX] { controls=EnableVRDesktopGameTheaterCheck region=top start=EnableSCTenfootOverlayCheck dir=down height=18 width=400 }


//left column
Expand All @@ -87,7 +87,7 @@
place { controls=ScreenshotNotifyCheck,ScreenshotPlaySoundCheck,ScreenshotSaveUncompressedCheck dir=down start=ScreenshotActionLabel
margin-top=3 height=18 width=max region=topright spacing=0 }

region { name=bottom region=box y=255 }
region { name=bottom region=box y=250 }
place { control=Divider1 region=bottom width=max }
place { controls="PingRateLabel" region=bottom start=Divider1 margin-top=6 width=max dir=down }
place { controls="PingRateCombo" region=bottom start=PingRateLabel margin-top=5 width=160 dir=down height=20 inset="0 1 0 0"}
Expand Down
2 changes: 1 addition & 1 deletion Steam/skins/Compact/resource/menus/steam.menu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

Support { text="#steam_menu_support" command="Support" }
Divider {}
Compact { text="Steam Compact 1.5.76 [GitHub]" shellcmd="steam://openurl/http://badanka.github.io/Compact/" }
Compact { text="Steam Compact 1.5.79 [GitHub]" shellcmd="steam://openurl/http://badanka.github.io/Compact/" }
CompactForum { text="Steam Compact Forum Thread" shellcmd="steam://openurl/http://forums.steampowered.com/forums/showthread.php?t=1279345" }
CompactGroup { text="Steam Compact Community Group" shellcmd="steam://openurl/http://steamcommunity.com/groups/SteamCompact" }
Divider {}
Expand Down
8 changes: 7 additions & 1 deletion Steam/skins/Compact/resource/styles/steam.styles
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2981,7 +2981,9 @@ steam.styles
{
font-family="basefont"
font-family="Monaco" [$OSX]
font-size=13
font-size=9
font-family="DejaVu Sans Mono" [$LINUX]
font-size=12 [$LINUX]
textcolor="label"
selectedtextcolor="TextSelected"
}
Expand Down Expand Up @@ -3330,6 +3332,8 @@ steam.styles
{
textcolor="Highlight3"
font-size=13
font-family="DejaVu Sans Mono" [$LINUX]
font-size=12 [$LINUX]
selectedtextcolor="TextSelected"
selectedbgcolor="Focus"
}
Expand All @@ -3338,6 +3342,8 @@ steam.styles
{
font-family="basefont"
font-size=13
font-family="DejaVu Sans Mono" [$LINUX]
font-size=12 [$LINUX]
textcolor="text"
selectedtextcolor="TextSelected"
selectedbgcolor="Focus"
Expand Down
2 changes: 1 addition & 1 deletion Steam/skins/Compact/steam/cached/AccountPage.res
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,6 @@
place { control="Divider2" align=top-center width=max margin-top=9 margin-left=10 margin-right=10 start="ChangeBetaButton" dir=down }

place { control="NoPersonalInfoCheck" start="Divider2" height=18 margin-top=3 dir=down } //don't save your account credentials
place { control="Label1" start="NoPersonalInfoCheck" margin-top=2 dir=down } //warning about not saving your account credentials
place { control="Label1" start="NoPersonalInfoCheck" margin-top=2 margin-left=27 dir=down } //warning about not saving your account credentials
}
}

0 comments on commit 3772be0

Please sign in to comment.