1.2.10

Added message settings. Access from the Escape menu.
Agamidae · Dec 3, 2024 · 2418a31 · 2418a31
1 parent d8c4d0f
commit 2418a31
Show file tree

Hide file tree

Showing 35 changed files with 2,862 additions and 101 deletions.
diff --git a/OCR-Support/gui/00_hud_notification_templates.gui b/OCR-Support/gui/00_hud_notification_templates.gui
@@ -980,11 +980,12 @@ types Notifications {
         }
 
         button_text = {
-          visible = no #TODO!
+          # visible = no #TODO!
           blockoverride "text" {
             raw_text = "Open Message Settings, Shift S."
           }
           onclick = "[ToggleGameViewData('message_settings', PlayerMessageItem.GetType)]"
+          onclick = "[ToastMessageHandler.DismissMessage]"
           shortcut = mapmode_culture_secondary
   			}
         state = {
@@ -2101,11 +2102,13 @@ types Notifications {
                             }
 
                             button_text = {
-                              visible = no #TODO!
+                              # 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 = {

diff --git a/OCR-Support/gui/frontend_ingame_menu.gui b/OCR-Support/gui/frontend_ingame_menu.gui
@@ -471,12 +471,44 @@ window = {
 						blockoverride "extra" {
 							text_single = {
 								raw_text = ", 3."
-								align = left
 							}
 						}
 						shortcut = speed_3
 					}
 
+					button_text = {
+						layoutpolicy_horizontal = expanding
+						shortcut = speed_4
+						onclick = "[ToggleMessageSettings]"
+						onclick = "[PauseMenu.Resume]"
+						blockoverride "text" {
+							raw_text = "MESSAGE_SETTINGS_WINDOW_NAME"
+						}
+						blockoverride "extra" {
+							comma = {}
+							text_single = {
+								raw_text = "4"
+							}
+						}
+					}
+
+					button_text = {
+						visible = no
+						layoutpolicy_horizontal = expanding
+						shortcut = speed_5
+						onclick = "[ToggleMusicPlayer]"
+						onclick = "[PauseMenu.Resume]"
+						blockoverride "text" {
+							raw_text = "MUSIC_PLAYER_NAME"
+						}
+						blockoverride "extra" {
+							comma = {}
+							text_single = {
+								raw_text = "5"
+							}
+						}
+					}
+
 					button_text = {
 						layoutpolicy_horizontal = expanding
 						blockoverride "text" {

diff --git a/OCR-Support/gui/jomini/music_player/music_player_mini_controller.gui b/OCR-Support/gui/jomini/music_player/music_player_mini_controller.gui
@@ -0,0 +1 @@
+# suppress unused file