Merge pull request #1317 from myk002/myk_squads_focus

use new squads focus strings

gui/civ-alert.lua

@@ -118,14 +118,17 @@ CivalertOverlay.ATTRS{
     frame={w=20, h=5},
 }
 
+local function is_squads_panel_open()
+    return dfhack.gui.matchFocusString('dwarfmode/Squads/Default',
+        dfhack.gui.getDFViewscreen(true))
+end
+
 local function should_show_alert_button()
-    return can_clear_alarm() or
-            (df.global.game.main_interface.squads.open and can_sound_alarm())
+    return can_clear_alarm() or (is_squads_panel_open() and can_sound_alarm())
 end
 
 local function should_show_configure_button()
-    return df.global.game.main_interface.squads.open
-            and not can_sound_alarm() and not can_clear_alarm()
+    return is_squads_panel_open() and not can_sound_alarm() and not can_clear_alarm()
 end
 
 local function launch_config()

internal/confirm/specs.lua

@@ -330,7 +330,7 @@ ConfirmSpec{
     -- sticks out the left side so it can move with the panel
     -- when the screen is resized too narrow
     intercept_frame={r=32, t=19, w=101, b=3},
-    context='dwarfmode/SquadEquipment/Customizing/Default',
+    context='dwarfmode/Squads/Equipment/Customizing/Default',
     predicate=function(keys, mouse_offset)
         if keys._MOUSE_R then
             return uniform_has_changes()

uniform-unstick.lua

@@ -345,7 +345,7 @@ EquipOverlay.ATTRS{
     desc='Adds a link to the equip screen to fix equipment conflicts.',
     default_pos={x=7,y=21},
     default_enabled=true,
-    viewscreens='dwarfmode/SquadEquipment/Default',
+    viewscreens='dwarfmode/Squads/Equipment/Default',
     frame={w=MIN_WIDTH, h=1},
 }