diff --git a/resource/layout/layoutdebugdialog.layout b/resource/layout/layoutdebugdialog.layout index 239df3e..05a57be 100644 --- a/resource/layout/layoutdebugdialog.layout +++ b/resource/layout/layoutdebugdialog.layout @@ -52,8 +52,8 @@ place { control="containerlabel,fileurl" y=30 x=6 dir="right" align="top" spacing=10 margin=4 } place { control="selectionlabel" y=48 x=6 dir="right" align="top" spacing=10 margin=4 } - place { control="tabs" y=70 width="max" height="max" } - place { control="wiki_link" width=0 height=0} + place { control="tabs" y=64 width="max" height="max" margin=8 margin-bottom=32 } + place { control="wiki_link" align=bottom width="max" margin=16 margin-bottom=12 margin-right=16 } } } diff --git a/resource/layout/overlaydashboard.layout b/resource/layout/overlaydashboard.layout index abd4323..ebf7098 100644 --- a/resource/layout/overlaydashboard.layout +++ b/resource/layout/overlaydashboard.layout @@ -85,7 +85,8 @@ { render_bg { - 0="fill(x0,y0,x1,y1,Overlay.Sidebar)" + //0="fill(x0,y0,x1,y1,Overlay.Sidebar)" + 0="image_scale(x0,y0,x1,y1,graphics\JackMyth\OverlayBG)" } } overlaymain @@ -134,7 +135,9 @@ region { name="right" width=125 height=40 align=right } place { control="TopFadePanel" region=main width=max height=max } - place { control="BottomFadePanel" region=right width=max height=max } + + //BottomFadePanel is align to top beause it actually the background + place { control="BottomFadePanel" align=top width=max height=max } place { control="CloseButton" region=sidebar align=top width=80 height=80 } place { control="HotkeyLabel,HotkeyExplain" region=hidden } diff --git a/resource/layout/overlaydashboard_lores.layout b/resource/layout/overlaydashboard_lores.layout index 25698a0..1b5c87f 100644 --- a/resource/layout/overlaydashboard_lores.layout +++ b/resource/layout/overlaydashboard_lores.layout @@ -69,6 +69,7 @@ render_bg { //0="gradient( x0, y0, x1, y1, none, backgroundstartopaque )" + 0="image_scale(x0,y0,x1,y1,graphics\JackMyth\OverlayBG)" } } overlaymain @@ -88,7 +89,8 @@ region { name=hidden width=0 height=0} region { name=right width=80 height=max align=right} //Taskbar - place { control="BottomFadePanel" region=hidden width=max height=130 } + //BottomFadePanel is align to top beause it actually the background + place { control="BottomFadePanel" align=top width=max height=max } place { control="gamename" align=left margin-left=20 margin-right=100 height=80 } diff --git a/resource/layout/overlaydesktop.layout b/resource/layout/overlaydesktop.layout index ec0668a..3c25867 100644 --- a/resource/layout/overlaydesktop.layout +++ b/resource/layout/overlaydesktop.layout @@ -14,7 +14,9 @@ LegacyCDKeyButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_legacycdkey" style=sidemenu } WebSiteButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_WebSite" style=sidemenu } RecommendButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_Recommend" style=sidemenu } - WorkshopButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_Workshop" style=sidemenu } + WorkshopButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_Workshop" style=sidemenu } + EditControllerConfig { controlname="URLLabel" labeltext="#Overlay_Taskbar_EditControllerConfig" style=sidemenu } + ForceQuitButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_ForceQuit" style=sidemenu } FriendsDetailPanel { controlname="COverlay_Details_Friends" style="detailsbox" } AchievementsDetailPanel { controlname="COverlay_Details_Achievements" style="detailsbox" } @@ -78,7 +80,7 @@ region { name="right" width=450 height=max align=right } region { name="gameOps" region=footer width=200 height=max align=right overflow=scroll-vertical} - place { control="LegacyCDKeyButton,GameGroupsButton,ChatRoomButton,DLCButton,GuideButton,WebSiteButton,RecommendButton,WorkshopButton" align=right region=gameOps dir=down margin-right=20 margin-top=10} + place { control="EditControllerConfig,LegacyCDKeyButton,GameGroupsButton,ChatRoomButton,DLCButton,GuideButton,WebSiteButton,RecommendButton,WorkshopButton,ForceQuitButton" align=right region=gameOps dir=down margin-right=20 margin-top=10} place { control="BroadcastDetailPanel" region=right width=330 height=240 align=bottom } diff --git a/resource/layout/overlaydesktop_lores.layout b/resource/layout/overlaydesktop_lores.layout index a7a467f..b540d1d 100644 --- a/resource/layout/overlaydesktop_lores.layout +++ b/resource/layout/overlaydesktop_lores.layout @@ -23,7 +23,9 @@ PlayersButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_Players" style=sidemenu } AchievementsButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_Achievements" style=sidemenu } ScreenshotsButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_Screenshots" style=sidemenu } - + EditControllerConfig { controlname="URLLabel" labeltext="#Overlay_Taskbar_EditControllerConfig" style=sidemenu } + ForceQuitButton { controlname="URLLabel" labeltext="#Overlay_Taskbar_ForceQuit" style=sidemenu } + Clock { controlname="Label" labeltext="10:43" style=topbar } ClockSuffix { controlname="Label" labeltext="am" style=clocksuffix } SessionText { controlname=label style=TimeStrings labeltext="#Overlay_Playtime_Session" } @@ -77,7 +79,7 @@ region { name=right height=150} place { controls="BroadcastDetailPanel" region=broadcast width=330 height=240 align=bottom } - place { controls="GameHubButton,ChatRoomButton,DLCButton,GuideButton,GuidesButton,LegacyCDKeyButton,WebSiteButton,ForumsButton,RecommendButton,WorkshopButton,FriendsButton,PlayersButton,AchievementsButton,ScreenshotsButton,GameGroupsButton" y=80 align=left margin-left=20 dir=down spacing=10 } + place { controls="GameHubButton,GameGroupsButton,ChatRoomButton,DLCButton,GuideButton,GuidesButton,LegacyCDKeyButton,WebSiteButton,ForumsButton,RecommendButton,WorkshopButton,FriendsButton,PlayersButton,AchievementsButton,ScreenshotsButton,EditControllerConfig,ForceQuitButton" y=80 align=left margin-left=20 dir=down spacing=10 } place { control="Clock,ClockSuffix" margin-right=20 margin-top=10 align=right} place { control="SessionText,TwoWeeksText,ForeverText,CloseButton" dir=down region=right align=right y=45 margin-right=20} diff --git a/resource/layout/screenshotsuploaddialog.layout b/resource/layout/screenshotsuploaddialog.layout index 9d91e5d..2810696 100644 --- a/resource/layout/screenshotsuploaddialog.layout +++ b/resource/layout/screenshotsuploaddialog.layout @@ -22,6 +22,8 @@ shared_to_facebook_no_multi_label { controlname="Label" labeltext="#Overlay_WontBeSharedToFacebook" visible="1" wrap="1" } shared_to_facebook_no_private_label { controlname="Label" labeltext="#Overlay_PrivateScreenshot" visible="1" wrap="1" } + limited_user_upload_label { controlname="Label" labeltext="#steam_screenshots_limited_user" visible="1" wrap="1" } + share_to_facebook_check_button { controlname="CheckButton" labeltext="#Overlay_Share" visible="1" command="changesharetofacebook" } } @@ -59,7 +61,7 @@ { place { control="upload_question" x=25 y=45 } place { control="upload_info" x=25 y=40 width=max } - place { control="error_info" x=25 y=40 width=max } + place { control="error_info" x=25 y=40 width=max margin-right=25 } place { control="upload_progress" y=85 width=max margin-left=25 margin-right=25 height=2 } place { control="upload_size" x=25 y=65 } @@ -70,7 +72,7 @@ place { control="visibility_options" start="visiblity_label" y=-5 x=5 dir=right } place { control="share_to_facebook_check_button" x=25 y=140 } place { control="facebook_logo" start="share_to_facebook_check_button" x=-4 y=8 } - place { control="shared_to_facebook_ok_label,shared_to_facebook_no_multi_label,shared_to_facebook_no_private_label" x=25 y=170 margin-left=4 width=275 } + place { control="shared_to_facebook_ok_label,shared_to_facebook_no_multi_label,shared_to_facebook_no_private_label,limited_user_upload_label" x=25 y=170 margin-left=4 width=275 } place { control="cancel_button,upload_button" y=210 align=right margin-right=15 spacing=5 dir=right } }