Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add buttons to the add-on dialog to easily copy MT Theme and MT Stat Sheet Theme CSS to the clipboard #4156

Merged
merged 7 commits into from
Jun 28, 2023
Merged

Add buttons to the add-on dialog to easily copy MT Theme and MT Stat Sheet Theme CSS to the clipboard #4156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b9656e
Add buttons to copy CSS to dialog for add-ons
cwisniew Jun 17, 2023
1117ca6
Merge branch 'develop' into feature-copy-css
cwisniew Jun 21, 2023
aafa103
Merge branch 'feature-addon-window' into feature-copy-css
cwisniew Jun 22, 2023
a719cee
Add warning message
cwisniew Jun 23, 2023
bec2d7b
Merge remote-tracking branch 'refs/remotes/origin/feature-copy-css' i…
cwisniew Jun 23, 2023
2916693
Merge branch 'develop' into feature-copy-css
cwisniew Jun 28, 2023
e8bb1ad
Use new constant in MapToolBuiltInLibrary, also make the constants in…
cwisniew Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/net/rptools/maptool/client/AppConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,7 @@ public class AppConstants {
/** CSS used for MT Stat Sheet Theme support */
public static final String MT_THEME_STAT_SHEET_CSS =
"lib://net.rptools.maptool/css/mt-stat-sheet.css";

/** Namespace for built in add-ons. This is used to determine if an add-on is built in or not. */
public static final String MT_BUILTIN_ADD_ON_NAMESPACE = "net.rptools.maptool";
kwvanderlinde marked this conversation as resolved.
Show resolved Hide resolved
}
39 changes: 37 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/addon/AddOnLibrariesDialogView.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,49 @@
</splitpane>
</children>
</grid>
<grid id="78150" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="78150" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title-resource-bundle="net/rptools/maptool/language/i18n" title-key="library.dialog.development.label"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
<children>
<hspacer id="28b4a">
<constraints>
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<vspacer id="61f72">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<component id="fde58" class="javax.swing.JLabel">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="net/rptools/maptool/language/i18n" key="library.dialog.copy.title"/>
</properties>
</component>
<component id="456e5" class="javax.swing.JButton" binding="copyThemeCSS">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="net/rptools/maptool/language/i18n" key="library.dialog.copyMTThemeCSS"/>
</properties>
</component>
<component id="35630" class="javax.swing.JButton" binding="copyStatSheetThemeButton" default-binding="true">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="net/rptools/maptool/language/i18n" key="library.dialog.copyMTStatSheetTheme"/>
</properties>
</component>
</children>
</grid>
</children>
</tabbedpane>
Expand Down
44 changes: 44 additions & 0 deletions src/main/java/net/rptools/maptool/client/ui/addon/AddOnLibrariesDialogView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@
*/
package net.rptools.maptool.client.ui.addon;

import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import javax.swing.JButton;
Expand All @@ -34,6 +37,7 @@
import javax.swing.JTextPane;
import javax.swing.KeyStroke;
import net.rptools.maptool.client.AppActions.MapPreviewFileChooser;
import net.rptools.maptool.client.AppConstants;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.ui.JLabelHyperLinkListener;
import net.rptools.maptool.client.ui.ViewAssetDialog;
Expand Down Expand Up @@ -63,6 +67,8 @@ public class AddOnLibrariesDialogView extends JDialog {
private JLabel addOnLicenseLabel;
private JButton viewReadMeFileButton;
private JButton viewLicenseFileButton;
private JButton copyThemeCSS;
private JButton copyStatSheetThemeButton;

private LibraryInfo selectedAddOn;

Expand Down Expand Up @@ -161,6 +167,44 @@ public void actionPerformed(ActionEvent e) {
buttonRemove.setEnabled(false);
}
});

copyThemeCSS.addActionListener(
e -> {
new LibraryManager()
.getLibrary(AppConstants.MT_BUILTIN_ADD_ON_NAMESPACE)
.ifPresent(
library -> {
URI uri = URI.create(AppConstants.MT_THEME_CSS);
String themeCss = null;
try {
themeCss = library.readAsString(uri.toURL()).get();
} catch (InterruptedException | ExecutionException | IOException ex) {
throw new RuntimeException(ex);
}
Toolkit.getDefaultToolkit()
.getSystemClipboard()
.setContents(new StringSelection(themeCss), null);
});
});

copyStatSheetThemeButton.addActionListener(
e -> {
new LibraryManager()
.getLibrary(AppConstants.MT_BUILTIN_ADD_ON_NAMESPACE)
.ifPresent(
library -> {
URI uri = URI.create(AppConstants.MT_THEME_STAT_SHEET_CSS);
String themeCss = null;
try {
themeCss = library.readAsString(uri.toURL()).get();
} catch (InterruptedException | ExecutionException | IOException ex) {
throw new RuntimeException(ex);
}
Toolkit.getDefaultToolkit()
.getSystemClipboard()
.setContents(new StringSelection(themeCss), null);
});
});
}

/**
Expand Down
29 changes: 15 additions & 14 deletions src/main/java/net/rptools/maptool/model/library/builtin/MapToolBuiltInLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import net.rptools.maptool.client.AppConstants;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.MapToolMacroContext;
import net.rptools.maptool.language.I18N;
Expand Down Expand Up @@ -71,31 +72,31 @@ private String processHandlebarsTemplate(ResourceDetails rd) {
}
}

private final Map<String, String> cache = new ConcurrentHashMap<>();
private static final Map<String, String> cache = new ConcurrentHashMap<>();

private final String name = "MapTool Built-In Library";
private final String namespace = "net.rptools.maptool";
private final String version = "1.0.0";
private static final String name = "MapTool Built-In Library";
private static final String namespace = AppConstants.MT_BUILTIN_ADD_ON_NAMESPACE;
private static final String version = "1.0.0";

private final String website = "https://www.rptools.net";
private static final String website = "https://www.rptools.net";

private final String gitUrl = "https://github.com/RPTools/maptool";
private static final String gitUrl = "https://github.com/RPTools/maptool";

private final String[] authors = new String[] {"RPTools Team"};
private static final String[] authors = new String[] {"RPTools Team"};

private final String license = "AGPLv3";
private static final String license = "AGPLv3";

private final String description = "MapTool Built-In Library";
private static final String description = "MapTool Built-In Library";

private final String shortDescription = "MapTool Built-In Library";
private static final String shortDescription = "MapTool Built-In Library";

private final boolean allowsUriAccess = true;
private static final boolean allowsUriAccess = true;

private final String readMeFile = "";
private static final String readMeFile = "";

private final String licenseFile = "";
private static final String licenseFile = "";

private final String[] tags = new String[] {};
private static final String[] tags = new String[] {};

@Override
public CompletableFuture<String> getVersion() {
Expand Down
6 changes: 5 additions & 1 deletion src/main/resources/net/rptools/maptool/language/i18n.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2757,7 +2757,11 @@ library.dialog.table.remove = Remove Library
library.dialog.table.removeData = Remove Library and Data
library.dialog.delete.confirm = Are you sure you want to remove add-on library {0}?
library.dialog.deleteData.confirm = Are you sure you want to remove add-on library {0} and all its data?

library.dialog.copy.title = <html>The copied CSS is for testing \
purposes only.<br/>Within your add-on use<br/>lib://net.rptools.maptool/css/mt-stat-sheet.css \
or<br/> lib://net.rptools.maptool/css/mt-theme.css</html>
library.dialog.copyMTThemeCSS = Copy CSS Theme to clipbaord
library.dialog.copyMTStatSheetTheme = Copy Stat Sheet Theme to clipbaord

# Game Data
data.error.cantConvertTo = Can''t convert {0} to {1}.
Expand Down