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.

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

main2master #61

Merged
merged 219 commits into from
Jul 28, 2020
Merged

main2master #61

merged 219 commits into from
Jul 28, 2020

Conversation

telemaxx
Copy link
Owner

No description provided.

telemaxx and others added 30 commits May 6, 2019 13:33
switching offline subthemes ok
switching online themes via mouse and keyboard ok
as preparation for s3db

building running
switching themes and subthemes also still ok
switching via hotkeys also
final ViewController mapViewport = mMap.viewport();

themes etc are still working.
next is building...
Switching between mapsources is not implemented yet, so after changing a
program restart is necessary.

S3DB layer working
building layer working
subthemes swiching working
hotkeys swiching working

next is unloading layer....
Complicate Stuff...

Many thinks are working:
S3DB Buildings for offline maps
Building for online maps
Switching between offline and offline


not fully working:
1.when subtheme is selected, buildings disapear until a new mapprovider
is selected
a little bug is open: the map jump to the position of the last
savestate.
most thinks are working.
except the buildings after subtheme switching
Map25 experimental S3DB and Multimapsfile
Merge branch 'master' into map25-experimental

Conflicts:
	bundles/net.tourbook/src/net/tourbook/map25/Map25App.java
	bundles/net.tourbook/src/net/tourbook/preferences/MapsforgeThemeStyle.java
...results in no thumbnails at all.
need more investigation.
FJBDev and others added 29 commits July 20, 2020 22:42
Discouraged access: The method 'AbstractStringToNumberConverter<Float>.convert(Object)' is not API (restriction on required library 'C:\E\e-416-MT\eclipse\plugins\org.eclipse.core.databinding_1.9.0.v20200519-1409.jar')

The old implementation contained a convert() method org.eclipse.core.databinding.conversion.StringToNumberConverter.convert(Object) but not the new implementation org.eclipse.core.databinding.conversion.text.StringToNumberConverter<T>
StringUtils.isNullOrEmpty(stringVariable)
the working directory instead of always opening the root folder
java.lang.NoSuchMethodError:
java.nio.FloatBuffer.flip()Ljava/nio/FloatBuffer;
Conflicts:
	bundles/net.tourbook/src/net/tourbook/messages.properties
20.8 Dropbox: Updating the java7-fs-dropbox library per RTDog's contributions
…bobox disappears in Linux -> unusable

Normally when a combobox has the focus, then an item can be selected with the keyboard, which works in Linux but the focus in this slideout did also not work

This is the first time that a listbox is used in MT :-)

Maybe there are other places where a combobox in a slideout is also used.

Removed listbox.select(0) -> a disabled list is not readable
@telemaxx telemaxx merged commit 19e6997 into telemaxx:master Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants