1.2.11

Added the music player. Access from the Escape menu. Removed open settings button from updates. Click the title of an update to open its settings now. Renamed notification to update in settings. Added current search term to message settings search results.
Agamidae · Dec 5, 2024 · cde1840 · cde1840
1 parent 2418a31
commit cde1840
Show file tree

Hide file tree

Showing 20 changed files with 342 additions and 121 deletions.
diff --git a/OCR-Support/gui/00_hud_notification_templates.gui b/OCR-Support/gui/00_hud_notification_templates.gui
@@ -1930,6 +1930,7 @@ types Notifications {
             hbox = {
               layoutpolicy_horizontal = expanding
               visible = "[Not(IsDataModelEmpty(MessageFeedHandler.GetItems))]"
+              spacing = 3
 
               text_single = {
                 visible = "[EqualTo_int32(GetDataModelSize(MessageFeedHandler.GetItems), '(int32)1')]"
@@ -1940,6 +1941,10 @@ types Notifications {
                 raw_text = "[GetDataModelSize(MessageFeedHandler.GetItems)] Updates."
               }
 
+              text_single = {
+                raw_text = "Click one to change its message settings."
+              }
+
               expand = { }
             }
 
@@ -1992,14 +1997,27 @@ types Notifications {
                           layoutpolicy_horizontal = expanding
                           name = "text_and_icons"
 
-                          text_multi = {
+                          button_text = {
                             layoutpolicy_horizontal = expanding
-                            raw_text = "[PlayerMessageItem.GetTitle], [Subtract_int32(GetCurrentDate.GetDateAsTotalDays, PlayerMessageItem.GetDate.GetDateAsTotalDays)] days ago."
-                            #GetArrivalDate TODO
-                            using = wide
-                            autoresize = yes
+                            blockoverride "extra" {
+                              text_multi_wide = {
+                                raw_text = "[PlayerMessageItem.GetTitle], [Subtract_int32(GetCurrentDate.GetDateAsTotalDays, PlayerMessageItem.GetDate.GetDateAsTotalDays)] days ago."
+                              }
+                            }
+                            onclick = "[ToggleGameViewData('message_settings', FeedMessageItem.GetPlayerMessageItem.GetType)]"
+                            onclick = "[GetVariableSystem.Toggle('show_feed')]"
+                            # onrightclick = "[ToggleGameViewData('message_settings', FeedMessageItem.GetPlayerMessageItem.GetType)]"
+                            # onrightclick = "[GetVariableSystem.Toggle('show_feed')]"
                           }
 
+                          # text_multi = {
+                          #   layoutpolicy_horizontal = expanding
+                          #   raw_text = "[PlayerMessageItem.GetTitle], [Subtract_int32(GetCurrentDate.GetDateAsTotalDays, PlayerMessageItem.GetDate.GetDateAsTotalDays)] days ago."
+                          #   #GetArrivalDate TODO
+                          #   using = wide
+                          #   autoresize = yes
+                          # }
+
                           text_multi = {
                             layoutpolicy_horizontal = expanding
                             visible = "[Not(StringIsEmpty(PlayerMessageItem.GetDescription))]"
@@ -2101,16 +2119,6 @@ types Notifications {
                               visible = "[And(Title.IsValid, LessThan_int32(Title.GetTierFrame, '(int32)4'))]"
                             }
 
-                            button_text = {
-                              # visible = no #TODO!
-                              layoutpolicy_horizontal = expanding
-                              blockoverride "text" {
-                                raw_text = "Open Message Settings,"
-                              }
-                              onclick = "[ToggleGameViewData('message_settings', FeedMessageItem.GetPlayerMessageItem.GetType)]"
-                              onclick = "[GetVariableSystem.Toggle('show_feed')]"
-                      			}
-
                             hbox = {
                               visible = no
 

diff --git a/OCR-Support/gui/frontend_ingame_menu.gui b/OCR-Support/gui/frontend_ingame_menu.gui
@@ -493,7 +493,6 @@ window = {
 					}
 
 					button_text = {
-						visible = no
 						layoutpolicy_horizontal = expanding
 						shortcut = speed_5
 						onclick = "[ToggleMusicPlayer]"