Merge pull request #153 from Black4Blade/Fix#150

New logout placement
somini · Mar 27, 2023 · 9119a71 · 9119a71
2 parents 6e829d0 + b8941ae
commit 9119a71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/resource/layout/accountmenu.layout b/resource/layout/accountmenu.layout
@@ -6,7 +6,8 @@
 		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" }
+		change_user_button	{ controlname="Button" style="account_menu_button" labelText="#steam_menu_changeuser" }
+		sign_out_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%" }
 	}
@@ -57,8 +58,9 @@
 		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 }
+		place { control="sign_out_button"  align=left margin-left=4 margin-top=76 height=24 }
+		place { control="account_name_label"  start="sign_out_button" dir="right" height=24 margin-left=-4 }
+		place { control="view_preferences_button" align=left margin-left=4 margin-top=100 height=24 }
+		place { control="view_wallet_button,wallet_amount_label" align=left margin-left=4 margin-top=124 height=24 }
 	}
 }
diff --git a/resource/menus/steam.menu b/resource/menus/steam.menu
@@ -6,6 +6,7 @@
 		text = [$OSX]	"#SteamRootAccount"
 
 		ChangeUser					{	text="#steam_menu_changeuser"			command="ChangeUser" }
+		SignOut							{	text="#steam_menu_signout"			command="SignOut" }
 		GoOnline					{	text="#SteamUI_OfflineMode_GoOnline"	command="goonline" }
 		GoOffline					{	text="#SteamUI_OfflineMode_GoOffline"	command="gooffline" }
 
@@ -35,7 +36,7 @@
 		MiniMode			[!$OSX]		{	text="#steam_menu_minimode"				shellcmd="steam://open/minigameslist" }
 		LargeMode			[!$OSX]		{	text="#steam_menu_largemode"			shellcmd="steam://open/largegameslist" }
 		StartVR							{	text="#steam_menu_startvr"				shellcmd="steam://run/250820" }
-		BigPictureMode					{	text="#steam_menu_bigpicturemode" 		shellcmd="steam://open/bigpicture" }
+		BigPictureMode		[!$OSX]		{	text="#steam_menu_bigpicturemode" 		shellcmd="steam://open/bigpicture" }
 		Divider							{}
 		MusicDetails					{	text="#steam_menu_view_music_details"			shellcmd="steam://nav/music/details" }
 		MusicPlayer						{	text="#steam_menu_view_musicplayer"		shellcmd="steam://open/musicplayer" }
@@ -113,6 +114,8 @@
 		Divider						{}
 		MiniMode					{	text="#steam_menu_minimode"				shellcmd="steam://open/minigameslist" }
 		LargeMode					{	text="#steam_menu_largemode"			shellcmd="steam://open/largegameslist" }
+		BigPictureMode					{	text="#steam_menu_bigpicturemode" 		shellcmd="steam://open/bigpicture" }
+		CloseBigPictureMode				{	text="#steam_menu_close_bigpicturemode"	shellcmd="steam://close/bigpicture" } 
 	}
 
 	Help {