Release 2.1

.appveyor.yml

@@ -1,33 +1,52 @@
 version: '{branch}.{build}'
 pull_requests:
   do_not_increment_build_number: true
-image: Visual Studio 2017
+skip_non_tags: false
 platform: x64
-before_build:
-- gradlew.bat spotlessApply
+image: 
+   - Visual Studio 2017
+   - Ubuntu
+init:
+  - cmd: git config --global core.autocrlf true
+install:
+  - sh: cd ..
+  - sh: mkdir java
+  - sh: cd java
+  - sh: wget http://www.nerps.net/jdk10/jdk-10.0.2_linux-x64_bin.tar.gz
+  - sh: tar zxf jdk-10.0.2_linux-x64_bin.tar.gz
+  - sh: export JAVA_HOME=$(pwd)/jdk-10.0.2
+  - sh: echo java home is $JAVA_HOME
+  - sh: export PATH=$JAVA_HOME/bin:$PATH
+  - sh: echo $PATH
+  - sh: cd ../tokentool
+  - sh: sudo apt install -y fakeroot
+  - ./gradlew -version
+  - java -version
 build_script:
-- gradlew.bat deploy
+  - ./gradlew build
+after_build:
+  - sh: if [[ $APPVEYOR_REPO_TAG == "true" ]]; then ./gradlew deploy; else echo "Not creating deploy artifacts because this is not a tag build."; fi
+  - cmd: IF "%APPVEYOR_REPO_TAG%"=="true" (gradlew deploy) ELSE (echo Not creating deploy artifacts because this is not a tag build.)
 artifacts:
-- path: releases\release-*\bundles\tokentool-*.exe
-  name: TokenTool-Install
-- path: releases\release-*\tokentool-*.jar
+- path: build\libs\TokenTool-*.jar
   name: TokenTool-Jar
+- path: releases\release-*\TokenTool-*.exe
+  name: TokenTool-Windows
+- path: releases\release-*\tokentool-*.deb
+  name: TokenTool-Linux
 deploy:
 - provider: GitHub
-  description: Windows release from AppVeyor
-  tag: $(APPVEYOR_REPO_TAG_NAME)
-  auth_token:
-    secure: J2mFPaAOI3z2AOUG28I1mFzTB5eIJ7cyAJpEBHRtRA3s2Zz54IUzKt+MuT3ufw6D
-  artifact: TokenTool-Install, TokenTool-Jar
+  description: Release build from AppVeyor
+  auth_token: $(GITHUB_RELEASE_KEY)
+  artifact: TokenTool-Jar, TokenTool-Windows, TokenTool-Linux
   draft: false
   prerelease: true
   force_update: false
   on:
-    appveyor_repo_tag: true
-notifications:
-- provider: Webhook
-  url: https://discordapp.com/api/webhooks/399650806032367616/7biqTSlqVIGCAsqZR1vzq8neErZ2kzmDZ5Y4llL0WFwST073vC24_Btqm6uePNU1DWOC
-  method: GET
-  on_build_success: true
-  on_build_failure: true
-  on_build_status_changed: true
+    APPVEYOR_REPO_TAG: true
+on_success:
+  - ps: Invoke-RestMethod $env:APPVEYOR_DISCORD_WEBHOOK_SCRIPT_URL -o send.ps1
+  - ps: ./send.ps1 success $env:DISCORD_URL
+on_failure:
+  - ps: Invoke-RestMethod $env:APPVEYOR_DISCORD_WEBHOOK_SCRIPT_URL -o send.ps1
+  - ps: ./send.ps1 failure $env:DISCORD_URL

.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.

.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.

.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)

.github/move.yml

@@ -0,0 +1,27 @@
+# Configuration for move-issues - https://github.com/dessant/move-issues
+
+# Delete the command comment when it contains no other content
+deleteCommand: true
+
+# Close the source issue after moving
+closeSourceIssue: true
+
+# Lock the source issue after moving
+lockSourceIssue: false
+
+# Mention issue and comment authors
+mentionAuthors: true
+
+# Preserve mentions in the issue content
+keepContentMentions: false
+
+# Move labels that also exist on the target repository
+moveLabels: true
+
+# Set custom aliases for targets
+# aliases:
+#   r: repo
+#   or: owner/repo
+
+# Repository to extend settings from
+# _extends: repo

.github/no-response.yml

@@ -0,0 +1,13 @@
+# 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: 90
+# Label requiring a response
+responseRequiredLabel: info needed
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. With only the
+  information that is currently in the issue, we don't have enough information
+  to take action. Please reach out if you have or find the answers we need so
+  that we can investigate further.

.gitignore

@@ -1,10 +1,3 @@
-# Gradle
-################################################################################
-.gradle
-/gradle.properties
-/gradlew.bat
-/gradlew
-
 # OS generated files
 ################################################################################
 .DS_Store
@@ -16,29 +9,37 @@ Icon?
 ehthumbs.db
 Thumbs.db
 
+
+# Others
+################################################################################
+.gradle
+build/
+/bin/
+target/
+out/
+/releases/
+*.log
+*~
+\${sys:appHome}/
+
+
+# Automatically Generated
+################################################################################
+package/windows/TokenTool.iss
+src/main/resources/sentry.properties
+
+
 # IDEs
 ################################################################################
 *.iml
-.idea/*
+.idea/
 .*.sw[p0-9]
 .sw[p0-9]
 .project
+.settings/
 .classpath
 .history
 workbench.xmi
 
 # Keystore
-build-resources/rptools-keystore
-
-# Others
-################################################################################
-*.log
-*~
-target/*
-build/*
-out/*
-releases/*
-bin/*
-sentry-events/*
-/bin/
-/build/
+build-resources/rptools-keystore

.travis.yml

@@ -2,40 +2,46 @@ language: java
 sudo: false
 matrix:
   include:
-  - os: linux
-    jdk: oraclejdk8
   - os: osx
-    osx_image: xcode8.3
-install: true
-addons:
-  apt:
-    packages:
-    - oracle-java8-installer
-    - fakeroot
+    osx_image: xcode10
 script: 
   - ./gradlew build
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-  - "$HOME/.gradle/caches/"
-  - "$HOME/.gradle/wrapper/"
 before_deploy:
+   # Install Sentry.io CLI
+  - curl -sL https://sentry.io/get-cli/ | bash
+  - sentry-cli info
+  - echo Version is $TRAVIS_TAG
+  # Create a Sentry release
+  - sentry-cli releases new "$TRAVIS_TAG"
+  # Create Deploy Artifacts
   - ./gradlew deploy
 deploy:
   provider: releases
-  api_key:
-    secure: hTBFlftPw61rqEx5+4z+VUHxDWi6l9wcIKQFipLnVHlLeQ1neW1pZ8y7WBvXUWCtZ3/D0iTVJpMlWtpWnu6OoMDbFRAOfy2/2kU7bGUDGoH0QGGwrXjAGhs7GY3s+6eu1/uRWUsZ3Ys/vrBrJxyADGThdhD0QxwQ7SuuwM0ERvD94JuyjfvCFZ6xvOjccYdzilmxC4cRvOrBqv1PHTOLkPoQcXsP/FqUdzUAXrud5iUFw8+4el6kLZT/vmbIE8EdpocAKca8QOjf1AMWCPnr5JwKU+n2PUpEqI1WtFA9PatjR2M1e0yvQFWT0mb/rcfZ6LJEPb/s6cFlHCa0aosgV+aj6tN6K81zLj65L+Vv6F4dJNqW40wkBXRfcen0SR4duLlKx5jSHm3XA6Q5b9aI8+XL12cmFZoKYG+yuVgCYAx/qxHBs6es/wMaGkNrxataKsfzwm4Dw8QGKu+115bsxEywFhEbQfFYvClP9/WFEgrdBdP2bplLpFSGDgv2n6DmJq083CV7bJmxgoqhAhjCry/UL9DG0WFtE1FqWsoxzAUoklDxAE0zgW9D66Xucp5dthuVJbzMpxUiR5zRf8npz/NaRAH7EK1ROl9ue67mtuUobMN7+lnG3pszyxTT/y7kqy0OWFvaGnXJ4UMPbBnXXYdFKc+rSO86/4aWWVE3lwQ=
+  api_key: $GITHUB_RELEASE_KEY
   file_glob: true
-  file: releases/release-*/bundles/*
+  file: releases/release-*/*
   overwrite: true
   skip_cleanup: true
   target_commitish: $TRAVIS_COMMIT
   tag_name: $TRAVIS_TAG
   draft: false
   prerelease: true
   on:
-    repo: RPTools/tokentool
+    repo: $REPO
     tags: true
     all_branches: true
+after_deploy:
+  # Finalize Sentry release
+  - sentry-cli releases finalize "$TRAVIS_TAG"
+  # Associate commits with the Sentry release
+  - 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

CHANGE_LOG.md

@@ -0,0 +1,40 @@
+TokenTool 2.1
+=====
+You can now add background images, extract images from PDF files, and save the portrait alongside the token using the same background image and/or colors!  Several bug fixes and requested enhancements have also been added. 
+
+
+Enhancements
+-----
+* [#7][i7] - *Add PDF Extraction*. Open and extract images straight from the module! Using the File -> Open PDF menu or dragging a PDF to the main window, you can open and view and PDF. The individual images are shown to the right and you can either drag them to the main window or left-click with the mouse to use the image as the Portrait or right-click with the mouse to use the image as the background.
+* [#10][i10] - *Add arrow key nudges*. You can use the arrow keys as well as the number pad to nudge the images 1 pixel at a time! Be sure you have the layer selected that you want to move.
+* [#12][i12] - *Update CI config and install to Java 10*. The packaged JRE has been bumped up to Oracle JDK 10 and is now the required JRE if launching the JAR manually. 
+* [#13][i13] - *Allow user supplied image for background*. In addition to background color, you can now supply a background image! When dragging images to the main window, drop zones will highlight and the "Layer" button in the upper right will tell you if you are setting the Portrait or Background image. Several options have been added to support the use of backgrounds as well.
+* [#14][i14] - *Add a keyboard shortcut to take a screen capture*.  Several keyboard shortcuts as well as Accelerators have been added to the various menu items.
+* [#15][i15] - *The screen capture box could retain its size*. The screen capture window now remembers its size! In fact, all the windows now remember their size and position!
+* [#19][i19] - *Add ESC key to cancel Screen Capture*. Didn't mean to capture that screen shot? Pressing ESC key will now cancel the action and close the window.
+* Misc - A new menu option under Help -> Reset Settings will restore all settings to their defaults.
+* Misc - A few new overlays were added, enjoy!
+* Misc - If you unlock the aspect ratio (pressing the padlock on the Overlay Options), you can now set the token size to any integer.
+* Misc - The overlay's original width x height is now displayed under the Overlays name on the Overlay Options panel
+* Misc - Save options were expanded to allow you to save the Portrait used (with or without Background color/image) alongside the token. This is useful if you grabbed the image from a URL or PDF and forgot or couldn't save it. Also, if you save with Background Options, it will save the portrait as a .jpg instead of a .png (which are typically 10x smaller in disk space) so you can use that high quality PNG from the PDF to create a token but use a smaller jpg for the Portrait (say, in MapTool) where transparency is probably not needed or wanted.
+
+
+Bug Fixes
+-----
+* [#8][i8] - *Bug in pdf-extract-feature branch*. This has been squashed!
+* [#9][i9] - *Pog filenames substitute %20 for spaces*. Token names are now properly unescaped from URL's. No more %20's!
+* [#11][i11] - *Background color layer not on the bottom*. Another bug squashed!
+* [#17][i17] - *Imported PNG overlays coming in at 100x100*. Squashed this one too!
+
+
+[i7]: https://github.com/JamzTheMan/TokenTool/issues/7
+[i8]: https://github.com/JamzTheMan/TokenTool/issues/8
+[i9]: https://github.com/JamzTheMan/TokenTool/issues/9
+[i10]: https://github.com/JamzTheMan/TokenTool/issues/10
+[i11]: https://github.com/JamzTheMan/TokenTool/issues/11
+[i12]: https://github.com/JamzTheMan/TokenTool/issues/12
+[i13]: https://github.com/JamzTheMan/TokenTool/issues/13
+[i14]: https://github.com/JamzTheMan/TokenTool/issues/14
+[i15]: https://github.com/JamzTheMan/TokenTool/issues/15
+[i17]: https://github.com/JamzTheMan/TokenTool/issues/17
+[i19]: https://github.com/JamzTheMan/TokenTool/issues/19

CNAME

@@ -1 +1 @@
-tokentool.nerps.net
+tokentool.rptools.net