Merge ilithyia-addons fork (v0.8.8e)

- Russian localization (by Maus) - FishingSchools: track fishing pools, Gatherer integration - FishingOutfitter: Outfitter addon integration - Interface 11200 (patch 1.12 support) - Improved options system with dependencies - Better watcher frame positioning - Various bugfixes Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-02-01 23:45:01 +10:00
parent cb04e8b9ad de057d0b6e
commit 4671cbd714
39 changed files with 4115 additions and 1879 deletions
@@ -7,16 +7,53 @@ FishingBuddy.CheckButton_OnShow = function()
   getglobal(this:GetName().."Text"):SetText(this.text);
 end

-FishingBuddy.CheckButton_OnClick = function()
+local function CheckBox_Able(value, button)
+   local color;
+   if ( value == 1 ) then
+      button:Enable();
+      color = NORMAL_FONT_COLOR;
+   else
+      button:Disable();
+      color = GRAY_FONT_COLOR;
+   end
+   getglobal(button:GetName().."Text"):SetTextColor(color.r, color.g, color.b);
+end
+
+local function CheckButton_OnClick(checkbox, quiet)
   local value = 0;
-   if ( this:GetChecked() ) then
-      PlaySound("igMainMenuOptionCheckBoxOff");
+   if ( not checkbox ) then
+      checkbox = this;
+   end
+   if ( checkbox:GetChecked() ) then
+      if ( not quiet ) then
+         PlaySound("igMainMenuOptionCheckBoxOn");
+      end
      value = 1;
   else
-      PlaySound("igMainMenuOptionCheckBoxOn");
+      if ( not quiet ) then
+         PlaySound("igMainMenuOptionCheckBoxOff");
+      end
+   end
+   FishingBuddy.SetSetting(checkbox.name, value);
+   if ( checkbox.update ) then
+      checkbox.update();
+   end
+   if ( checkbox.deps ) then
+      for button,what in checkbox.deps do
+         if ( what == "d" ) then
+	    CheckBox_Able(value, button);
+         elseif ( what == "h" ) then
+	    button:Hide();
+            if ( value == 1 ) then
+	       if ( not button.visible or button.visible() == 1 ) then
+		  button:Show();
+	       end
+            end
+         end
+      end
   end
-   FishingBuddy.SetSetting(this.name, value);
 end
+FishingBuddy.CheckButton_OnClick = CheckButton_OnClick;

 FishingBuddy.CheckButton_OnEnter = function()
   local tooltip = this.tooltip;
@@ -32,30 +69,111 @@ FishingBuddy.CheckButton_OnLeave = function()
 end

 FishingBuddy.OptionsFrame.Setup = function()
-   for _, option in FishingBuddy.OPTIONS do
-      local button = getglobal("FishingBuddyOption_"..option.name);
-      if (button) then
-	 local showthis = true;
-	 if ( option.check ) then
-	    showthis = option.check();
-	 end
-	 if ( showthis ) then
-	    button:Show();
-	    button.name = option.name;
-	    button.text = option.text;
+   for name,option in FishingBuddy.OPTIONS do
+      local button = getglobal("FishingBuddyOption_"..name);
+      if ( button ) then
+	 if ( option.v ) then
+	    local enable = true;
+	    if ( option.check ) then
+	       enable = option.check();
+	    end
+	    button.name = name;
+	    button.update = option.update;
+	    if ( option.text ) then
+	       button.text = option.text;
+	    else
+	       button.text = "";
+	    end
 	    button.tooltip = option.tooltip;
+	    if ( enable ) then
+	       button:SetChecked(FishingBuddy.GetSetting(name));
+	       CheckBox_Able(1, button);
+	    else
+	       CheckBox_Able(0, button);
+	    end
+	 end
+	 local showit = 1;
+	 if ( option.visible ) then
+	    button.visible = option.visible;
+	    showit = button.visible();
+	 end
+	 if ( showit ) then
+	    button:Show();
 	 else
 	    button:Hide();
 	 end
+	 if ( option.deps ) then
+	    for n,what in option.deps do
+	       local b = getglobal("FishingBuddyOption_"..n);
+	       if ( b ) then
+		  if ( not b.deps ) then
+		     b.deps = {};
+		  end
+		  b.deps[button] = what;
+	       end
+	    end
+	 end
+      end
+   end
+
+   -- now that we've collected all of the dependencies, handle them
+   for name,option in FishingBuddy.OPTIONS do
+      if ( option.v ) then
+	 local button = getglobal("FishingBuddyOption_"..name);
+	 if ( button ) then
+	    CheckButton_OnClick(button, true);
+	 end
      end
   end

   if ( FishingBuddy.UseButtonHole() ) then
-      FishingBuddyMinimapPosSlider:Hide();
+      FishingBuddyOption_MinimapPosSlider:Hide();
   end
   local gs = FishingBuddy.GetSetting;
   FishingBuddy.OptionsFrame.SetKeyValue("EasyCastKeys", gs("EasyCastKeys"));
- end
+end
+
+FishingBuddy.OptionsFrame.SetClockValues = function(value)
+   FishingBuddy.SetClockOffset(value);
+   if ( FishingBuddy.ClockOffsets ) then
+      local menu = getglobal("FishingBuddyOption_ClockOffset");
+      local label = getglobal("FishingBuddyOption_ClockOffsetLabel");
+      UIDropDownMenu_SetWidth(60, menu);
+      local sel = 1;
+      if ( value == FishingBuddy.ClockOffsets[2] ) then
+	 sel = 2;
+      end
+      UIDropDownMenu_SetSelectedValue(menu, sel);
+      UIDropDownMenu_SetText(value, menu);
+      label:SetText(FishingBuddy.OFFSET_LABEL_TEXT);
+   end
+   if ( FishingBuddy.ClockOffsets and
+        FishingBuddy.GetSetting("STVTimer") == 1 ) then
+      FishingBuddyOption_ClockOffset:Show();
+   else
+      FishingBuddyOption_ClockOffset:Hide();
+   end
+end
+
+local function ClockOffsetMenuSetup()
+   if ( FishingBuddy.ClockOffsets ) then
+      local clockoff = FishingBuddy.GetClockOffset();
+      for _,offset in FishingBuddy.ClockOffsets do
+         local off = offset;
+	 local info = {};
+         info.text = string.format("%4d", offset);
+         info.func = function()
+			FishingBuddy.OptionsFrame.SetClockValues(off);
+		     end;
+         info.checked = ( offset == clockoff )
+         UIDropDownMenu_AddButton(info);
+      end
+   end
+end
+
+FishingBuddy.OptionsFrame.OffsetMenuSetup = function()
+   UIDropDownMenu_Initialize(this, ClockOffsetMenuSetup);
+end

 FishingBuddy.OptionsFrame.SetKeyValue = function(what, value)
   local show = FishingBuddy.Keys[value];
@@ -87,7 +205,7 @@ FishingBuddy.OptionsFrame.LoadKeyMenu = function(what)
   end
 end

-FishingBuddy.OptionsFrame.MenuSetup = function(what)
+FishingBuddy.OptionsFrame.KeyMenuSetup = function(what)
   UIDropDownMenu_Initialize(this,
 			     function()
 				local w = what;