From 8d34da916f6fa79593fabf1c44c21a04cc0caf58 Mon Sep 17 00:00:00 2001 From: tdue21 Date: Wed, 20 Mar 2019 09:04:11 +0100 Subject: [PATCH 1/8] Working on fixes for #21. This is the "Remove Background Color" button missing translation. --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../net/rptools/tokentool/controller/TokenTool_Controller.java | 3 +++ .../resources/net/rptools/tokentool/i18n/TokenTool.properties | 2 +- .../net/rptools/tokentool/i18n/TokenTool_da.properties | 1 + src/main/resources/net/rptools/tokentool/view/TokenTool.fxml | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cb586cb..00c2dd9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip diff --git a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java index 40f0252..9e98881 100644 --- a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java +++ b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java @@ -46,6 +46,7 @@ import javafx.geometry.Insets; import javafx.scene.Cursor; import javafx.scene.Group; +import javafx.scene.control.Button; import javafx.scene.control.CheckBox; import javafx.scene.control.ColorPicker; import javafx.scene.control.Label; @@ -132,6 +133,7 @@ public class TokenTool_Controller { @FXML private Label overlayNameLabel; @FXML private ColorPicker backgroundColorPicker; @FXML private ToggleButton overlayAspectToggleButton; + @FXML private Button removeBackgroundButton; @FXML private Slider portraitTransparencySlider; @FXML private Slider portraitBlurSlider; @@ -221,6 +223,7 @@ void initialize() { assert portraitTransparencySlider != null : "fx:id=\"portraitTransparencySlider\" was not injected: check your FXML file 'TokenTool.fxml'."; assert portraitBlurSlider != null : "fx:id=\"portraitBlurSlider\" was not injected: check your FXML file 'TokenTool.fxml'."; assert portraitGlowSlider != null : "fx:id=\"portraitGlowSlider\" was not injected: check your FXML file 'TokenTool.fxml'."; + assert removeBackgroundButton != null : "fx:id=\"removeBackgroundButton\" was not injected: check your FXML file 'TokenTool.fxml'."; assert overlayTransparencySlider != null : "fx:id=\"overlayTransparencySlider\" was not injected: check your FXML file 'TokenTool.fxml'."; diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties index 369304b..b5a232b 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties @@ -68,7 +68,7 @@ options.pane.portrait.label.Background_Color = Background Color options.pane.portrait.label.Gaussian_Blur = Gaussian Blur options.pane.portrait.label.Glow = Glow options.pane.portrait.label.Opacity = Opacity - +option.pane.portrait.button.RemoveBackgroundColor=Remove Background Color pane.left.title = Drag or paste image here... splash.cache.label = Caching overlays, this will only take a moment... diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties index 411eb98..51a26bb 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties @@ -62,6 +62,7 @@ options.pane.portrait.label.Background_Color=Baggrundsfarve options.pane.portrait.label.Gaussian_Blur=Gaussisk sl\u00F8ring options.pane.portrait.label.Glow=Gl\u00F8d options.pane.portrait.label.Opacity=Gennemsigtighed +option.pane.portrait.button.RemoveBackgroundColor=Fjern baggrundsfarve pane.left.title=Tr\u00E6k eller inds\u00E6t billede her... splash.cache.label=Cacher overlejringer, dette tager kun et \u00F8jeblik... splash.version.label = Version diff --git a/src/main/resources/net/rptools/tokentool/view/TokenTool.fxml b/src/main/resources/net/rptools/tokentool/view/TokenTool.fxml index 9badcc7..2e6612d 100644 --- a/src/main/resources/net/rptools/tokentool/view/TokenTool.fxml +++ b/src/main/resources/net/rptools/tokentool/view/TokenTool.fxml @@ -141,7 +141,7 @@ - From 47547b4e7f82be332c4dca9717fffabafcf6a41b Mon Sep 17 00:00:00 2001 From: tdue21 Date: Wed, 20 Mar 2019 09:40:56 +0100 Subject: [PATCH 2/8] Working on fixes for #21. This commit fixes some hardcoded texts in ImageUtil.java and adds translations for the HeaderText on JavaFX Alerts in ManageOverlays_Controller.java. --- .../controller/ManageOverlays_Controller.java | 3 +++ .../net/rptools/tokentool/util/ImageUtil.java | 17 +++++++++-------- .../rptools/tokentool/i18n/TokenTool.properties | 5 +++++ .../tokentool/i18n/TokenTool_da.properties | 5 +++++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java b/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java index 8a3cd8f..c084238 100644 --- a/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java +++ b/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java @@ -265,6 +265,7 @@ else if (overlayFiles.size() == 1) { Alert alert = new Alert(AlertType.CONFIRMATION); alert.setTitle(I18N.getString("ManageOverlays.dialog.delete.title")); + alert.setHeaderText(I18N.getString("ManageOverlays.dialog.header.confirmation")); alert.setContentText(confirmationText); Optional result = alert.showAndWait(); @@ -288,6 +289,7 @@ private boolean confirmDelete(File dir) { Alert alert = new Alert(AlertType.CONFIRMATION); alert.setTitle(I18N.getString("ManageOverlays.dialog.delete.dir.title")); + alert.setHeaderText(I18N.getString("ManageOverlays.dialog.header.confirmation")); alert.setContentText(confirmationText); Optional result = alert.showAndWait(); @@ -375,6 +377,7 @@ void addFolderButton_onAction(ActionEvent event) { void restoreButton_onAction(ActionEvent event) { Alert alert = new Alert(AlertType.CONFIRMATION); alert.setTitle(I18N.getString("ManageOverlays.dialog.restore.overlays.title")); + alert.setHeaderText(I18N.getString("ManageOverlays.dialog.header.confirmation")); alert.setContentText(I18N.getString("ManageOverlays.dialog.restore.overlays.content_text")); Optional result = alert.showAndWait(); diff --git a/src/main/java/net/rptools/tokentool/util/ImageUtil.java b/src/main/java/net/rptools/tokentool/util/ImageUtil.java index c0a4244..fa8cb76 100644 --- a/src/main/java/net/rptools/tokentool/util/ImageUtil.java +++ b/src/main/java/net/rptools/tokentool/util/ImageUtil.java @@ -370,9 +370,10 @@ private static boolean isMagenta(Color color, int fudge) { public static String getFileType(File imageFile) { if (FilenameUtils.getExtension(imageFile.getName()).toLowerCase().equals("psd")) { - return "Adobe Photoshop Image"; + return I18N.getString("imageFile.adobe.photoshop.image") + ; } else { - return FilenameUtils.getExtension(imageFile.getName()).toUpperCase() + " File"; + return FilenameUtils.getExtension(imageFile.getName()).toUpperCase() + I18N.getString("imageFile.fileExtension.label"); } } @@ -384,12 +385,12 @@ public static String getFileType(File imageFile) { public static final List GET_EXTENSION_FILTERS() { List extensionFilters = new ArrayList(); - extensionFilters.add(new ExtensionFilter("All Images", "*.psd", "*.png", "*.gif", "*.jpg", "*.jpeg", "*.bmp")); - extensionFilters.add(new ExtensionFilter("PSD Files", "*.psd")); - extensionFilters.add(new ExtensionFilter("PNG Files", "*.png")); - extensionFilters.add(new ExtensionFilter("JPG Files", "*.jpg")); - extensionFilters.add(new ExtensionFilter("JPEG Files", "*.jpeg")); - extensionFilters.add(new ExtensionFilter("BMP Files", "*.bmp")); + extensionFilters.add(new ExtensionFilter(I18N.getString("imageFile.fileExtension.openFile.allExtensions"), "*.psd", "*.png", "*.gif", "*.jpg", "*.jpeg", "*.bmp")); + extensionFilters.add(new ExtensionFilter("PNG " + I18N.getString("imageFile.fileExtension.openFileExtension"), "*.png")); + extensionFilters.add(new ExtensionFilter("JPG " + I18N.getString("imageFile.fileExtension.openFileExtension"), "*.jpg")); + extensionFilters.add(new ExtensionFilter("PSD " + I18N.getString("imageFile.fileExtension.openFileExtension"), "*.psd")); + extensionFilters.add(new ExtensionFilter("JPEG " + I18N.getString("imageFile.fileExtension.openFileExtension"), "*.jpeg")); + extensionFilters.add(new ExtensionFilter("BMP " + I18N.getString("imageFile.fileExtension.openFileExtension"), "*.bmp")); return extensionFilters; } diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties index b5a232b..a7db109 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties @@ -51,6 +51,11 @@ menu.title.file = _File menu.title.file.exit = E_xit menu.title.file.manage.overlays = _Manage Overlays menu.title.file.save.as = Save _As +imageFile.adobe.photoshop.image=Adobe Photoshop Image +imageFile.fileExtension.label=\ File +imageFile.fileExtension.openFileExtension=Files +imageFile.fileExtension.openFile.allExtensions=All Images +ManageOverlays.dialog.header.confirmation=Confirmation menu.title.help = _Help menu.title.help.about = _About TokenTool diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties index 51a26bb..02c7c91 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties @@ -46,6 +46,11 @@ menu.title.file=_Filer menu.title.file.exit=Af_slut menu.title.file.manage.overlays=_H\u00E5ndt\u00E9r overlejringer menu.title.file.save.as=Gem so_m +imageFile.adobe.photoshop.image=Adobe Photoshop billede +imageFile.fileExtension.label=\ fil +imageFile.fileExtension.openFileExtension=filer +imageFile.fileExtension.openFile.allExtensions=Alle billeder +ManageOverlays.dialog.header.confirmation=Bekr\u00E6ftelse menu.title.help=_Hj\u00E6lp menu.title.help.about=_Om TokenTool options.pane.effects=Overlejring indstillinger From d5e66c2d5035e4f8ceca49b7044246800efb4744 Mon Sep 17 00:00:00 2001 From: tdue21 Date: Sat, 30 Mar 2019 10:42:54 +0100 Subject: [PATCH 3/8] Added translations for a number of hardcoded texts in ImageUtil.java. Enabled translation of the header text for Alerts etc. Updated the danish translations. --- .../java/net/rptools/tokentool/AppSetup.java | 1 + .../rptools/tokentool/client/TokenTool.java | 2 +- .../controller/ManageOverlays_Controller.java | 4 ++ .../controller/TokenTool_Controller.java | 3 +- .../net/rptools/tokentool/util/ImageUtil.java | 29 ++++++++---- .../tokentool/i18n/TokenTool.properties | 8 +++- .../tokentool/i18n/TokenTool_da.properties | 44 ++++++++++++++++--- .../tokentool/i18n/TokenTool_en.properties | 6 ++- 8 files changed, 79 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/rptools/tokentool/AppSetup.java b/src/main/java/net/rptools/tokentool/AppSetup.java index 1d94f74..3b46b56 100644 --- a/src/main/java/net/rptools/tokentool/AppSetup.java +++ b/src/main/java/net/rptools/tokentool/AppSetup.java @@ -103,6 +103,7 @@ private static void confirmInstallOverlays(int overlaysInstalled) { Platform.runLater( () -> { Alert alert = new Alert(AlertType.INFORMATION); + alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header")); alert.setTitle(I18N.getString("AppSetup.dialog.install.overlays.confirmation.title")); alert.setContentText( overlaysInstalled diff --git a/src/main/java/net/rptools/tokentool/client/TokenTool.java b/src/main/java/net/rptools/tokentool/client/TokenTool.java index 9e7b159..068b0b8 100644 --- a/src/main/java/net/rptools/tokentool/client/TokenTool.java +++ b/src/main/java/net/rptools/tokentool/client/TokenTool.java @@ -103,7 +103,7 @@ public void init() throws Exception { // Log some basic info log.info("Environment: " + Sentry.getStoredClient().getEnvironment()); if (!Sentry.getStoredClient().getEnvironment().toLowerCase().equals("production")) - log.info("Not in Produciton mode and thus will not log any events to Sentry.io"); + log.info("Not in Production mode and thus will not log any events to Sentry.io"); log.info("Release: " + Sentry.getStoredClient().getRelease()); log.info("OS: " + ThreadContext.get("OS")); diff --git a/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java b/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java index 5d3566a..9120760 100644 --- a/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java +++ b/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java @@ -318,6 +318,7 @@ else if (overlayFiles.size() == 1) { } Alert alert = new Alert(AlertType.CONFIRMATION); + alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header")); alert.setTitle(I18N.getString("ManageOverlays.dialog.delete.title")); alert.setContentText(confirmationText); @@ -347,6 +348,7 @@ private boolean confirmDelete(File dir) { } Alert alert = new Alert(AlertType.CONFIRMATION); + alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header")); alert.setTitle(I18N.getString("ManageOverlays.dialog.delete.dir.title")); alert.setContentText(confirmationText); @@ -417,6 +419,7 @@ void addOverlayButton_onAction(ActionEvent event) { @FXML void addFolderButton_onAction(ActionEvent event) { TextInputDialog dialog = new TextInputDialog(); + dialog.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header")); dialog.setTitle(I18N.getString("ManageOverlays.filechooser.folder.title")); dialog.setContentText(I18N.getString("ManageOverlays.filechooser.folder.content_text")); @@ -433,6 +436,7 @@ void addFolderButton_onAction(ActionEvent event) { @FXML void restoreButton_onAction(ActionEvent event) { Alert alert = new Alert(AlertType.CONFIRMATION); + alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header")); alert.setTitle(I18N.getString("ManageOverlays.dialog.restore.overlays.title")); alert.setContentText(I18N.getString("ManageOverlays.dialog.restore.overlays.content_text")); diff --git a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java index a7539a2..e5356d6 100644 --- a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java +++ b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java @@ -767,6 +767,7 @@ void helpResetMenu_OnAction(ActionEvent event) { String confirmationText = I18N.getString("TokenTool.dialog.reset.confirmation.text"); Alert alert = new Alert(AlertType.CONFIRMATION); + alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header")); alert.setTitle(I18N.getString("TokenTool.dialog.reset.confirmation.title")); alert.setContentText(confirmationText); @@ -1140,7 +1141,7 @@ void backgroundMenuItem_OnAction(ActionEvent event) { @FXML void portraitMenuItem_OnAction(ActionEvent event) { String menuText = ((RadioMenuItem) event.getSource()).getText(); - layerMenuButton.setText(menuText + " Layer"); // TODO: i18n this shit + layerMenuButton.setText(menuText + I18N.getString("controls.layers.menu.layer.text")); portraitMenuItem.setSelected(true); } diff --git a/src/main/java/net/rptools/tokentool/util/ImageUtil.java b/src/main/java/net/rptools/tokentool/util/ImageUtil.java index 6e3f683..db309c8 100644 --- a/src/main/java/net/rptools/tokentool/util/ImageUtil.java +++ b/src/main/java/net/rptools/tokentool/util/ImageUtil.java @@ -394,9 +394,10 @@ private static boolean isMagenta(Color color, int fudge) { public static String getFileType(File imageFile) { if (FilenameUtils.getExtension(imageFile.getName()).toLowerCase().equals("psd")) { - return "Adobe Photoshop Image"; + return "Adobe Photoshop " + I18N.getString("imageUtil.filetype.label.image"); } else { - return FilenameUtils.getExtension(imageFile.getName()).toUpperCase() + " File"; + return FilenameUtils.getExtension(imageFile.getName()).toUpperCase() + + I18N.getString("imageUtil.filetype.label.extension"); } } @@ -424,12 +425,24 @@ public static byte[] imageToBytes(BufferedImage image, String format) throws IOE public static final List GET_EXTENSION_FILTERS() { List extensionFilters = new ArrayList(); extensionFilters.add( - new ExtensionFilter("All Images", "*.psd", "*.png", "*.gif", "*.jpg", "*.jpeg", "*.bmp")); - extensionFilters.add(new ExtensionFilter("PSD Files", "*.psd")); - extensionFilters.add(new ExtensionFilter("PNG Files", "*.png")); - extensionFilters.add(new ExtensionFilter("JPG Files", "*.jpg")); - extensionFilters.add(new ExtensionFilter("JPEG Files", "*.jpeg")); - extensionFilters.add(new ExtensionFilter("BMP Files", "*.bmp")); + new ExtensionFilter( + I18N.getString("imageUtil.filetype.label.all_images"), + "*.psd", + "*.png", + "*.gif", + "*.jpg", + "*.jpeg", + "*.bmp")); + extensionFilters.add( + new ExtensionFilter("PSD" + I18N.getString("imageUtil.filetype.label.files"), "*.psd")); + extensionFilters.add( + new ExtensionFilter("PNG" + I18N.getString("imageUtil.filetype.label.files"), "*.png")); + extensionFilters.add( + new ExtensionFilter("JPG" + I18N.getString("imageUtil.filetype.label.files"), "*.jpg")); + extensionFilters.add( + new ExtensionFilter("JPEG" + I18N.getString("imageUtil.filetype.label.files"), "*.jpeg")); + extensionFilters.add( + new ExtensionFilter("BMP" + I18N.getString("imageUtil.filetype.label.files"), "*.bmp")); return extensionFilters; } diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties index 988e52a..bf3ef32 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties @@ -30,12 +30,16 @@ ManageOverlays.label.Directory = Directory ManageOverlays.label.Image_Type_Description = Image Type Description ManageOverlays.label.Overlays = Overlays ManageOverlays.stage.title = Manage Overlays - +imageUtil.filetype.label.image=Image +imageUtil.filetype.label.all_images=All Images +imageUtil.filetype.label.extension=\ File +imageUtil.filetype.label.files=\ Files PdvViewer.stage.title = Select PDF RegionSelector.button.Capture = Capture TokenTool.dialog.reset.confirmation.text = This will reset all saved UI settings back to default, are you sure? +TokenTool.dialog.confirmation.header=Confirmation TokenTool.dialog.reset.confirmation.title = Reset Settings? TokenTool.openBackgroundImage.filechooser.title = Select Image TokenTool.openPDF.filechooser.title = Select PDF @@ -52,7 +56,7 @@ controls.filenameSuffixLabel.tooltip = Append a number to the file name that controls.layers.menu.item.background = Background controls.layers.menu.item.overlay = Overlay controls.layers.menu.item.portrait = Portrait -controls.layers.menu.layer.text = \ Layer +controls.layers.menu.layer.text=\ Layer controls.layers.menu.text = Portrait Layer controls.overlayHeightLabel.text = Height controls.overlayWidthLabel.text = Width diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties index 02c7c91..1a1bac4 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties @@ -1,10 +1,13 @@ #Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) # http://translatr.varunmalhotra.xyz/?ref=producthunt +AppSetup.dialog.install.overlays.confirmation=Nye overlejringer blev installeret. +AppSetup.dialog.install.overlays.confirmation.title=Nye overlejringer tilg\u00E6ngelige! Credits.label.Contributors=Bidragsydere Credits.label.Credits=Anerkendelse Credits.stage.title = Om TokenTool +ImageGallery.stage.title=PDF billeder ManageOverlays.button.Restore_Default_Overlays=Gendan standard overlejringer -ManageOverlays.dialog.delete.confirmation=Er du sikker p\u00E5 at du vil slette +ManageOverlays.dialog.delete.confirmation=Er du sikker p\u00E5 at du vil slette ManageOverlays.dialog.delete.confirmation.overlays=\ overlejringer? ManageOverlays.dialog.delete.confirmation.these=disse ManageOverlays.dialog.delete.dir.confirmation=Er du sikker p\u00E5 at du \u00F8nsker at slette @@ -24,7 +27,18 @@ ManageOverlays.label.Directory=Mappe ManageOverlays.label.Image_Type_Description=Beskrivelse af billede type ManageOverlays.label.Overlays=Overlejringer ManageOverlays.stage.title=H\u00E5ndt\u00E9r overlejringer +imageUtil.filetype.label.image=billede +imageUtil.filetype.label.all_images=Alle billeder +imageUtil.filetype.label.extension=\ fil +imageUtil.filetype.label.files=\ filer +PdvViewer.stage.title=V\u00E6lg PDF RegionSelector.button.Capture=Indfang +TokenTool.dialog.reset.confirmation.text=Dette vil gendanne alle standard UI indstillinger, er du sikker? +TokenTool.dialog.confirmation.header=Bekr\u00E6ftelse +TokenTool.dialog.reset.confirmation.title=Nulstil indstillinger? +TokenTool.openBackgroundImage.filechooser.title=V\u00E6lg billede +TokenTool.openPDF.filechooser.title=V\u00E6lg PDF +TokenTool.openPortraitImage.filechooser.title=V\u00E6lg billede TokenTool.save.filechooser.title=Gem som billede TokenTool.stage.title = TokenTool TokenTool.treeview.caching=Cacher @@ -34,10 +48,24 @@ controls.dragAsTokenCheckbox.tooltip=Hvis valgt, vil det at tr\u00E6kke billedet controls.filenameLabel.text=Filnavn controls.filenameSuffixLabel.text=Filnavn endelse # controls.filenameSuffixLabel.tooltip=F\u00F8j et fortl\u00F8bende nummer til filnavnet hver gang filen gemmes. F.eks. Ork-1, Ork-2, Ork-3. +controls.layers.menu.item.background=Baggrund +controls.layers.menu.item.overlay=Overlejring +controls.layers.menu.item.portrait=Portr\u00E6t +controls.layers.menu.layer.text=\ lag +controls.layers.menu.text=Portr\u00E6t lag controls.overlayHeightLabel.text=H\u00F8jde controls.overlayWidthLabel.text=Bredde +controls.portrait.filenameLabel.text=Portr\u00E6t filnavn +controls.portraitNameSuffixLabel.text=Portr\u00E6t endelse +controls.portraitNameSuffixLabel.tooltip=Anvend polettens filnavn med den angivne tekst som endelse, f.eks. Ork [Portr\u00E6t] +controls.save_portrait.text=Gem portr\u00E6t ved tr\u00E6k og slip +controls.save_portrait.tooltip=N\u00E5r en polet gemmes via tr\u00E6k og slip, vil en kopi af portr\u00E6t billedet ogs\u00E5 blive gemt. .Png formattet vil blive brugt hvis billedet har transparens, ellers vil .jpg blive anvendt. +controls.token.filenameLabel.text=Polet filnavn controls.tokenResolution.text = 256 x 256 controls.useFileNumberingCheckbox.text=Anvend fil nummerering +controls.useTokenNameCheckbox.text=Anvend polet navn + +controls.use_background.text=Anvend baggrundsindstillinger +controls.use_background.tooltip=Gem portr\u00E6t med baggundsbillede og farve hvis disse er angivet. Dette vil tvinge portr\u00E6ttet til at blive gemt som et .jpg billede. menu.title.edit=R_ediger menu.title.edit.capture.screen=Indfang _sk\u00E6rm menu.title.edit.copy.image=_Kopi\u00E9r billede @@ -45,14 +73,16 @@ menu.title.edit.paste.image=Inds\u00E6t _billede menu.title.file=_Filer menu.title.file.exit=Af_slut menu.title.file.manage.overlays=_H\u00E5ndt\u00E9r overlejringer +menu.title.file.open.pdf=_\u00C5ben PDF menu.title.file.save.as=Gem so_m imageFile.adobe.photoshop.image=Adobe Photoshop billede imageFile.fileExtension.label=\ fil imageFile.fileExtension.openFileExtension=filer imageFile.fileExtension.openFile.allExtensions=Alle billeder -ManageOverlays.dialog.header.confirmation=Bekr\u00E6ftelse menu.title.help=_Hj\u00E6lp menu.title.help.about=_Om TokenTool +menu.title.help.reset=_Gendan indstillinger +options.pane.background.title=Baggrundsindstillinger options.pane.effects=Overlejring indstillinger options.pane.naming=Navngivningsindstillinger options.pane.overlay=Overlejringsindstillinger @@ -60,14 +90,18 @@ options.pane.overlay.checkbox.clip_portrait=Trim portr\u00E6t options.pane.overlay.checkbox.use_as_base=Send til baggrund options.pane.overlay.slider.Opacity=Gennemsigtighed options.pane.overlay.tooltip.aspect=Behold aspektforhold for overlejringen -options.pane.portrait=Portr\u00E6t indstillinger -options.pane.portrait.button.Remove_Background_Color=Fjern baggrundsfarve +options.pane.portrait.button.add_Background_Image=Skift baggrundsbillede +options.pane.portrait.button.add_Portrait_Image=Skift portr\u00E6t billede +options.pane.portrait.button.remove_Background_Color=Fjern baggrundsfarve +options.pane.portrait.button.remove_Background_Image=Fjern baggrundsbillede +options.pane.portrait.button.remove_Portrait_Image=Fjern portr\u00E6tbillede options.pane.portrait.color.prompt=V\u00E6lg farve bag portr\u00E6t billede options.pane.portrait.label.Background_Color=Baggrundsfarve options.pane.portrait.label.Gaussian_Blur=Gaussisk sl\u00F8ring options.pane.portrait.label.Glow=Gl\u00F8d options.pane.portrait.label.Opacity=Gennemsigtighed -option.pane.portrait.button.RemoveBackgroundColor=Fjern baggrundsfarve +options.pane.portrait.label.effects=Portr\u00E6t effekter +options.pane.portrait.title=Portr\u00E6t indstillinger pane.left.title=Tr\u00E6k eller inds\u00E6t billede her... splash.cache.label=Cacher overlejringer, dette tager kun et \u00F8jeblik... splash.version.label = Version diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties index f95e6f9..1f41657 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties @@ -29,12 +29,16 @@ ManageOverlays.label.Directory = Directory ManageOverlays.label.Image_Type_Description = Image Type Description ManageOverlays.label.Overlays = Overlays ManageOverlays.stage.title = Manage Overlays - +imageUtil.filetype.label.image=Image +imageUtil.filetype.label.all_images=All Images +imageUtil.filetype.label.extension=\ File +imageUtil.filetype.label.files=\ Files PdvViewer.stage.title = Select PDF RegionSelector.button.Capture = Capture TokenTool.dialog.reset.confirmation.text = This will reset all saved UI settings back to default, are you sure? +TokenTool.dialog.confirmation.header=Confirmation TokenTool.dialog.reset.confirmation.title = Reset Settings? TokenTool.openBackgroundImage.filechooser.title = Select Image TokenTool.openPDF.filechooser.title = Select PDF From ba44eface69fe8456772bebb8cd6966463cc9d82 Mon Sep 17 00:00:00 2001 From: Jamz Date: Sat, 30 Mar 2019 09:30:58 -0500 Subject: [PATCH 4/8] Adding Issue Templates Signed-off-by: Jamz --- .github/ISSUE_TEMPLATE/bug_report.md | 33 +++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 17 +++++++++++ .github/ISSUE_TEMPLATE/submit-a-question.md | 12 ++++++++ .github/no-response.yml | 2 +- 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/submit-a-question.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..28fd4f6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,33 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. If macro related, sample macro code '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**TokenTool Info** +- Version: 1.5.? +- Install: New, Upgrade [previous version], or JAR [Java Version] + +**Desktop (please complete the following information):** + - OS: [e.g. Windows, Linux [Ubuntu, Debian, CentOS, etc], MacOS] + - Version [10, 18.04, etc.] + +**Additional context** +Add any other context about the problem here. +You can also attach files (drag and drop here or paste from clipboard) such as log files or screenshots. For large files, paste a file sharing link. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..066b2d9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/submit-a-question.md b/.github/ISSUE_TEMPLATE/submit-a-question.md new file mode 100644 index 0000000..46bdac2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/submit-a-question.md @@ -0,0 +1,12 @@ +--- +name: Submit a Question +about: Technical Questions + +--- + +**Describe your question** +A clear and concise question regarding this Project, how to contribute, or similar topics. + +*This should NOT be used for general questions on use of TokenTool* +For user support, please post your question on the Forums: http://forums.rptools.net +Or on our Discord channel: [Invite Link](https://discord.gg/2FCwhZ9) diff --git a/.github/no-response.yml b/.github/no-response.yml index 2ba1c06..1e480b4 100644 --- a/.github/no-response.yml +++ b/.github/no-response.yml @@ -1,7 +1,7 @@ # Configuration for probot-no-response - https://github.com/probot/no-response # Number of days of inactivity before an Issue is closed for lack of response -daysUntilClose: 30 +daysUntilClose: 90 # Label requiring a response responseRequiredLabel: info needed # Comment to post when closing an Issue for lack of response. Set to `false` to disable From c0c7ab198f1ada286c43774c4b35d11a00ea9044 Mon Sep 17 00:00:00 2001 From: Jamz Date: Sat, 30 Mar 2019 10:12:41 -0500 Subject: [PATCH 5/8] Gracefully exit application if updating overlay tree Fixes #27 Task-Url: https://github.com/RPTools/TokenTool/issues/27 Signed-off-by: Jamz --- .../tokentool/controller/TokenTool_Controller.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java index e5356d6..efc5a10 100644 --- a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java +++ b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java @@ -1488,7 +1488,7 @@ public void refreshCache() { log.info("overlayCount: " + overlayCount); treeItems = cacheOverlays(AppConstants.OVERLAY_DIR, null, AppConstants.THUMB_SIZE); - } catch (IOException e) { + } catch (IOException | NullPointerException e) { log.error("Error reloading overlay cache!", e); } } @@ -1823,8 +1823,12 @@ public Slider getOverlayTransparencySlider() { } public void exitApplication() { - // Lets update the recent list to current overlay... - updateOverlayTreeViewRecentFolder(true); + try { + // Lets update the recent list to current overlay... + updateOverlayTreeViewRecentFolder(true); + } catch (NullPointerException npe) { + log.info("Unable to updateOverlayTreeViewRecentFolder on exit."); + } try { AppPreferences.savePreferences(this); From 3fd884c15e5fc64ad0e3d8182ac4f329406515dd Mon Sep 17 00:00:00 2001 From: Jamz Date: Sat, 30 Mar 2019 10:46:21 -0500 Subject: [PATCH 6/8] Missing languages added for new i18n keys Signed-off-by: Jamz --- .../tokentool/i18n/TokenTool.properties | 14 +- .../tokentool/i18n/TokenTool_da.properties | 213 +++++++++--------- .../tokentool/i18n/TokenTool_de.properties | 6 + .../tokentool/i18n/TokenTool_en.properties | 12 +- .../tokentool/i18n/TokenTool_fr.properties | 6 + .../tokentool/i18n/TokenTool_it.properties | 6 + .../tokentool/i18n/TokenTool_ja.properties | 6 + 7 files changed, 149 insertions(+), 114 deletions(-) diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties index bf3ef32..279be2d 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties @@ -30,16 +30,13 @@ ManageOverlays.label.Directory = Directory ManageOverlays.label.Image_Type_Description = Image Type Description ManageOverlays.label.Overlays = Overlays ManageOverlays.stage.title = Manage Overlays -imageUtil.filetype.label.image=Image -imageUtil.filetype.label.all_images=All Images -imageUtil.filetype.label.extension=\ File -imageUtil.filetype.label.files=\ Files + PdvViewer.stage.title = Select PDF RegionSelector.button.Capture = Capture +TokenTool.dialog.confirmation.header = Confirmation TokenTool.dialog.reset.confirmation.text = This will reset all saved UI settings back to default, are you sure? -TokenTool.dialog.confirmation.header=Confirmation TokenTool.dialog.reset.confirmation.title = Reset Settings? TokenTool.openBackgroundImage.filechooser.title = Select Image TokenTool.openPDF.filechooser.title = Select PDF @@ -56,7 +53,7 @@ controls.filenameSuffixLabel.tooltip = Append a number to the file name that controls.layers.menu.item.background = Background controls.layers.menu.item.overlay = Overlay controls.layers.menu.item.portrait = Portrait -controls.layers.menu.layer.text=\ Layer +controls.layers.menu.layer.text = \ Layer controls.layers.menu.text = Portrait Layer controls.overlayHeightLabel.text = Height controls.overlayWidthLabel.text = Width @@ -72,6 +69,11 @@ controls.useTokenNameCheckbox.text = Use Token Name + controls.use_background.text = Use Background Options controls.use_background.tooltip = Save Portrait using Background Image and Background Color is they are set. This will force the Portrait to be saved as a .jpg image. +imageUtil.filetype.label.all_images = All Images +imageUtil.filetype.label.extension = \ File +imageUtil.filetype.label.files = \ Files +imageUtil.filetype.label.image = Image + menu.title.edit = _Edit menu.title.edit.capture.screen = Capture _Screen menu.title.edit.copy.image = _Copy Image diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties index 1a1bac4..7ddac60 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties @@ -1,107 +1,114 @@ #Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) # http://translatr.varunmalhotra.xyz/?ref=producthunt -AppSetup.dialog.install.overlays.confirmation=Nye overlejringer blev installeret. -AppSetup.dialog.install.overlays.confirmation.title=Nye overlejringer tilg\u00E6ngelige! -Credits.label.Contributors=Bidragsydere -Credits.label.Credits=Anerkendelse + +AppSetup.dialog.install.overlays.confirmation = Nye overlejringer blev installeret. +AppSetup.dialog.install.overlays.confirmation.title = Nye overlejringer tilg\u00E6ngelige! + +Credits.label.Contributors = Bidragsydere +Credits.label.Credits = Anerkendelse Credits.stage.title = Om TokenTool -ImageGallery.stage.title=PDF billeder -ManageOverlays.button.Restore_Default_Overlays=Gendan standard overlejringer -ManageOverlays.dialog.delete.confirmation=Er du sikker p\u00E5 at du vil slette -ManageOverlays.dialog.delete.confirmation.overlays=\ overlejringer? -ManageOverlays.dialog.delete.confirmation.these=disse -ManageOverlays.dialog.delete.dir.confirmation=Er du sikker p\u00E5 at du \u00F8nsker at slette -ManageOverlays.dialog.delete.dir.confirmation.directory=\ mappen? -ManageOverlays.dialog.delete.dir.directory_containing=\ mappen indeholdende \ - -ManageOverlays.dialog.delete.dir.overlays=\ overlejringer? -ManageOverlays.dialog.delete.dir.title=Slet mappe -ManageOverlays.dialog.delete.title=Slet overlejringer -ManageOverlays.dialog.restore.overlays.content_text=Er du sikker p\u00E5 at du \u00F8nsker at gendanne alle standard overlejringerne? -ManageOverlays.dialog.restore.overlays.title=Gendan overlejringer -ManageOverlays.filechooser.folder.content_text=Mappens navn: -ManageOverlays.filechooser.folder.title=Opret ny mappe -ManageOverlays.filechooser.overlay.title=V\u00E6lg billede filer -ManageOverlays.label.Details=Detaljer -ManageOverlays.label.Directory=Mappe -ManageOverlays.label.Image_Type_Description=Beskrivelse af billede type -ManageOverlays.label.Overlays=Overlejringer -ManageOverlays.stage.title=H\u00E5ndt\u00E9r overlejringer -imageUtil.filetype.label.image=billede -imageUtil.filetype.label.all_images=Alle billeder -imageUtil.filetype.label.extension=\ fil -imageUtil.filetype.label.files=\ filer -PdvViewer.stage.title=V\u00E6lg PDF -RegionSelector.button.Capture=Indfang -TokenTool.dialog.reset.confirmation.text=Dette vil gendanne alle standard UI indstillinger, er du sikker? -TokenTool.dialog.confirmation.header=Bekr\u00E6ftelse -TokenTool.dialog.reset.confirmation.title=Nulstil indstillinger? -TokenTool.openBackgroundImage.filechooser.title=V\u00E6lg billede -TokenTool.openPDF.filechooser.title=V\u00E6lg PDF -TokenTool.openPortraitImage.filechooser.title=V\u00E6lg billede -TokenTool.save.filechooser.title=Gem som billede -TokenTool.stage.title = TokenTool -TokenTool.treeview.caching=Cacher -controls.base.text=Anvend som polet base -controls.dragAsTokenCheckbox.text=Tr\u00E6k som .rptok polet -controls.dragAsTokenCheckbox.tooltip=Hvis valgt, vil det at tr\u00E6kke billedet over i MapTool oprette en kompatibel .rptok polet med billedet som portr\u00E6t billede. -controls.filenameLabel.text=Filnavn -controls.filenameSuffixLabel.text=Filnavn endelse # -controls.filenameSuffixLabel.tooltip=F\u00F8j et fortl\u00F8bende nummer til filnavnet hver gang filen gemmes. F.eks. Ork-1, Ork-2, Ork-3. -controls.layers.menu.item.background=Baggrund -controls.layers.menu.item.overlay=Overlejring -controls.layers.menu.item.portrait=Portr\u00E6t -controls.layers.menu.layer.text=\ lag -controls.layers.menu.text=Portr\u00E6t lag -controls.overlayHeightLabel.text=H\u00F8jde -controls.overlayWidthLabel.text=Bredde -controls.portrait.filenameLabel.text=Portr\u00E6t filnavn -controls.portraitNameSuffixLabel.text=Portr\u00E6t endelse -controls.portraitNameSuffixLabel.tooltip=Anvend polettens filnavn med den angivne tekst som endelse, f.eks. Ork [Portr\u00E6t] -controls.save_portrait.text=Gem portr\u00E6t ved tr\u00E6k og slip -controls.save_portrait.tooltip=N\u00E5r en polet gemmes via tr\u00E6k og slip, vil en kopi af portr\u00E6t billedet ogs\u00E5 blive gemt. .Png formattet vil blive brugt hvis billedet har transparens, ellers vil .jpg blive anvendt. -controls.token.filenameLabel.text=Polet filnavn -controls.tokenResolution.text = 256 x 256 -controls.useFileNumberingCheckbox.text=Anvend fil nummerering -controls.useTokenNameCheckbox.text=Anvend polet navn + -controls.use_background.text=Anvend baggrundsindstillinger -controls.use_background.tooltip=Gem portr\u00E6t med baggundsbillede og farve hvis disse er angivet. Dette vil tvinge portr\u00E6ttet til at blive gemt som et .jpg billede. -menu.title.edit=R_ediger -menu.title.edit.capture.screen=Indfang _sk\u00E6rm -menu.title.edit.copy.image=_Kopi\u00E9r billede -menu.title.edit.paste.image=Inds\u00E6t _billede -menu.title.file=_Filer -menu.title.file.exit=Af_slut -menu.title.file.manage.overlays=_H\u00E5ndt\u00E9r overlejringer -menu.title.file.open.pdf=_\u00C5ben PDF -menu.title.file.save.as=Gem so_m -imageFile.adobe.photoshop.image=Adobe Photoshop billede -imageFile.fileExtension.label=\ fil -imageFile.fileExtension.openFileExtension=filer -imageFile.fileExtension.openFile.allExtensions=Alle billeder -menu.title.help=_Hj\u00E6lp -menu.title.help.about=_Om TokenTool -menu.title.help.reset=_Gendan indstillinger -options.pane.background.title=Baggrundsindstillinger -options.pane.effects=Overlejring indstillinger -options.pane.naming=Navngivningsindstillinger -options.pane.overlay=Overlejringsindstillinger -options.pane.overlay.checkbox.clip_portrait=Trim portr\u00E6t -options.pane.overlay.checkbox.use_as_base=Send til baggrund -options.pane.overlay.slider.Opacity=Gennemsigtighed -options.pane.overlay.tooltip.aspect=Behold aspektforhold for overlejringen -options.pane.portrait.button.add_Background_Image=Skift baggrundsbillede -options.pane.portrait.button.add_Portrait_Image=Skift portr\u00E6t billede -options.pane.portrait.button.remove_Background_Color=Fjern baggrundsfarve -options.pane.portrait.button.remove_Background_Image=Fjern baggrundsbillede -options.pane.portrait.button.remove_Portrait_Image=Fjern portr\u00E6tbillede -options.pane.portrait.color.prompt=V\u00E6lg farve bag portr\u00E6t billede -options.pane.portrait.label.Background_Color=Baggrundsfarve -options.pane.portrait.label.Gaussian_Blur=Gaussisk sl\u00F8ring -options.pane.portrait.label.Glow=Gl\u00F8d -options.pane.portrait.label.Opacity=Gennemsigtighed -options.pane.portrait.label.effects=Portr\u00E6t effekter -options.pane.portrait.title=Portr\u00E6t indstillinger -pane.left.title=Tr\u00E6k eller inds\u00E6t billede her... -splash.cache.label=Cacher overlejringer, dette tager kun et \u00F8jeblik... + +ImageGallery.stage.title = PDF billeder + +ManageOverlays.button.Restore_Default_Overlays = Gendan standard overlejringer +ManageOverlays.dialog.delete.confirmation = Er du sikker p\u00E5 at du vil slette +ManageOverlays.dialog.delete.confirmation.overlays = \ overlejringer? +ManageOverlays.dialog.delete.confirmation.these = disse +ManageOverlays.dialog.delete.dir.confirmation = Er du sikker p\u00E5 at du \u00F8nsker at slette +ManageOverlays.dialog.delete.dir.confirmation.directory = \ mappen? +ManageOverlays.dialog.delete.dir.directory_containing = \ mappen indeholdende +ManageOverlays.dialog.delete.dir.overlays = \ overlejringer? +ManageOverlays.dialog.delete.dir.title = Slet mappe +ManageOverlays.dialog.delete.title = Slet overlejringer +ManageOverlays.dialog.restore.overlays.content_text = Er du sikker p\u00E5 at du \u00F8nsker at gendanne alle standard overlejringerne? +ManageOverlays.dialog.restore.overlays.title = Gendan overlejringer +ManageOverlays.filechooser.folder.content_text = Mappens navn: +ManageOverlays.filechooser.folder.title = Opret ny mappe +ManageOverlays.filechooser.overlay.title = V\u00E6lg billede filer +ManageOverlays.label.Details = Detaljer +ManageOverlays.label.Directory = Mappe +ManageOverlays.label.Image_Type_Description = Beskrivelse af billede type +ManageOverlays.label.Overlays = Overlejringer +ManageOverlays.stage.title = H\u00E5ndt\u00E9r overlejringer + +PdvViewer.stage.title = V\u00E6lg PDF + +RegionSelector.button.Capture = Indfang + +TokenTool.dialog.confirmation.header = Bekr\u00E6ftelse +TokenTool.dialog.reset.confirmation.text = Dette vil gendanne alle standard UI indstillinger, er du sikker? +TokenTool.dialog.reset.confirmation.title = Nulstil indstillinger? +TokenTool.openBackgroundImage.filechooser.title = V\u00E6lg billede +TokenTool.openPDF.filechooser.title = V\u00E6lg PDF +TokenTool.openPortraitImage.filechooser.title = V\u00E6lg billede +TokenTool.save.filechooser.title = Gem som billede +TokenTool.stage.title = TokenTool +TokenTool.treeview.caching = Cacher + +controls.base.text = Anvend som polet base +controls.dragAsTokenCheckbox.text = Tr\u00E6k som .rptok polet +controls.dragAsTokenCheckbox.tooltip = Hvis valgt, vil det at tr\u00E6kke billedet over i MapTool oprette en kompatibel .rptok polet med billedet som portr\u00E6t billede. +controls.filenameSuffixLabel.text = Filnavn endelse # +controls.filenameSuffixLabel.tooltip = F\u00F8j et fortl\u00F8bende nummer til filnavnet hver gang filen gemmes. F.eks. Ork-1, Ork-2, Ork-3. +controls.layers.menu.item.background = Baggrund +controls.layers.menu.item.overlay = Overlejring +controls.layers.menu.item.portrait = Portr\u00E6t +controls.layers.menu.layer.text = \ lag +controls.layers.menu.text = Portr\u00E6t lag +controls.overlayHeightLabel.text = H\u00F8jde +controls.overlayWidthLabel.text = Bredde +controls.portrait.filenameLabel.text = Portr\u00E6t filnavn +controls.portraitNameSuffixLabel.text = Portr\u00E6t endelse +controls.portraitNameSuffixLabel.tooltip = Anvend polettens filnavn med den angivne tekst som endelse, f.eks. Ork [Portr\u00E6t] +controls.save_portrait.text = Gem portr\u00E6t ved tr\u00E6k og slip +controls.save_portrait.tooltip = N\u00E5r en polet gemmes via tr\u00E6k og slip, vil en kopi af portr\u00E6t billedet ogs\u00E5 blive gemt. .Png formattet vil blive brugt hvis billedet har transparens, ellers vil .jpg blive anvendt. +controls.token.filenameLabel.text = Polet filnavn +controls.tokenResolution.text = 256 x 256 +controls.useFileNumberingCheckbox.text = Anvend fil nummerering +controls.useTokenNameCheckbox.text = Anvend polet navn + +controls.use_background.text = Anvend baggrundsindstillinger +controls.use_background.tooltip = Gem portr\u00E6t med baggundsbillede og farve hvis disse er angivet. Dette vil tvinge portr\u00E6ttet til at blive gemt som et .jpg billede. + +imageUtil.filetype.label.all_images = Alle billeder +imageUtil.filetype.label.extension = \ fil +imageUtil.filetype.label.files = \ filer +imageUtil.filetype.label.image = billede + +menu.title.edit = R_ediger +menu.title.edit.capture.screen = Indfang _sk\u00E6rm +menu.title.edit.copy.image = _Kopi\u00E9r billede +menu.title.edit.paste.image = Inds\u00E6t _billede +menu.title.file = _Filer +menu.title.file.exit = Af_slut +menu.title.file.manage.overlays = _H\u00E5ndt\u00E9r overlejringer +menu.title.file.open.pdf = _\u00C5ben PDF +menu.title.file.save.as = Gem so_m +menu.title.help = _Hj\u00E6lp +menu.title.help.about = _Om TokenTool +menu.title.help.reset = _Gendan indstillinger + +options.pane.background.title = Baggrundsindstillinger +options.pane.effects = Overlejring indstillinger +options.pane.naming = Navngivningsindstillinger +options.pane.overlay = Overlejringsindstillinger +options.pane.overlay.checkbox.clip_portrait = Trim portr\u00E6t +options.pane.overlay.checkbox.use_as_base = Send til baggrund +options.pane.overlay.slider.Opacity = Gennemsigtighed +options.pane.overlay.tooltip.aspect = Behold aspektforhold for overlejringen +options.pane.portrait.button.add_Background_Image = Skift baggrundsbillede +options.pane.portrait.button.add_Portrait_Image = Skift portr\u00E6t billede +options.pane.portrait.button.remove_Background_Color = Fjern baggrundsfarve +options.pane.portrait.button.remove_Background_Image = Fjern baggrundsbillede +options.pane.portrait.button.remove_Portrait_Image = Fjern portr\u00E6tbillede +options.pane.portrait.color.prompt = V\u00E6lg farve bag portr\u00E6t billede +options.pane.portrait.label.Background_Color = Baggrundsfarve +options.pane.portrait.label.Gaussian_Blur = Gaussisk sl\u00F8ring +options.pane.portrait.label.Glow = Gl\u00F8d +options.pane.portrait.label.Opacity = Gennemsigtighed +options.pane.portrait.label.effects = Portr\u00E6t effekter +options.pane.portrait.title = Portr\u00E6t indstillinger + +pane.left.title = Tr\u00E6k eller inds\u00E6t billede her... + +splash.cache.label = Cacher overlejringer, dette tager kun et \u00F8jeblik... splash.version.label = Version diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_de.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_de.properties index 5b8ea97..69381f2 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_de.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_de.properties @@ -33,6 +33,7 @@ PdvViewer.stage.title = W\u00E4hlen Sie PDF RegionSelector.button.Capture = Erfassung +TokenTool.dialog.confirmation.header = Best\u00E4tigung TokenTool.dialog.reset.confirmation.text = Dadurch werden alle gespeicherten UI-Einstellungen auf die Standardwerte zur\u00FCckgesetzt. Sind Sie sicher? TokenTool.dialog.reset.confirmation.title = Einstellungen zur\u00FCcksetzen? TokenTool.openBackgroundImage.filechooser.title = Bild ausw\u00E4hlen @@ -66,6 +67,11 @@ controls.useTokenNameCheckbox.text = Verwenden Sie den Token-Namen + controls.use_background.text = Verwenden Sie Hintergrundoptionen controls.use_background.tooltip = Save Portrait mit Hintergrundbild und Hintergrundfarbe sind sie eingestellt. Dadurch wird das Portrait als JPG-Bild gespeichert. +imageUtil.filetype.label.all_images = Alle Bilder +imageUtil.filetype.label.extension = \ Datei +imageUtil.filetype.label.files = \ Dateien +imageUtil.filetype.label.image = Bild + menu.title.edit = _Bearbeiten menu.title.edit.capture.screen = _Bildschirmaufnahme anfertigen menu.title.edit.copy.image = _Kopie Token diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties index 1f41657..01ba614 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties @@ -29,16 +29,13 @@ ManageOverlays.label.Directory = Directory ManageOverlays.label.Image_Type_Description = Image Type Description ManageOverlays.label.Overlays = Overlays ManageOverlays.stage.title = Manage Overlays -imageUtil.filetype.label.image=Image -imageUtil.filetype.label.all_images=All Images -imageUtil.filetype.label.extension=\ File -imageUtil.filetype.label.files=\ Files + PdvViewer.stage.title = Select PDF RegionSelector.button.Capture = Capture +TokenTool.dialog.confirmation.header = Confirmation TokenTool.dialog.reset.confirmation.text = This will reset all saved UI settings back to default, are you sure? -TokenTool.dialog.confirmation.header=Confirmation TokenTool.dialog.reset.confirmation.title = Reset Settings? TokenTool.openBackgroundImage.filechooser.title = Select Image TokenTool.openPDF.filechooser.title = Select PDF @@ -72,6 +69,11 @@ controls.useTokenNameCheckbox.text = Use Token Name + controls.use_background.text = Use Background Options controls.use_background.tooltip = Save Portrait using Background Image and Background Color is they are set. This will force the Portrait to be saved as a .jpg image. +imageUtil.filetype.label.all_images = All Images +imageUtil.filetype.label.extension = \ File +imageUtil.filetype.label.files = \ Files +imageUtil.filetype.label.image = Image + #For all the menu text... menu.title.edit = _Edit menu.title.edit.capture.screen = Capture _Screen diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_fr.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_fr.properties index 0751881..cc8d79c 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_fr.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_fr.properties @@ -33,6 +33,7 @@ PdvViewer.stage.title = S\u00E9lectionnez PDF RegionSelector.button.Capture = Capture +TokenTool.dialog.confirmation.header = Confirmation TokenTool.dialog.reset.confirmation.text = Cela r\u00E9initialisera tous les param\u00E8tres de l'interface utilisateur sauvegard\u00E9s \u00E0 la valeur par d\u00E9faut, \u00EAtes-vous s\u00FBr? TokenTool.dialog.reset.confirmation.title = R\u00E9initialiser les options? TokenTool.openBackgroundImage.filechooser.title = S\u00E9lectionner une image @@ -66,6 +67,11 @@ controls.useTokenNameCheckbox.text = Utiliser le nom du jeton + controls.use_background.text = Utiliser les options d'arri\u00E8re-plan controls.use_background.tooltip = Enregistrer un portrait \u00E0 l'aide de l'image d'arri\u00E8re-plan et de la couleur d'arri\u00E8re-plan sont d\u00E9finies. Cela forcera le portrait \u00E0 \u00EAtre enregistr\u00E9 sous la forme d'une image .jpg. +imageUtil.filetype.label.all_images = All Images +imageUtil.filetype.label.extension = \ Fichier +imageUtil.filetype.label.files = \ Des dossiers +imageUtil.filetype.label.image = Image + menu.title.edit = _Edition menu.title.edit.capture.screen = _Capture d'\u00E9cran menu.title.edit.copy.image = _Copie Image diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_it.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_it.properties index bd00096..a6b7f3d 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_it.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_it.properties @@ -33,6 +33,7 @@ PdvViewer.stage.title = Seleziona PDF RegionSelector.button.Capture = Catturare +TokenTool.dialog.confirmation.header = Conferma TokenTool.dialog.reset.confirmation.text = Ci\u00F2 ripristiner\u00E0 tutte le impostazioni dell'interfaccia utente salvate sui valori predefiniti, sei sicuro? TokenTool.dialog.reset.confirmation.title = Ripristina le impostazioni? TokenTool.openBackgroundImage.filechooser.title = Seleziona immagine @@ -66,6 +67,11 @@ controls.useTokenNameCheckbox.text = Usa nome token + controls.use_background.text = Usa le opzioni di sfondo controls.use_background.tooltip = Salva ritratto utilizzando l'immagine di sfondo e il colore di sfondo \u00E8 sono impostati. Ci\u00F2 costringer\u00E0 il ritratto a essere salvato come immagine .jpg. +imageUtil.filetype.label.all_images = Tutte le immagini +imageUtil.filetype.label.extension = \ File +imageUtil.filetype.label.files = \ Files +imageUtil.filetype.label.image = Immagine + menu.title.edit = _Modifica menu.title.edit.capture.screen = _Cattura schermo menu.title.edit.copy.image = _Copia provvisorie diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_ja.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_ja.properties index 579b9c3..c7555a8 100644 --- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_ja.properties +++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_ja.properties @@ -33,6 +33,7 @@ PdvViewer.stage.title = PDF\u3092\u9078\u629E RegionSelector.button.Capture = \u30AD\u30E3\u30D7\u30C1\u30E3\u30FC +TokenTool.dialog.confirmation.header = \u78BA\u8A8D TokenTool.dialog.reset.confirmation.text = \u4FDD\u5B58\u3055\u308C\u305F\u3059\u3079\u3066\u306EUI\u8A2D\u5B9A\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u306B\u623B\u3055\u308C\u307E\u3059\u3002\u672C\u5F53\u3067\u3059\u304B\uFF1F TokenTool.dialog.reset.confirmation.title = \u8A2D\u5B9A\u3092\u30EA\u30BB\u30C3\u30C8\uFF1F TokenTool.openBackgroundImage.filechooser.title = \u753B\u50CF\u3092\u9078\u629E @@ -66,6 +67,11 @@ controls.useTokenNameCheckbox.text = \u30C8\u30FC\u30AF\u30F3\u540D\u3092\ controls.use_background.text = \u80CC\u666F\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B controls.use_background.tooltip = \u80CC\u666F\u753B\u50CF\u3068\u80CC\u666F\u8272\u3092\u4F7F\u7528\u3057\u3066\u30DD\u30FC\u30C8\u30EC\u30FC\u30C8\u3092\u4FDD\u5B58\u3059\u308B\u3068\u3001\u305D\u308C\u3089\u304C\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u308A\u3001\u30DD\u30FC\u30C8\u30EC\u30FC\u30C8\u306F.jpg\u753B\u50CF\u3068\u3057\u3066\u4FDD\u5B58\u3055\u308C\u307E\u3059\u3002 +imageUtil.filetype.label.all_images = \u3059\u3079\u3066\u306E\u753B\u50CF +imageUtil.filetype.label.extension = \ \u30D5\u30A1\u30A4\u30EB +imageUtil.filetype.label.files = \ \u30D5\u30A1\u30A4\u30EB +imageUtil.filetype.label.image = \u753B\u50CF + menu.title.edit = \u7DE8\u96C6 menu.title.edit.capture.screen = \u30B9\u30AF\u30EA\u30FC\u30F3\u30AD\u30E3\u30D7\u30C1\u30E3 menu.title.edit.copy.image = \u30B3\u30D4\u30FC\u30C8\u30FC\u30AF\u30F3 From b894afd97c719c9bac58e96da0c2e3b7264ed071 Mon Sep 17 00:00:00 2001 From: Jamz Date: Sat, 30 Mar 2019 10:49:09 -0500 Subject: [PATCH 7/8] Overzealous catch removed Signed-off-by: Jamz --- .../net/rptools/tokentool/controller/TokenTool_Controller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java index efc5a10..5bccf24 100644 --- a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java +++ b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java @@ -1488,7 +1488,7 @@ public void refreshCache() { log.info("overlayCount: " + overlayCount); treeItems = cacheOverlays(AppConstants.OVERLAY_DIR, null, AppConstants.THUMB_SIZE); - } catch (IOException | NullPointerException e) { + } catch (IOException e) { log.error("Error reloading overlay cache!", e); } } From bda161f6c89fd064c5201aadc730c2c8d3db322b Mon Sep 17 00:00:00 2001 From: Jamz Date: Sat, 30 Mar 2019 10:59:47 -0500 Subject: [PATCH 8/8] Possible fix for Travis notifications to Discord Signed-off-by: Jamz --- .travis.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 483e397..f8875bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,16 +30,6 @@ deploy: repo: $REPO tags: true all_branches: true -notifications: - webhooks: - on_success: - - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL - - chmod +x send.sh - - ./send.sh success $DISCORD_URL - on_failure: - - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL - - chmod +x send.sh - - ./send.sh failure $DISCORD_URL after_deploy: # Finalize Sentry release - sentry-cli releases finalize "$TRAVIS_TAG" @@ -47,3 +37,11 @@ after_deploy: - sentry-cli releases set-commits "$TRAVIS_TAG" --auto # Tell Sentry.io we have deployed a release - sentry-cli releases deploys "$TRAVIS_TAG" new -e Production +after_success: + - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL + - chmod +x send.sh + - ./send.sh success $DISCORD_URL +after_failure: + - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL + - chmod +x send.sh + - ./send.sh failure $DISCORD_URL \ No newline at end of file