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

Map25: found the reason why map25 was not displayed correctly at the very first start. #343

Merged
merged 78 commits into from
May 16, 2021
Merged

Map25: found the reason why map25 was not displayed correctly at the very first start. #343

merged 78 commits into from
May 16, 2021

Commits on Jul 28, 2020

  1. Merge pull request #61 from wolfgang-ch/main 

    main2master
    @telemaxx
    telemaxx committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    19e6997 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2020

  1. Merge pull request #63 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Aug 2, 2020
    Configuration menu
    Copy the full SHA
    9b31e36 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2020

  1. Merge pull request #64 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    7860453 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2020

  1. Revert "removed scaled thumb image, it had the same size as the origi… 

    …nal thumb but this was not the reason to remove it, this image was NEVER disposed -> SWT was running very fast out of handles when moving the tour chart slider as this would create a new image for every new slider position, discovered this issue with SWT sleak"

This reverts commit d3e09e3.
    @telemaxx
    telemaxx committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    58bceb4 View commit details
    Browse the repository at this point in the history

  2. reverted 'reverted "removed scaled image"'

    @telemaxx
    telemaxx committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    7cef53b View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. Merge pull request #65 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    02e59da View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into map25

    @telemaxx
    telemaxx committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    a939ba1 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2020

  1. Merge pull request #66 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    e4efb71 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Merge pull request #67 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    6a807df View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. Merge pull request #68 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    30fca6e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into map25

    top authored and top committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    a3cefa6 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2021

  1. Starting with upgrading VTM 0.15 

    many changes in Libs...
ItemizedLayer
Mutable marker
    top authored and top committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    ac58b32 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. before deactivating some red code

    top authored and top committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    1873921 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2021

  1. ItemizedLayer<> removing <> for vtm 0.15

    top authored and top committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    900c3da View commit details
    Browse the repository at this point in the history

  2. reactivating changed mapbookmarklayer and 

    avoid nullpointer when photolist is empty
    top authored and top committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    3db044c View commit details
    Browse the repository at this point in the history

  3. photolayer modified to work with vtm 0.15 

    and avoiding nullpointer again. 1sr try was nor working.
    top authored and top committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    2ac3d07 View commit details
    Browse the repository at this point in the history

  4. Photoscaled On/Off

    top authored and top committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    980a501 View commit details
    Browse the repository at this point in the history

  5. run save actions for modified files

    top authored and top committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    1e37acf View commit details
    Browse the repository at this point in the history

  6. Debug off

    top authored and top committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    845cb5a View commit details
    Browse the repository at this point in the history

  7. cleanup some codelines

    top authored and top committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    d536d68 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

  1. latest vtm 0.15 updates

    top authored and top committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    71bcb6b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #69 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    9af9a55 View commit details
    Browse the repository at this point in the history

  3. resolving conflicts due new "Images" Structure

    @telemaxx
    telemaxx committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    7676087 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. Map25: PhotoLayer-> Starting with Adjustable PhotoSize and save and 

    restore state
    @telemaxx
    telemaxx committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    78b8388 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2021

  1. Map25 Photoresize with working save and restore 

    need some cleanup
    @telemaxx
    telemaxx committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    55a84a5 View commit details
    Browse the repository at this point in the history

  2. resolving one confict

    @telemaxx
    telemaxx committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    2cfa0e7 View commit details
    Browse the repository at this point in the history

  3. resolving conflicts...

    @telemaxx
    telemaxx committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    227614c View commit details
    Browse the repository at this point in the history

  4. solving more conflicts

    @telemaxx
    telemaxx committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    e7c32c8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #70 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    99da454 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/main' into map25

    @telemaxx
    telemaxx committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    17fe6f1 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2021

  1. adjusted the copyright text, just have a diff.

    @telemaxx
    telemaxx committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    c6a2f6d View commit details
    Browse the repository at this point in the history

  2. undoing modified save actions

    @telemaxx
    telemaxx committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    0c309d0 View commit details
    Browse the repository at this point in the history

  3. revert save actions

    @telemaxx
    telemaxx committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    00fe0cf View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. starting with some javadoc... 

    setting image quality from thumb to HQ
    @telemaxx
    telemaxx committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    c23f205 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #71 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    a8d548a View commit details
    Browse the repository at this point in the history

  3. solved conflict after merging main2map25 

    Merge remote-tracking branch 'origin/main' into map25

Conflicts:
	bundles/net.tourbook/src/net/tourbook/map25/Map25App.java
	bundles/net.tourbook/src/net/tourbook/map25/Map25View.java
	bundles/net.tourbook/src/net/tourbook/map25/layer/marker/PhotoToolkit.java
	bundles/net.tourbook/src/net/tourbook/map25/ui/SlideoutMap25_MapOptions.java
	bundles/net.tourbook/src/net/tourbook/messages.properties
    @telemaxx
    telemaxx committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    ea868bc View commit details
    Browse the repository at this point in the history

  4. in the slideout the "_chkShowPhoto_Scaled" button was to much. 

    something is going wrong with git, that was the second time.
    @telemaxx
    telemaxx committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    09f0eb4 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. revert to ImageQuality.THUMB 

    increased stepsize in slideout from 5 to 10
    @telemaxx
    telemaxx committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    2c9e399 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2021

  1. README

    @telemaxx
    telemaxx committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    085dc34 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2021

  1. Use same wording for "create Tour marker" 

    was different in create marker from chart

the wording i copied from net/tourbook/map2/messages*.properties to
net/tourbook/messages*.properties for all languages.
    @telemaxx
    telemaxx committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    c076826 View commit details
    Browse the repository at this point in the history

  2. README

    @telemaxx
    telemaxx committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    83eb9c4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #72 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    e177c8a View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' into map25 

    Conflicts:
	info/release-notes/21.next.0-readme.txt
    @telemaxx
    telemaxx committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    8e7315f View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2021

  1. Merge pull request #73 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    2b3bac1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #74 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    1bb4797 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2021

  1. Merge pull request #75 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    d04823c View commit details
    Browse the repository at this point in the history

Commits on May 3, 2021

  1. Merge pull request #76 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed May 3, 2021
    Configuration menu
    Copy the full SHA
    6476232 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into map25

    @telemaxx
    telemaxx committed May 3, 2021
    Configuration menu
    Copy the full SHA
    973e04f View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. Merge pull request #77 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed May 4, 2021
    Configuration menu
    Copy the full SHA
    e1b123c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into map25

    @telemaxx
    telemaxx committed May 4, 2021
    Configuration menu
    Copy the full SHA
    e4a2cc2 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. starting track direction arrows in map25

    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    83629f1 View commit details
    Browse the repository at this point in the history

  2. starting track direction arrows in map25

    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    472d9bc View commit details
    Browse the repository at this point in the history

  3. removing test icon

    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    fc448ad View commit details
    Browse the repository at this point in the history

  4. moving arrow shape logic to markertoolkit

    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    128ca06 View commit details
    Browse the repository at this point in the history

  5. cleanup direction arrow

    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    30d771f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #78 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    931245c View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/main' into map25

    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    6d034e9 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'track_arrow' into map25

    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    3db5c85 View commit details
    Browse the repository at this point in the history

  9. UI for the new Track Direction Arrows

    @telemaxx
    telemaxx committed May 14, 2021
    Configuration menu
    Copy the full SHA
    c04a2fc View commit details
    Browse the repository at this point in the history

Commits on May 15, 2021

  1. shorten the text in the slideout, so the layout looks better 

    Readme Update.
Default the arrows are off now
    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    62e1ca2 View commit details
    Browse the repository at this point in the history

  2. show PR numbers in readme

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    3b67ea9 View commit details
    Browse the repository at this point in the history

  3. small refactorings

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    2563d42 View commit details
    Browse the repository at this point in the history

  4. resolving conflicts

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    884c905 View commit details
    Browse the repository at this point in the history

  5. smaller refactoring

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    0cc3112 View commit details
    Browse the repository at this point in the history

  6. track arrows are per default off, so maps looks like before the update.

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    92fb62e View commit details
    Browse the repository at this point in the history

  7. trying to solve last conflicts

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    e3734f1 View commit details
    Browse the repository at this point in the history

  8. default arrows off

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    20470ea View commit details
    Browse the repository at this point in the history

  9. smaller refactoring

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    7a8e41a View commit details
    Browse the repository at this point in the history

  10. still conflicts

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    39283e3 View commit details
    Browse the repository at this point in the history

  11. working on conflicts...

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    043ad7d View commit details
    Browse the repository at this point in the history

  12. refactoring again

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    6871150 View commit details
    Browse the repository at this point in the history

  13. undo refactoring, gave me conflicts again...

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    136ff7a View commit details
    Browse the repository at this point in the history

  14. Merge pull request #80 from wolfgang-ch/main 

    main2main
    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    2cb5a1e View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/main' into map25

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    37b08a6 View commit details
    Browse the repository at this point in the history

  16. refactoring

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    a7b3818 View commit details
    Browse the repository at this point in the history

  17. When starting MT the first time map25 uses the wrong default provider.

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    8448ba4 View commit details
    Browse the repository at this point in the history

  18. cleanup map2525Providermanager

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    c8dfff9 View commit details
    Browse the repository at this point in the history

  19. Readme Update

    @telemaxx
    telemaxx committed May 15, 2021
    Configuration menu
    Copy the full SHA
    923169b View commit details
    Browse the repository at this point in the history