Skip to content

Commit

Permalink
Timeline new skill button
Browse files Browse the repository at this point in the history
  • Loading branch information
xpdota committed Jan 16, 2025
1 parent 4d2888c commit 400429c
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,23 @@ public boolean isCellEditable(int row, int column) {
addNewEntry(newEntry);
},
() -> currentCust != null, null).asButton();
JButton newSkillButton = new EasyAction("New Skill Callout",
() -> {
@Nullable TimelineEntry selectedValue = timelineModel.getSelectedValue();
CustomTimelineEntry newEntry = new CustomTimelineEntry();
if (selectedValue != null) {
newEntry.time = selectedValue.time();
}
actionTableFactory.showChooser(SwingUtilities.getWindowAncestor(this), action -> {
newEntry.name = action.name();
ActionIcon icon = action.getIcon();
if (icon != null) {
newEntry.icon = icon.getIconUrl();
}
newEntry.callout = true;
addNewEntry(newEntry);
});
}).asButton();
JButton newLabelButton = new EasyAction("New Label",
() -> {
@Nullable TimelineEntry selectedValue = timelineModel.getSelectedValue();
Expand Down Expand Up @@ -597,6 +614,7 @@ public boolean isEnabled() {
chooseDirButton.addActionListener(l -> chooseCactbotUserDir());
JPanel buttonPanel = new JPanel(new WrapLayout());
buttonPanel.add(newButton);
buttonPanel.add(newSkillButton);
buttonPanel.add(newLabelButton);
buttonPanel.add(resetButton);
buttonPanel.add(exportCustBtn);
Expand Down
18 changes: 15 additions & 3 deletions xivsupport/src/main/resources/te_changelog.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<html lang="en">
<body style="margin: 5px 20px 5px 20px">
<h2>January 15, 2025</h2>
<ul>
<li>Added "New Skill Callout" button to timeline editor - this will allow you to choose a skill, and it
will insert an entry with the name and icon of that skill, enabled as a timeline trigger.
</li>
<li>FRU tweaks.</li>
</ul>
<h2>December 27, 2024</h2>
<ul>
<li>CoD Chaotic Alliance Raid initial triggers added.</li>
Expand All @@ -8,7 +15,9 @@ <h2>December 27, 2024</h2>
<h2>December 21, 2024</h2>
<ul>
<li>Game data updates for 7.15.</li>
<li>Startup improvements: Failed components will not prevent startup, and loading should be slightly faster.</li>
<li>Startup improvements: Failed components will not prevent startup, and loading should be slightly
faster.
</li>
</ul>
<h2>December 13, 2024</h2>
<ul>
Expand All @@ -32,7 +41,9 @@ <h2>December 3, 2024</h2>
<h2>November 28, 2024</h2>
<ul>
<li>More FRU triggers, up to LR.</li>
<li>You can now right-click some events (such as those with actions or statuses) to navigate to that entry in the library tab.</li>
<li>You can now right-click some events (such as those with actions or statuses) to navigate to that entry
in the library tab.
</li>
<li>Most library tabs now have a right-click option to open the equivalent page on XivAPI.</li>
<li>Most library tabs also have a "Jump to ID" widget that accepts decimal or hex input.</li>
</ul>
Expand Down Expand Up @@ -133,7 +144,8 @@ <h2>June 26, 2024</h2>
<h2>June 17, 2024</h2>
<ul>
<li>AnimationLockEvent implemented. Requires an appropriately new OverlayPlugin version.</li>
<li>Note: this is temporarily removed, as this data has moved from OverlayPlugin to the base ACT plugin.</li>
<li>Note: this is temporarily removed, as this data has moved from OverlayPlugin to the base ACT plugin.
</li>
</ul>
<h2>Apr 5, 2024</h2>
<ul>
Expand Down

0 comments on commit 400429c

Please sign in to comment.