Conversation
* TokenTool 2.0 Initial Branch checkin Initial checkin of cleanedup code, 98% done! Signed-off-by: Jamz <Jamz@Nerps.net> * Update .travis.yml * Update .appveyor.yml * Final commit for QA Signed-off-by: Jamz <Jamz@Nerps.net> * Delete .classpath * Delete .project * Update .gitignore * Removed folder from repository * Removed folders from repository * Updated icons * Updated travis build * Added gradle wrapper back * Create README.md * Update README.md * Spotless... * Modified travis deploy * Travis deploy fix * Updated github api key * linux deploy fix * travis test to create proper draft release * Update README.md
* fix rotate for linux builds * 2.0 Pre-release fixes * Fixed license file issue * Fixed Rotation on linux/windows issue * Fixed missing Horta font * Added touch support for rotation/zoom * Added version to credits * Updated large labels to Horta font via css * Added .settings folder back as it is only created on import so switching branches is painful otherwise * Update .travis.yml * Update .appveyor.yml * more CI edits
* Fixes & Enchancements * Fixed filename to only accept valid characters * Added better logic to find image filename buried in URL's * Renamed "Use as base" checkbox to "Send to Back" * Added "Clip Portrait" checkbox. Note: Send to Back now clips portrait unless this checkbox is checked and when overlay is "in front" it can be set to not clip * Added several "Bottlecap" type overlays #GlassCannonPodcast! * Adjusted UI controls, some text was overflowing on Linux. Signed-off-by: Jamz <Jamz@Nerps.net> * Final commit for 2.0 Adjusted bottle cap overlays and Background color now saved. Signed-off-by: Jamz <Jamz@Nerps.net> * Update README.md
* Fixes & Enchancements * Fixed filename to only accept valid characters * Added better logic to find image filename buried in URL's * Renamed "Use as base" checkbox to "Send to Back" * Added "Clip Portrait" checkbox. Note: Send to Back now clips portrait unless this checkbox is checked and when overlay is "in front" it can be set to not clip * Added several "Bottlecap" type overlays #GlassCannonPodcast! * Adjusted UI controls, some text was overflowing on Linux. Signed-off-by: Jamz <Jamz@Nerps.net> * Final commit for 2.0 Adjusted bottle cap overlays and Background color now saved. Signed-off-by: Jamz <Jamz@Nerps.net> * Update README.md * Update README.md Fixed Travis CI Badge
Updated to build on non tags and deploy on tags
* spotless throwing errors in appveyor, attempting fix * spotless throwing errors in appveyor, attempting fix * spotless throwing errors in appveyor, attempting fix
Member
|
Conflicts resolved and merged from the command line. |
JamzTheMan
added a commit
that referenced
this pull request
Mar 29, 2019
* #7: Add PDF Extraction Initial check-in of PDF Extraction code, working beta 1! Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * #7: Add PDF Extraction Adjustments for better window resizing. Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * #7: Add PDF Extraction Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * #7: Add PDF Extraction Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * #7: Add PDF Extraction Updated travis. Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * #7: Add PDF Extraction Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * #7: Add PDF Extraction Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * Cleanup * Ignore eclipse .settings * Updated PDFBox libs * Updated Gradle Wrapper to 4.7 Task-Url: JamzTheMan/MapTool#37 Signed-off-by: Jamz <Jamz@Nerps.net> * PDF Enhancements * Removed ImageGallery fxml/controller - unneeded complexity * Added PDF Window i18n title * Changed sentry.io logging to ERROR * Added caching of main PDF image render * Fixed auto resizing of main PDF image * Added drag/drop from PDF extract buttons Signed-off-by: Jamz <Jamz@Nerps.net> * #9: Pog filenames substitute %20 for spaces * Properly decode file names for saving to file * minor cleanup on other files Task-Url: http://github.com/JamzTheMan/TokenTool/issues/9 Signed-off-by: Jamz <Jamz@Nerps.net> * #10: Add arrow key nudges * Added 1 pixel nudge on arrow keys Task-Url: http://github.com/JamzTheMan/TokenTool/issues/10 Signed-off-by: Jamz <Jamz@Nerps.net> * #13: Allow user supplied image for background - WIP * Added button to supply background image * updated token preview clipping to use background image Task-Url: http://github.com/JamzTheMan/TokenTool/issues/13 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * Updated Travis CI to install latest java via brew * Updated config to use environment variables from Travis config. Should be generic now for upstream repo Task-Url: JamzTheMan#12 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * Updated Travis CI to install latest java via brew * Updated config to use environment variables from Travis config. Should be generic now for upstream repo * Updated Appveyor config * WIP - working on errors in travis... Task-Url: JamzTheMan#12 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * Removed DLL from Inno Setup template * Add TokenTool.iss to .gitignore as this is built for every deploy * Moved Vendor to gradle.properties so it's static for the repo Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * Version now grabbed from Tag. If no tag, version = SNAPSHOT+Commit Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * Added missing platform x64 config for appveyor... Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * Changed gradle deploy to run only 'before_deploy' (was always running) Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * Update .appveyor.yml * #8: Bug in pdf-extract-feature branch * Can now drop PDF files to open them * ImageIO lib updated, no longer throws error Task-Url: http://github.com/JamzTheMan/TokenTool/issues/8 Signed-off-by: Jamz <Jamz@Nerps.net> * #14: Add a keyboard shortcut to take a screen capture. * Added shortcut to Capture Screen menu option per request * Updated and added other shortcuts to menu options Task-Url: http://github.com/JamzTheMan/TokenTool/issues/14 Signed-off-by: Jamz <Jamz@Nerps.net> * Layer support WIP * #13: Allow user supplied image for background * Added drag and drop areas to denote if image is portrait or background * Added layer selection menu button to drive scroll/rotate events WIP * Changed Preference saving to handle ImageView's a little easier * Added system.exit to kill any lingering threads from PDF extractions * Updated Paste/Screen Capture/PDF Extract to put image on currently selected layer * All child windows now remember position and size * Swipe touch event should move 1 page at a time now * New menu option to Reset Settings to factory defaults Task-Url: http://github.com/JamzTheMan/TokenTool/issues/13 Signed-off-by: Jamz <Jamz@Nerps.net> * Logging and Build changes * Sentry now logs OS * Sentry now configures as Development on non tagged commits. * Sentry bumped to 1.7.5 * gradle.properties now hole vendor and sentry DSN for more flexibility * Adding a tag now configures Sentry to Production mode, sets Release version and kicks off Deployment in CI Signed-off-by: Jamz <Jamz@Nerps.net> * #13: Allow user supplied image for background * Help -> Reset menu now has confirmation/cancel dialog * FXML/UI tweaked to better handle ImageViews to remain centered on stage resize (background and portrait) and refactored code to simpler binding Task-Url: http://github.com/JamzTheMan/TokenTool/issues/13 Signed-off-by: Jamz <Jamz@Nerps.net> * #13: Allow user supplied image for background * Right click on pdf extract sets background vs portrait * Sentry.io only logs in Production mode now * WIP: Portrait naming Task-Url: http://github.com/JamzTheMan/TokenTool/issues/13 Signed-off-by: Jamz <Jamz@Nerps.net> * #17: Imported PNG overlays coming in at 100x100 * Fixed png thumbs being imported at default thumb size of 100 Task-Url: http://github.com/JamzTheMan/TokenTool/issues/17 Signed-off-by: Jamz <Jamz@Nerps.net> * #19: Add ESC key to cancel Screen Capture * Added esc key event capture * Added highlighting to drag icons Task-Url: http://github.com/JamzTheMan/TokenTool/issues/19 Signed-off-by: Jamz <Jamz@Nerps.net> * #13: Allow user supplied image for background * Final tweaks on new save options, can now save portrait with backgound options on drag and drop along with normal token image Task-Url: http://github.com/JamzTheMan/TokenTool/issues/13 Signed-off-by: Jamz <Jamz@Nerps.net> * New Overlays * A few new overlays added * AppSetup will only install new overlays since last version installed * TODO: i18n properties still need to be updated... Task-Url: http://github.com/JamzTheMan/TokenTool/issues/13 Signed-off-by: Jamz <Jamz@Nerps.net> * Misc * Added some card type overlay bases * Added label under overlay name above overlay tree to dispaly native overlay dimensions, eg 512 x 512 * Updated i18n files with new externalized strings Task-Url: http://github.com/JamzTheMan/TokenTool/issues/13 Signed-off-by: Jamz <Jamz@Nerps.net> * Misc * i18n'd Layer Menu button Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * Fixed bug with brew per Homebrew/homebrew-cask#49716 Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * #7: Add PDF Extraction * PDF image extraction now on it's own service thread * Added progress indicator for long image extractions Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * #7: Add PDF Extraction * Spotless... * Tagged! Task-Url: http://github.com/JamzTheMan/TokenTool/issues/7 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * getting the appveyor key to work? Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * Another try at env vars Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * #12: Update CI config and install to Java 10 * YAT Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * Still testing AppVeyor... * YAT WTF Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net> * 12: Update CI config and install to Java 10 Task-Url: http://github.com/JamzTheMan/TokenTool/issues/12 Signed-off-by: Jamz <Jamz@Nerps.net>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Here's the java 1.8 FX rewrite!
Of course, you'll probably want to pull this into a new branch and make a few changes then merge into your master. For instance, Travis/Appveyor changes will be needed. And in gradle.build, change vendor (which drives .tokentool-vendor property). This is also currently Nerps branded on the spash & credits but the rptools icon is available for rebranding.
This change is