Merge branch 'statusIcon' into patch5

Settings.lua

@@ -143,6 +143,7 @@ do ------------------
 			no_assistants = true,
 			last_pet = 0,
 			status_display  = {100, 400, CENTER},
+			unlock_status_icon = false,
 			default_sound   = SOUNDS.CHAMPION_POINTS_COMMITTED,
 		},
 		ultimate = {
@@ -573,6 +574,19 @@ function RaidNotifier:CreateSettingsMenu()
 		tooltip = L.Settings_General_No_Assistants_TT,
 		noAlert = true,
 	}, "general", "no_assistants")
+        MakeControlEntry({
+		type = "checkbox",
+		name = L.Settings_General_Unlock_Status_Icon,
+		setFunc = function(value)
+				if (value) then
+					RaidNotifier:UpdateTwinAspect("tolunar")
+				else
+					RaidNotifier:UpdateTwinAspect("none")
+				end
+			end,
+		tooltip = L.Settings_General_Unlock_Status_Icon_TT,
+		noAlert = true,
+	}, "general", "unlock_status_icon")
 
 	local c, cV = Util.UnboxTable(self:GetSounds(), {"name", "id"})
 	table.remove(c, 1)   table.remove(cV, 1) -- remove "-Default-"

lang/en.lua

@@ -17,6 +17,8 @@ L.Settings_General_No_Assistants                    = "Turn off assistants when
 L.Settings_General_No_Assistants_TT                 = "Only applies during trials and does NOT prevent them from being summoned."
 L.Settings_General_Center_Screen_Announce           = "Center Screen Announcements"
 L.Settings_General_Center_Screen_Announce_TT        = "Use the game's own center screen announcement system. Alternative is a more simplistic display message from Raid Notifier itself."
+L.Settings_General_Unlock_Status_Icon               = "Unlock Status Icon"
+L.Settings_General_Unlock_Status_Icon_TT            = "When enabled it will show status icon on the screen that can be moved."
 L.Settings_General_Default_Sound                    = "Default Sound"
 L.Settings_General_Default_Sound_TT                 = "The default sound to use for a notification."
 -- Choices