diff --git a/graphics/JackMyth/LittleVirgin.tga b/graphics/JackMyth/LittleVirgin.tga deleted file mode 100644 index c0511bf..0000000 Binary files a/graphics/JackMyth/LittleVirgin.tga and /dev/null differ diff --git a/graphics/JackMyth/OpenLeg.tga b/graphics/JackMyth/OpenLeg.tga deleted file mode 100644 index 587fa51..0000000 Binary files a/graphics/JackMyth/OpenLeg.tga and /dev/null differ diff --git a/resource/layout/accountbutton.layout b/resource/layout/accountbutton.layout new file mode 100644 index 0000000..2568c2b --- /dev/null +++ b/resource/layout/accountbutton.layout @@ -0,0 +1,151 @@ +"resource/layout/accountbutton.layout" +{ + controls + { + account_avatar + { + "ControlName" "Image" + "fieldName" "account_avatar" + "zpos" "-2" // behind dropdown button + } + + account_drop_down + { + "ControlName" "Label" + "fieldName" "account_drop_down" + "zpos" "-2" // behind dropdown button + "style" "AccountDropDownStyleOffline" + } + + + account_balance + { + "ControlName" "Label" + "fieldName" "account_balance" + "style" "AccountBalanceStyle" + + "zpos" "-2" // behind dropdown button + } + + account_persona + { + "ControlName" "Label" + "fieldName" "account_persona" + "style" "AccountPersonaStyleOffline" + "labelText" "%persona%" + //"zpos" "-2" // behind dropdown button + "command" "ViewFriends" + } + + account_menu_button + { + "ControlName" "Button" + "fieldName" "account_menu_button" + "labelText" "" + "style" "AccountMenuButtonStyle" + } + } + + styles + { + AccountPersonaStyleOffline + { + padding-right=6 + padding-left=12 + textcolor=Friends.OfflineColor + } + + AccountPersonaStyleOnline + { + padding-right=6 + padding-left=12 + textcolor=Friends.OnlineColor + } + + AccountPersonaStyleInGame + { + padding-right=6 + padding-left=12 + textcolor=Friends.InGameColor + } + + AccountDropDownStyleOffline + { + render + { + 0="image(x0,y0,x1,y1,graphics/avatarBorderOffline)" + } + } + + AccountDropDownStyleOnline + { + render + { + 0="image(x0,y0,x1,y1,graphics/avatarBorderOnline)" + } + } + + AccountDropDownStyleInGame + { + render + { + 0="image(x0,y0,x1,y1,graphics/avatarBorderInGame)" + } + } + + AccountButtonStyle + { + bgcolor=none + } + + AccountButtonStyle:hover + { + bgcolor=none + } + + AccountBalanceStyle + { + textcolor="labeldisabled" + bgcolor="none" + font-family=basefont + font-size=14 + font-weight=400 + font-style=regular + padding-top=1 + padding-right=8 + padding-left=2 + } + + AccountBalanceStyle [$OSX] + { + textcolor="labeldisabled" + bgcolor="none" + font-family=basefont + font-size=13 + font-weight=400 + font-style=regular + inset="0 1 0 0" + } + + AccountMenuButtonStyle + { + bgcolor=none + } + + AccountMenuButtonStyle:hover + { + bgcolor=none + } + } + + layout + { + place { control="account_menu_button" align=left height=0 width=0 } //This normally spans the whole element but it only opens the menu down, so disable it for now + + place { control="account_drop_down" align=right height=48 width=48 margin-top=4 } //Avatar & outline + place { control="account_avatar" align=right margin-top=8 height=32 width=32 margin-right=12} + + place { control="account_balance" align=right end-right="account_drop_down" y=22 } + place { control="account_persona" align=right end-right="account_drop_down" y=8 } + } +} diff --git a/resource/layout/accountmenu.layout b/resource/layout/accountmenu.layout new file mode 100644 index 0000000..7ba9ccc --- /dev/null +++ b/resource/layout/accountmenu.layout @@ -0,0 +1,65 @@ +"resource/layout/accountmenu.layout" +{ + controls + { + view_profile_button { controlname="Button" style="account_menu_button" labelText="#steam_menu_account_view_profile" } + view_account_button { controlname="Button" style="account_menu_button" labelText="#steam_menu_account_details" } + view_wallet_button { controlname="Button" style="account_menu_button" labelText="#steam_menu_account_wallet" } + view_preferences_button { controlname="Button" style="account_menu_button" labelText="#steam_menu_account_preferences" } + change_user_button { controlname="Button" style="account_menu_button" labelText="#steam_menu_account_logout" } + account_name_label { controlname="Label" style="account_menu_label" labelText="%account%" } + wallet_amount_label { controlname="Label" style="account_menu_label" labelText="%wallet%" } + } + + styles + { + AccountMenuStyle + { + render_bg + { + // top area and graphic + 0="gradient( x0, y0, x1, y1, MenuBG1, MenuBG2 )" + + 1="fill( x0 + 1, y0, x1 - 1, y0 + 1, blueborder )" // top + 2="fill( x0 + 1, y1 - 1, x1 - 1, y1, blueborder )" // bottom + 3="fill( x0, y0 + 1, x0 + 1, y1 - 1, blueborder )" // left + 4="fill( x1 - 1, y0 + 1, x1, y1 - 1, blueborder )" // right + } + } + + account_menu_button + { + bgcolor=none + font-size=14 + font-weight=regular + textcolor="label" + font-style="" + render_bg{} + } + + account_menu_label + { + font-size=14 + font-weight=regular + textcolor="Friends.OnlineColor" + font-style="" + render_bg{} + } + + account_menu_button:hover + { + textcolor="SuperNavHover" + } + } + + layout + { + place { control="view_profile_button" align=left margin-left=4 margin-top=4 height=24 } + place { control="view_account_button" align=left margin-left=4 margin-top=28 height=24 } + place { control="change_user_button" align=left margin-left=4 margin-top=52 height=24 } + place { control="account_name_label" start="change_user_button" dir="right" height=24 margin-left=-4 } + place { control="view_preferences_button" align=left margin-left=4 margin-top=76 height=24 } + place { control="view_wallet_button,wallet_amount_label" align=left margin-left=4 margin-top=100 height=24 } + + } +} diff --git a/resource/layout/announcement_text.layout b/resource/layout/announcement_text.layout new file mode 100644 index 0000000..bd66991 --- /dev/null +++ b/resource/layout/announcement_text.layout @@ -0,0 +1,27 @@ +"resource/layout/announcement_text.layout" +{ + controls + { + announcementtextpanel { controlname="CAnnouncementTextPanel" style="announcementtextpanel" } + announcementtext { controlname="Label" style="announcementtext" } + } + + styles + { + announcementtextpanel + { + bgcolor=AnnouncementBlue + } + + announcementtext + { + font-size=16 + textcolor=white + } + } + + layout + { + place { control=announcementtext width=max margin=4 } + } +} diff --git a/resource/layout/announcement_web.layout b/resource/layout/announcement_web.layout new file mode 100644 index 0000000..9ba7d59 --- /dev/null +++ b/resource/layout/announcement_web.layout @@ -0,0 +1,53 @@ +"resource/layout/announcement_web.layout" +{ + controls + { + announcementwebpanel { controlname="CAnnouncementWebPanel" style="announcementwebpanel" } + announcementweb { controlname="HTML" style="announcementweb" zpos=10011 } + announcementnotch { controlname="Panel" style="announcementnotch" } + announcementbg { controlname="Panel" style="announcementbg" zpos=-100 } + } + + colors + { + WebBorderColor = "64 64 64 255" + } + + styles + { + announcementwebpanel + { + inset="0 0 0 0" + } + + announcementweb + { + inset="0 0 0 0" + } + + announcementnotch + { + wide=36 + tall=18 + + render + { + 1="image( x0, y0 , x1, y1, graphics/announcement_arrow )" + } + } + + announcementbg + { + bgcolor=WebBorderColor + } + } + + layout + { + region { name="bottom" x=0 y=18 width=max height=max } + + place { control=announcementnotch x=0 y=0 width=36 height=18 } + place { control=announcementbg region="bottom" width=max height=max } + place { control=announcementweb region="bottom" margin=10 width=max height=max } + } +} diff --git a/resource/layout/blecontrollerfirmware.layout b/resource/layout/blecontrollerfirmware.layout new file mode 100644 index 0000000..f12fea2 --- /dev/null +++ b/resource/layout/blecontrollerfirmware.layout @@ -0,0 +1,61 @@ +"resource/layout/blecontrollerfirmware.layout" +{ + controls + { + BLEFirmwareUpdate { controlname="Frame" title="#Steam_BLEControllerFirmware_Title" style="BLEFirmwareUpdate" } + + ConfirmTextHeader { controlname="Label" labeltext="#Steam_BLEControllerFirmware_Header" wrap=0 style=ConfirmTextHeader } + ConfirmText { controlname="Label" labeltext="#Steam_BLEControllerFirmware_Body" wrap=1 style=ConfirmText } + + BLEFirmwareDontShowCheckButton { controlname="CheckButton" tabposition=4 labeltext="#SteamUI_NotifyTrayHintDialog_DontShow" } + LearnMore { controlname="Button" tabposition=1 labeltext="#Steam_BLEControllerFirmware_LearnMore" textalignment=left } + UpdateNow { controlname="Button" tabposition=2 labeltext="#Steam_BLEControllerFirmware_UpdateNow" textalignment=left } + Close { controlname="Button" tabposition=3 labeltext="#vgui_close" textalignment=left } + } + + styles + { + BLEFirmwareUpdate + { + minimum-width = 706 + minimum-height = 370 + inset="0 0 0 0" + + render_bg + { + // background gradient + 0="gradient( x0+1, y0, x1-1, y1-45, dialogbg, almostblack )" + 5="image( x0 + 3, y0 + 3, x1, y1, graphics/blefirmwareupdate )" + } + } + + ConfirmTextHeader + { + textcolor="110 192 236 255" + font-size=26 + } + + ConfirmText + { + textcolor="110 192 236 255" + font-size=20 + font-weight=700 + selectedtextcolor="label2" + render_bg {} + height=400px + } + } + + layout + { + region { name="bottom" width=max align=bottom height=45 margin=10 } + + place { control="ConfirmTextHeader" width=435 y=86 margin-left=30 } + place { control="ConfirmText" width=295 y=105 margin=20 height=max margin-left=30 spacing=10 dir=down } + place { control="ControllerBackground" width=max y=40 height=max margin=15 } + place { control="Close" region="bottom" align=right margin-right=20 width=120 height=25 } + place { control="UpdateNow" region="bottom" align=right end-right="Close" margin-right=20 width=160 height=25 } + place { control="LearnMore" region="bottom" align=right end-right="UpdateNow" margin-right=20 width=120 height=25 } + place { control="BLEFirmwareDontShowCheckButton" region="bottom" align=left spacing=5 margin-left=20 } + } +} diff --git a/resource/layout/friendpanel.layout b/resource/layout/friendpanel.layout index bb25994..1feb9b3 100644 --- a/resource/layout/friendpanel.layout +++ b/resource/layout/friendpanel.layout @@ -210,6 +210,12 @@ image="graphics/icon_status_mobile" padding-left=4 } + + VRStatusStyle + { + image="graphics/icon_status_vr" + padding-left=4 + } WebStatusStyleInGame { @@ -229,12 +235,6 @@ padding-left=4 } - VRStatusStyle - { - image="graphics/icon_vr_online" - padding-left=4 - } - VRStatusStyleInGame { image="graphics/icon_status_vr_ingame" @@ -248,19 +248,22 @@ { place { control="AvatarOverlayImage" x=2 y=5 width=40 height=40 } place { control="AvatarImage" x=6 y=9 width=32 height=32 } - place { control="Clanstatusimage" x=20 width=15 } - place { control="ClanStatusImage,NameLabel,FriendsNameInstanceLabel,BigPictureStatusImage,VRStatusImage,MobileStatusImage,WebStatusImage,BigPictureStatusImageInGame,VRStatusImageInGame,MobileStatusImageInGame,WebStatusImageInGame,MenuButton" x=50 y=8 } - place { control="StatusLabel,GameLabel" x=50 y=23 spacing=10} + place { control="ClanStatusImage,NameLabel,FriendsNameInstanceLabel,MenuButton" x=50 y=7 } + + place { control="StatusLabel,BigPictureStatusImage,VRStatusImage,MobileStatusImage,WebStatusImage,BigPictureStatusImageInGame,VRStatusImageInGame,MobileStatusImageInGame,WebStatusImageInGame" x=50 y=19 } + place { control="GameLabel" x=50 y=31 } + + // these controls are shown for friendship requests + place { control="AcceptLink,IgnoreLink,BlockLink" x=50 y=31 spacing=8 } // this control is shown in the invite-to-game dialog in the overlay place { control="InviteToGameButton" align=right y=4 padding-right=6 margin-right=20 } - // these controls are shown for friendship requests - place { control="AcceptLink,IgnoreLink,BlockLink" x=50 y=23 spacing=8 } - place { control="ControlPanelLink" x=50 y=23 } - place { control="SuggestedImage,SuggestedLabel" x=50 y=23 spacing=4 } - place { control="SuggestedInvite,SuggestedIgnore" x=50 y=23 spacing=8 } + place { control="ControlPanelLink" x=50 y=31 } + + place { control="SuggestedImage,SuggestedLabel" x=50 y=19 spacing=4 } + place { control="SuggestedInvite,SuggestedIgnore" x=50 y=31 spacing=8 } } } diff --git a/resource/layout/friendpanel_rightaligned.layout b/resource/layout/friendpanel_rightaligned.layout index 74c0229..f79d4a7 100644 --- a/resource/layout/friendpanel_rightaligned.layout +++ b/resource/layout/friendpanel_rightaligned.layout @@ -7,10 +7,6 @@ { style=menuButtonStyle } - AvatarOverlayImage - { - zpos=2 - } } styles { @@ -19,23 +15,13 @@ inset="-7 2 0 0" padding=3 } - CFriendPanel:hover - { - render_bg {} - } - } // custom layout layout { - place { control="AvatarOverlayImage" margin-right=8 y=6 width=40 height=40 align=right } - place { control="AvatarImage" margin-right=12 y=10 width=32 height=32 align=right } - place { control="MenuButton,NameLabel,FriendsNameInstanceLabel,ClanStatusImage" margin-right=60 y=6 align=right } - place { control="StatusLabel" margin-right=60 y=19 align=right } place { control="GameLabel" margin-right=60 y=31 align=right } - place { control="ControlPanelLink" margin-right=60 y=31 align=right } } diff --git a/resource/layout/htmlpopup.layout b/resource/layout/htmlpopup.layout index 6393315..935f9df 100644 --- a/resource/layout/htmlpopup.layout +++ b/resource/layout/htmlpopup.layout @@ -22,59 +22,43 @@ { bgcolor=none inset="0 0 0 0" - render_bg={} image="graphics/Threshold/back" } BackButtonSm:hover { - bgcolor=Menu.Button.Hover + bgcolor=none image="graphics/Threshold/back" - render_bg={ - 0="fill(x0,y0,x1,y1,Menu.Button.Hover)" - } } BackButtonSm:active { - bgcolor=Accent + bgcolor=Button.Active image="graphics/Threshold/back" - render_bg={ - 0="fill(x0,y0,x1,y1,Accent)" - } } BackButtonSm:disabled { bgcolor=none - render_bg={} image="graphics/Threshold/back_dis" } ForwardButtonSm { bgcolor=none inset="0 0 0 0" - render_bg={} image="graphics/Threshold/forward" } ForwardButtonSm:hover { - bgcolor=Menu.Button.Hover + bgcolor=none image="graphics/Threshold/forward" - render_bg={ - 0="fill(x0,y0,x1,y1,Menu.Button.Hover)" - } } ForwardButtonSm:active { - bgcolor=Accent + bgcolor=Button.Active image="graphics/Threshold/forward" - render_bg={ - 0="fill(x0,y0,x1,y1,Menu.Button.Accent)" - } } ForwardButtonSm:disabled { bgcolor=none - render_bg={} image="graphics/Threshold/forward_dis" } diff --git a/resource/layout/joingamedialog.layout b/resource/layout/joingamedialog.layout index 54a6991..a78b00c 100644 --- a/resource/layout/joingamedialog.layout +++ b/resource/layout/joingamedialog.layout @@ -33,18 +33,19 @@ layout { - region { name=box margin-top=32 margin-bottom=10 margin-left=15 margin-right=15 width=max height=max } + region { name=box margin-top=20 margin-bottom=20 margin-left=20 margin-right=20 width=max height=max } region { name=ssa margin-top=215 margin-left=20 margin-right=20 width=max height=max } - place { controls="InfoLabel" region=box margin-top=10 dir=down width=max } - place { controls="ThrobberThrobberThrobber" region=box start=InfoLabel margin-bottom=10 dir=down } + place { controls="InfoLabel" region=box margin-top=15 dir=down align=left width=max } + place { controls="ThrobberThrobberThrobber" region=box start=InfoLabel dir=down align=left margin-top=15 } place { controls="ReadyToPlayInfoLabel" region=box start=InfoLabel margin-top=10 width=max dir=down } - place { controls="ReadyToPlayTimeLabel" region=box start=ReadyToPlayInfoLabel dir=down } - place { controls="Progress" region=box start=ReadyToPlayTimeLabel margin-top=10 width=max dir=down } - place { controls="OverrideThrottleCheckBox" region=box start=Progress margin-top=10 width=max dir=down } - place { controls="AutoLaunchCheckBox" region=box start=OverrideThrottleCheckBox width=max dir=down } - place { controls="PlayButton" region=box start=AutoLaunchCheckBox margin-top=10 dir=down align=right } - place { controls="NewsButton, SkipUpdateLabel" spacing=10 margin-right=10 region=box start=PlayButton end-right=PlayButton dir=right align=right } + place { controls="ReadyToPlayTimeLabel" region=box start=InfoLabel margin-top=10 margin-left=200 dir=down } + place { controls="Progress" region=box start=ReadyToPlayInfoLabel margin-top=10 width=max dir=down } + place { controls="OverrideThrottleCheckBox" region=box start=Progress margin-top=10 width=max height=15 dir=down } + place { controls="AutoLaunchCheckBox" region=box start=OverrideThrottleCheckBox margin-top=10 height=15 width=max dir=down } + place { controls="NewsButton" region=box start=AutoLaunchCheckBox margin-top=10 width=135 height=25 dir=down margin-right=0 align=right } + place { controls="PlayButton" region=box start=NewsButton margin-top=10 width=135 height=25 dir=down align=right } + place { controls="SkipUpdateLabel" region=box start=AutoLaunchCheckBox dir=down width=max margin-right=145 margin-top=46 } place { controls="Divider,SSAUpdateLabel,SSAUpdateURL" region=ssa margin-top=10 spacing=5 width=max dir=down } } diff --git a/resource/layout/musicpage_details_album.layout b/resource/layout/musicpage_details_album.layout index 7609b32..907af5d 100644 --- a/resource/layout/musicpage_details_album.layout +++ b/resource/layout/musicpage_details_album.layout @@ -138,7 +138,8 @@ { font-family=basefont textcolor=DefaultText - render_bg {} + render {} + bgcolor=none } AdditionalActionButtonStyle:hover @@ -152,30 +153,20 @@ inset="18 0 0 0" font-family=basefont textcolor=DefaultText - render_bg {} + bgcolor=none render { 1="image( x0 + 8, y0 + 7, x1, y1, graphics/Threshold/music/play )" } } - ActionButtonStyle:hover - { + ActionButtonStyle:hover{ textcolor=DefaultText.Hover render { 1="image( x0 + 8, y0 + 7, x1, y1, graphics/Threshold/music/play_hover )" } } - - ActionButtonStyle:active - { - textcolor=DefaultText - render - { - 1="image( x0 + 8, y0 + 7, x1, y1, graphics/Threshold/music/play )" - } - } } layout diff --git a/resource/layout/musicpage_details_playlist.layout b/resource/layout/musicpage_details_playlist.layout index b8acec0..ee8ed98 100644 --- a/resource/layout/musicpage_details_playlist.layout +++ b/resource/layout/musicpage_details_playlist.layout @@ -85,7 +85,8 @@ { font-family=basefont textcolor=DefaultText - render_bg {} + render {} + bgcolor=none } AdditionalActionButtonStyle:hover @@ -99,30 +100,20 @@ inset="18 0 0 0" font-family=basefont textcolor=DefaultText - render_bg {} + bgcolor=none render { 1="image( x0 + 8, y0 + 7, x1, y1, graphics/Threshold/music/play )" } } - ActionButtonStyle:hover - { + ActionButtonStyle:hover{ textcolor=DefaultText.Hover render { 1="image( x0 + 8, y0 + 7, x1, y1, graphics/Threshold/music/play_hover )" } } - - ActionButtonStyle:active - { - textcolor=DefaultText - render - { - 1="image( x0 + 8, y0 + 7, x1, y1, graphics/Threshold/music/play )" - } - } } layout { diff --git a/resource/layout/musicplayerpanel.layout b/resource/layout/musicplayerpanel.layout index 60a497d..c66afa0 100644 --- a/resource/layout/musicplayerpanel.layout +++ b/resource/layout/musicplayerpanel.layout @@ -73,8 +73,8 @@ RepeatOnceButtonStyle:selected:hover { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/rep_once_sel_hover inset="-4 0 0 0"} ShuffleButtonStyle { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/shuf inset="3 0 0 0"} ShuffleButtonStyle:hover { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/shuf_hover } - ShuffleButtonStyle:selected { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/shuf_sel inset="0 0 0 0"} - ShuffleButtonStyle:selected:hover { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/shuf_sel_hover inset="0 0 0 0"} + ShuffleButtonStyle:selected { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/shuf_sel inset="-4 0 0 0"} + ShuffleButtonStyle:selected:hover { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/shuf_sel_hover inset="-4 0 0 0"} PreviousButtonStyle { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/prev inset="3 0 0 0"} PreviousButtonStyle:hover { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/prev_hover } NextButtonStyle { bgcolor=none render_bg={} render={} image=graphics/Threshold/music/next inset="3 0 0 0"} diff --git a/resource/layout/overlay_microtxn_authdialog.layout b/resource/layout/overlay_microtxn_authdialog.layout index b8dd300..3ed6783 100644 --- a/resource/layout/overlay_microtxn_authdialog.layout +++ b/resource/layout/overlay_microtxn_authdialog.layout @@ -3,6 +3,7 @@ controls { ItemList { controlname="ListPanel" style="ItemListStyle" } + UpdateBillingInfoButton { controlname="Button" Style="AuthBtnStyle" labeltext="#Overlay_MicroTxnAuth_UpdateBillingInformation" } AuthorizeButton { controlname="Button" Style="AuthBtnStyle" labeltext="#Overlay_MicroTxnAuth_Authorize" } CancelButton { controlname="Button" Style="AuthBtnStyle" labeltext="#Overlay_MicroTxnAuth_Cancel" } @@ -14,6 +15,7 @@ BalanceLabel { controlname="Label" style="BalanceStyle" labeltext="#Overlay_MicroTxnAuth_Balance" } BalanceDescLabel { controlname="Label" labeltext="#Overlay_MicroTxnAuth_BalanceLabel" } RefundText { controlname="RichText" style="RefundTextStyle" scrollbar=0 } + SubscriptionText { controlname="RichText" style="RefundTextStyle" scrollbar=0 } Separator { controlname="Panel" style="SeparatorStyle" } } @@ -70,13 +72,14 @@ place { control=BalanceDescLabel,BalanceLabel dir=left x=200 y=0 margin-right=35 margin-top=6 align=right spacing=10 } - place { control=AuthorizeButton,CancelButton region=buttons dir=left align=right spacing=10 } + place { control=UpdateBillingInfoButton,AuthorizeButton,CancelButton region=buttons dir=left align=right spacing=10 } place { control=ReasonLabel,ItemList region=main dir=down spacing=15 width=max } place { control=TotalLabel,TotalAmtLabel region=total dir=left align=right spacing=15 margin-top=0 } place { control=ConvertedTotalLabel,ConvertedTotalAmtLabel region=total dir=left align=right spacing=15 margin-top=12 } - place { control=RefundText start=Separator dir=down spacing=0 margin-left=-8 width=max height=50 } place { control=Separator start=total dir=down spacing=0 margin-left=10 width=max margin-right=10 height=1 } + place { control=RefundText start=Separator dir=down spacing=0 margin-left=-8 width=max height=50 } + place { control=SubscriptionText start=RefundText dir=down spacing=0 margin-left=0 width=max height=70 } } } diff --git a/resource/layout/overlaytaskbar.layout b/resource/layout/overlaytaskbar.layout index 8cc2d2b..e5686a9 100644 --- a/resource/layout/overlaytaskbar.layout +++ b/resource/layout/overlaytaskbar.layout @@ -38,20 +38,12 @@ command="OpenFriendsDialog" style="view_friends" - textAlignment=east + textAlignment=west } - online_friends - { - ControlName=Label - labelText="#Steam_OnlineFriends" - style="online_friends" - textAlignment=east - } } styles { - taskbar { textcolor=none @@ -63,29 +55,6 @@ render_bg{ 0="fill(x0,y0,x1,y1,Overlay.Sidebar.Hover)" } - } - - view_friends - { - textcolor="Text" - bgcolor="none" - font-family=basefont - font-size=14 - font-weight=400 - font-style=regular,uppercase - } - view_friends:Hover - { - textcolor="textHover" - } - - online_friends - { - textcolor="label2" - bgcolor="none" - font-family=basefont - font-size=14 - font-style=regular } } @@ -97,9 +66,6 @@ place { control="SteamLogo" region=hidden x=0 y=10 width=200 height=120 } place { controls="WebBrowserButton,MusicPlayerButton,SettingsButton,ScreenshotsButton" width=80 height=80 dir=down spacing=0 align=bottom } - - place { control="FriendPanel" height=48 width=48 align=right margin-right=6 margin-top=4 region=hidden} place { control="view_friends" height=12 y=12 align=right dir=right margin-right=60 region=hidden} - place { control="online_friends" height=12 y=26 align=right dir=right margin-right=60 region=hidden} } } diff --git a/resource/layout/screenshotmanager.layout b/resource/layout/screenshotmanager.layout index c910222..9d5c6b6 100644 --- a/resource/layout/screenshotmanager.layout +++ b/resource/layout/screenshotmanager.layout @@ -4,13 +4,12 @@ { ScreenshotManager { title="#steam_screenshotsupload_title" style="CScreenshotManager" } - DarkRegionDetails { controlname="ImagePanel" style=DarkRegionDetails zpos="-1" } - SSDetails { controlname="ImagePanel" style=SSDetails } + SSDetails { controlname="ImagePanel" style=SSDetails scaling=fit} SSDate { controlname="Label" labelText="%selected_ss_date%" } SSSize { controlname="Label" labelText="#Overlay_Screenshots_Size_Cloud" } SSSizeOriginal { controlname="Label" labelText="#Overlay_Screenshots_Size_Original" } - grid { alignment="left" interiorspacing=5 wwheelpct=50 style="WrapPanel" } + grid { alignment="left" interiorspacing=5 wheelpct=50 style="WrapPanel" } view_screenshots { controlname="Button" labeltext="#Overlay_View_All_Screenshots" command="viewscreenshots" } view_local_library_button { controlname="Button" labeltext="#Overlay_View_Local" command="viewlocallibrary" visible=0 } selectorlabel { controlname="Label" labeltext="#Overlay_Screenshots_Show" } @@ -45,7 +44,7 @@ instr_no_selection_title { controlname="Label" labeltext="#steam_screenshots_no_selection_title" style="NoSelectionTitle" wrap=1 } instr_no_selection { controlname="Label" labeltext="#steam_screenshots_no_selection_instructions" style="NoSelectionInstructions" wrap=1 } - null_placer { controlname="Panel" visible=1 } // Used to bottom-right align things. YOU FOOLS + null_placer { controlname="Panel" visible=1 } // Used to bottom-right align things. } colors @@ -267,7 +266,7 @@ place { control="grid" region="list" margin-top=48 margin-left=20 margin-bottom=48 width=max height=max } place { control="no_screenshots" region="hidden" y=50 align="top-center" } - place { control="DarkRegionDetails" region="details" x=0 y=0 width=max height=max z="-1" } + //place { control="DarkRegionDetails" region="details" x=0 y=0 width=max height=max z="-1" } place { control="SSDetails" region="details" y=0 width=max height=250 align="top-center" } place { control="SSDate" region="detailsinfo" margin-left=10 height=max align=left } place { control="SSSize,SSSizeOriginal" region="detailsinfo" margin-right=15 align=right height=max dir=right } diff --git a/resource/layout/steamrootdialog.layout b/resource/layout/steamrootdialog.layout index 302a82c..cfe001c 100644 --- a/resource/layout/steamrootdialog.layout +++ b/resource/layout/steamrootdialog.layout @@ -2,57 +2,48 @@ { controls { - "fullscreen" { "ControlName" "Button" style="FullscreenButton" command="fullscreen" - tooltiptext="#tooltip_view_fullscreen" + tooltiptext="#tooltip_view_fullscreen" } - + "startvr" { "ControlName" "Button" style="VRButton" - command="url steam://run/250820" - tooltiptext="#tooltip_view_vr_start" + command="startvr" + tooltiptext="#tooltip_view_vr_start" } - + "exitvr" { "ControlName" "Button" style="VRButtonExit" command="exitvr" - tooltiptext="#tooltip_view_vr_exit" + tooltiptext="#tooltip_view_vr_exit" } - - "New" - { - "ControlName" "URLLabel" - style="new_label" - "URLText" "http://store.steampowered.com/uiupdate" - zpos=-2 - } - + "UINavigatorPanel" { "ControlName" "CUINavigatorPanel" zpos=-2 - } - + } + "UIStatusPanel" { "ControlName" "CUIStatusPanel" zpos=-2 - } - + } + "MenuBar" { "ControlName" "MenuBar" style=RootMenu } - + SupportAlert { ControlName=Button @@ -60,7 +51,16 @@ style="support_alert" textAlignment=center command="OpenSupportAlertWindow" - } + } + + XPVistaAlert + { + ControlName=Button + labelText="#Steam_XPVistaAlert" + style="support_alert" + textAlignment=center + command="OpenXPVistaAlertWindow" + } ParentalLockButton { @@ -70,80 +70,61 @@ text="" command="ParentalLock" } - + InboxButton { - ControlName=MenuButton + ControlName=CInboxButton style="inbox_button" textAlignment=west - } - + } + + AnnouncementButton + { + ControlName=CAnnouncementButton + style="announcement_button" + textAlignment=west + } + + AccountButton + { + ControlName=CAccountButton + style="AccountButtonStyle" + } + add_game { "ControlName" "MenuButton" labelText="#steam_client_add_game" style="AddGameButton" } - + frame_title { ControlName=Label - + style="ClientTitle" "textAlignment" "west" "textAlignment" "center" [$OSX] } - - account_url - { - "ControlName" "MenuButton" - "fieldName" "account_url" - "labelText" "#Steam_Account_Name" - style="AccountURLStyle" - } - - - account_balance - { - "ControlName" "URLLabel" - "fieldName" "account_balance" - "labelText" "" - "URLText" "steam://url/StoreWallet/" - style="AccountBalanceStyle" - } - - account_balance_seperator - { - "ControlName" "Label" - "fieldName" "account_balance_seperator" - "labelText" "|" - style="AccountBalanceSeparatorStyle" - } - + universe_label { - ControlName=Label - labelText=#Steam_Universe_Internal + "ControlName" "Label" + "fieldName" "universe_label" + "labelText" "#Steam_Universe_Internal" + style="UniverseLabel" } view_friends { - ControlName=URLLabel + ControlName=Button labelText="#Steam_ViewFriends" - "URLText" "steam://open/friends" + command="ViewFriends" style="view_friends" textAlignment=east } - online_friends - { - ControlName=Label - labelText="#Steam_OnlineFriends" - style="online_friends" - textAlignment=east - zpos=-1 - } } - + styles { @@ -172,131 +153,7 @@ font-style=regular inset="0 -1 0 0" } - - new_label - { - bgcolor=none - inset="0 0 0 0" - } - - new_label:hover - { - bgcolor=none - inset="0 0 0 0" - } - new_label_german - { - bgcolor=none - render_bg={} - image="graphics/new_button_german" - inset="0 0 0 0" - } - - new_label_german:hover - { - bgcolor=none - render_bg={} - image="graphics/new_button_hover_german" - inset="0 0 0 0" - } - - new_label_french - { - bgcolor=none - render_bg={} - image="graphics/new_button_french" - inset="0 0 0 0" - } - - new_label_french:hover - { - bgcolor=none - render_bg={} - image="graphics/new_button_hover_french" - inset="0 0 0 0" - } - - new_label_italian - { - bgcolor=none - render_bg={} - image="graphics/new_button_italian" - inset="0 0 0 0" - } - - new_label_italian:hover - { - bgcolor=none - render_bg={} - image="graphics/new_button_hover_italian" - inset="0 0 0 0" - } - - new_label_spanish - { - bgcolor=none - render_bg={} - image="graphics/new_button_spanish" - inset="0 0 0 0" - } - - new_label_spanish:hover - { - bgcolor=none - render_bg={} - image="graphics/new_button_hover_spanish" - inset="0 0 0 0" - } - - new_label_danish - { - bgcolor=none - render_bg={} - image="graphics/new_button_danish" - inset="0 0 0 0" - } - - new_label_danish:hover - { - bgcolor=none - render_bg={} - image="graphics/new_button_hover_danish" - inset="0 0 0 0" - } - - new_label_norwegian - { - bgcolor=none - render_bg={} - image="graphics/new_button_norwegian" - inset="0 0 0 0" - } - - new_label_norwegian:hover - { - bgcolor=none - render_bg={} - image="graphics/new_button_hover_norwegian" - inset="0 0 0 0" - } - - new_label_swedish - { - bgcolor=none - render_bg={} - image="graphics/new_button_swedish" - inset="0 0 0 0" - } - - new_label_swedish:hover - { - bgcolor=none - render_bg={} - image="graphics/new_button_hover_swedish" - inset="0 0 0 0" - } - RootMenu { bgcolor="none" @@ -358,7 +215,6 @@ 5="fill(x0, y0, x0+1, y1, Frame.Outline.Focus)" 6="fill(x1-1, y0, x1, y1, Frame.Outline.Focus)" 7="fill(x0, y1-1, x1, y1, Frame.Outline.Focus)" - } } @@ -556,8 +412,63 @@ render {} } + announcement_button + { + bgcolor=none + inset="3 0 0 0" + image="graphics/Threshold/community" + render{} + render_bg{} + } + + announcement_button:hover + { + bgcolor=Menu.Hover + render{} + } + + announcement_button:selected + { + bgcolor=Menu.Hover + render{} + } + + announcement_button:disabled + { + image="graphics/Threshold/community" + render{} + } + + announcement_button_button_active + { + inset="3 0 0 0" + bgcolor=Accent + image="graphics/Threshold/community" + render {} + render_bg{} + } + + announcement_button_button_active:hover + { + bgcolor=Accent.Hover + render {} + } + announcement_button_button_active:selected + { + bgcolor=Accent.Hover + render {} + } + + announcement_button_button_active:disabled + { + image="graphics/Threshold/community" + render {} + } + + parental_lock_button { + inset="-10 0 0 0" bgcolor=none image="graphics/Threshold/notfamilyview" render{} @@ -638,22 +549,19 @@ region { name=left width=240 y=32} region { name=bottom-left region=left align=bottom height=48 width=max} region { name=bottom width=max height=48 align=bottom} - region { name=account align=bottom-right margin-right=48 width=max height=52 margin-left=505} + region { name=account align=bottom-right margin-right=96 width=max height=48 margin-left=505} - place { control="New, account_URL" region=hidden} - place { control="add_game" x=14 y=16 region=hidden height=0 width=0} + place { control="view_friends,add_game" region=hidden} place { control="MenuBar" height=48 width=48 y=32 x=0 } place { control="UINavigatorPanel" width=max height=max margin-right=0 margin-left=0 margin-bottom=48 margin-top=0 } place { control="ParentalLockButton, startVR, exitVR, SupportAlert" region=bottom-left align=right margin-right=48 height=48 width=48 spacing=0 dir=right} place { control="UIStatusPanel" height=48 width=323 region=bottom margin-left=192} - place { control="InboxButton" height=48 width=48 region=bottom align=right } + place { control="AnnouncementButton,InboxButton" height=48 width=48 region=bottom align=right } place { control="fullscreen,frame_minimize,frame_maximize,frame_close" align=right width=46 height=32 spacing=0 } - place { control="FriendPanel" height=48 y=0 width=48 margin-left=4 region=account align=right} - place { control="account_balance, account_balance_seperator, view_friends, universe_label" dir=right margin-right=54 margin-top=12 spacing=5 region=account align=right} - place { control="online_friends" height=12 y=30 spacing=5 margin-right=54 region=account align=right} + place { control="AccountButton" margin-left=4 region=account height=48 align=right} } } diff --git a/resource/layout/steamrootdialog_mediapage.layout b/resource/layout/steamrootdialog_mediapage.layout index fa0ddfa..7cc96ef 100644 --- a/resource/layout/steamrootdialog_mediapage.layout +++ b/resource/layout/steamrootdialog_mediapage.layout @@ -4,7 +4,7 @@ layout { // content pages - place { control=GamesList width=max height=max } + place { control=GamesList width=max height=max margin=1 } } diff --git a/resource/layout/steamrootdialog_toolspage.layout b/resource/layout/steamrootdialog_toolspage.layout index 8da4140..8e40eaa 100644 --- a/resource/layout/steamrootdialog_toolspage.layout +++ b/resource/layout/steamrootdialog_toolspage.layout @@ -4,7 +4,7 @@ layout { // content pages - place { control="GamesList" width=max height=max } + place { control="GamesList" width=max height=max margin=1 } } diff --git a/resource/layout/subpaneloptionsshadercache.layout b/resource/layout/subpaneloptionsshadercache.layout new file mode 100644 index 0000000..511a1e5 --- /dev/null +++ b/resource/layout/subpaneloptionsshadercache.layout @@ -0,0 +1,44 @@ +"resource/layout/subpaneloptionsshadercache.layout" +{ + controls + { + ShaderCacheEnabledCheckbox + { + controlname=button + labeltext="#Steam_Settings_ShaderCache_Enable" + wrap=1 + } + + ShaderCacheInfo + { + controlname=label + labeltext="#Steam_Settings_ShaderCache_Info" + wrap=1 + } + } + + colors + { + + } + + styles + { + } + + layout + { + region { name=box margin-top=20 margin-bottom=20 margin-left=20 margin-right=20 width=max height=max } + + place { control=ShaderCacheInfo region=box width=max } + place { + controls="ShaderCacheEnabledCheckbox" + start = ShaderCacheInfo + margin-top = 10 + region=box + dir=down + width=450 + spacing = 1 + } + } +} diff --git a/steam/cached/AccountPage.res b/steam/cached/AccountPage.res index 07ae430..58161e4 100644 --- a/steam/cached/AccountPage.res +++ b/steam/cached/AccountPage.res @@ -7,7 +7,7 @@ layout{ place { control=LogoutLabel,ContactEmailLabel,Label2,SecurityStatusLabel dir=down margin-top=20 margin-left=20 spacing=8 width=120} place { control=AccountInfo, start=LogoutLabel dir=right margin-left=0} - place { control=EmailInfo,VACStatusLabel,VacInfoLink start=AccountInfo dir=down margin-top=8 spacing=8} + place { control=EmailInfo,VacInfoURL start=AccountInfo dir=down margin-top=8 spacing=8} place { control=SecurityIcon,SecurityStatusState start=SecurityStatusLabel dir=right margin-left=0 spacing=4} place { control=AccountLink start=LogoutLabel dir=right align=right margin-right=50} @@ -145,29 +145,26 @@ "Default" "0" "selected" "0" } - "VACInfoLinkImage" + "VacInfoURL" { - "ControlName" "ImagePanel" - "fieldName" "VACInfoLinkImage" - "xpos" "468" - "ypos" "58" - "wide" "28" - "tall" "28" + "ControlName" "URLLabel" + "fieldName" "VacInfoLink" + "labelText" "#Steam_NoVacBanOnAccount" + "URLText" "Steam://url/HelpVacBans/" + "xpos" "136" + "ypos" "67" + "wide" "340" + "tall" "42" "AutoResize" "0" "PinCorner" "0" - "visible" "0" + "visible" "1" "enabled" "1" "tabPosition" "0" "paintbackground" "1" - "image" "graphics/icon_click_for_details" - "fillcolor" "" - "gradientStart" "" - "gradientEnd" "" - "gradientVertical" "0" - "scaleImage" "0" - "zpos" "2" + "textAlignment" "north-west" + "wrap" "1" } - + "SecurityStatusLabel" { "ControlName" "Label" @@ -305,7 +302,7 @@ "paintbackground" "1" "textAlignment" "north-east" "wrap" "0" - } + } "ContactEmailLabel" @@ -422,24 +419,6 @@ "textAlignment" "west" "wrap" "0" } - "VACStatusLabel" - { - "ControlName" "Label" - "fieldName" "VACStatusLabel" - "xpos" "136" - "ypos" "67" - "wide" "340" - "tall" "42" - "AutoResize" "0" - "PinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "paintbackground" "1" - "labelText" "#VAC_NoBans" - "textAlignment" "north-west" - "wrap" "1" - } "Divider2" { "ControlName" "Divider" diff --git a/steam/cached/steamshutdowndialog.res b/steam/cached/steamshutdowndialog.res index ef65d0d..43110ef 100644 --- a/steam/cached/steamshutdowndialog.res +++ b/steam/cached/steamshutdowndialog.res @@ -69,10 +69,10 @@ "Command" "ForceQuit" "Default" "0" } - "HideDialogButton" + "CancelQuitButton" { "ControlName" "Button" - "fieldName" "HideDialogButton" + "fieldName" "CancelQuitButton" "xpos" "180" "ypos" "84" "wide" "128" @@ -83,10 +83,10 @@ "enabled" "1" "tabPosition" "2" "paintbackground" "1" - "labelText" "#vgui_OK" + "labelText" "#vgui_Cancel" "textAlignment" "west" "wrap" "0" - "Command" "HideDialog" + "Command" "CancelQuit" "Default" "0" } }