changed the icon usage. instead of scaling 512px icons in memory, there is an icon for every size. This helps with a bug in jdk8 where the Java-Image size is not used in the MenuButton but always the original size of the icon file.
@@ -115,7 +115,7 @@ public class CacheListController implements Initializable, SessionContextListene
|
||||
|
||||
private void initListMenuButton(final ResourceBundle rb) {
|
||||
addClasses(menuIcon, CACHE_LIST_ACTION_ICONS);
|
||||
menuIcon.setGraphic(new ImageView(IconManager.getIcon("/icons/iconmonstr-menu-icon.png", IconManager.IconSize.SMALL)));
|
||||
menuIcon.setGraphic(new ImageView(IconManager.getIcon("iconmonstr-menu-icon.png", IconManager.IconSize.SMALL)));
|
||||
menuIcon.getItems().addAll(createSortMenu(rb));
|
||||
}
|
||||
|
||||
|
||||
@@ -123,7 +123,7 @@ public class CacheListCell extends ListCell<Cache> {
|
||||
owner.setText(ownerText);
|
||||
|
||||
if (cache.isFound()) {
|
||||
foundIcon.setImage(IconManager.getIcon("/icons/iconmonstr-check-mark-11-icon.png", IconManager.IconSize.SMALL));
|
||||
foundIcon.setImage(IconManager.getIcon("iconmonstr-check-mark-11-icon.png", IconManager.IconSize.SMALL));
|
||||
} else {
|
||||
foundIcon.setImage(null);
|
||||
}
|
||||
|
||||
@@ -39,45 +39,45 @@ public class GeocachingIcons {
|
||||
}
|
||||
|
||||
public static Image getIcon(Cache cache, IconManager.IconSize size) {
|
||||
String iconName = "/icons/iconmonstr-map-5-icon.png";
|
||||
String iconName = "iconmonstr-map-5-icon.png";
|
||||
|
||||
switch (cache.getType()) {
|
||||
case MULTI_CACHE:
|
||||
iconName = "/icons/iconmonstr-map-6-icon.png";
|
||||
iconName = "iconmonstr-map-6-icon.png";
|
||||
break;
|
||||
|
||||
case TRADITIONAL_CACHE:
|
||||
iconName = "/icons/iconmonstr-map-5-icon.png";
|
||||
iconName = "iconmonstr-map-5-icon.png";
|
||||
break;
|
||||
|
||||
case UNKNOWN_CACHE:
|
||||
iconName = "/icons/iconmonstr-help-3-icon.png";
|
||||
iconName = "iconmonstr-help-3-icon.png";
|
||||
break;
|
||||
|
||||
case EARTH_CACHE:
|
||||
iconName = "/icons/iconmonstr-globe-4-icon.png";
|
||||
iconName = "iconmonstr-globe-4-icon.png";
|
||||
break;
|
||||
|
||||
case LETTERBOX:
|
||||
iconName = "/icons/iconmonstr-email-4-icon.png";
|
||||
iconName = "iconmonstr-email-4-icon.png";
|
||||
break;
|
||||
|
||||
case EVENT:
|
||||
case CITO_EVENT:
|
||||
case MEGA_EVENT:
|
||||
iconName = "/icons/iconmonstr-calendar-4-icon.png";
|
||||
iconName = "iconmonstr-calendar-4-icon.png";
|
||||
break;
|
||||
|
||||
case WHERIGO:
|
||||
iconName = "/icons/iconmonstr-navigation-6-icon.png";
|
||||
iconName = "iconmonstr-navigation-6-icon.png";
|
||||
break;
|
||||
|
||||
case WEBCAM_CACHE:
|
||||
iconName = "/icons/iconmonstr-webcam-3-icon.png";
|
||||
iconName = "iconmonstr-webcam-3-icon.png";
|
||||
break;
|
||||
|
||||
case VIRTUAL_CACHE:
|
||||
iconName = "/icons/iconmonstr-network-2-icon.png";
|
||||
iconName = "iconmonstr-network-2-icon.png";
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -93,7 +93,7 @@ public class GeocachingIcons {
|
||||
}
|
||||
|
||||
public static Image getMapIcon(Cache cache, IconManager.IconSize size) {
|
||||
String iconName = "/icons/iconmonstr-location-icon.png";
|
||||
String iconName = "iconmonstr-location-icon.png";
|
||||
return IconManager.getIcon(iconName, size);
|
||||
}
|
||||
|
||||
|
||||
@@ -54,15 +54,13 @@ public class IconManager {
|
||||
}
|
||||
}
|
||||
|
||||
;
|
||||
|
||||
public static Image getIcon(String iconName, IconSize size) {
|
||||
final Image image;
|
||||
String key = iconName + "_" + size;
|
||||
if (container.containsKey(key)) {
|
||||
image = container.get(key);
|
||||
} else {
|
||||
image = new Image(iconName, size.getValue(), size.getValue(), true, true);
|
||||
image = new Image("/icons/"+(int)size.getValue()+"/"+iconName, size.getValue(), size.getValue(), true, true);
|
||||
container.put(key, image);
|
||||
}
|
||||
return image;
|
||||
|
||||
BIN
src/icons/128/iconmonstr-bookmark-21-icon.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
src/icons/128/iconmonstr-bookmark-22-icon.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
BIN
src/icons/128/iconmonstr-bookmark-23-icon.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
src/icons/128/iconmonstr-bookmark-24-icon.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
src/icons/128/iconmonstr-bookmark-25-icon.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
src/icons/128/iconmonstr-bookmark-26-icon.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
src/icons/128/iconmonstr-bookmark-27-icon.png
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
src/icons/128/iconmonstr-calendar-4-icon.png
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
src/icons/128/iconmonstr-check-mark-10-icon.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
src/icons/128/iconmonstr-check-mark-11-icon.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
src/icons/128/iconmonstr-check-mark-2-icon.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
src/icons/128/iconmonstr-check-mark-3-icon.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
src/icons/128/iconmonstr-check-mark-4-icon.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
src/icons/128/iconmonstr-check-mark-5-icon.png
Normal file
|
After Width: | Height: | Size: 3.0 KiB |
BIN
src/icons/128/iconmonstr-check-mark-8-icon.png
Normal file
|
After Width: | Height: | Size: 2.0 KiB |
BIN
src/icons/128/iconmonstr-check-mark-9-icon.png
Normal file
|
After Width: | Height: | Size: 2.0 KiB |
BIN
src/icons/128/iconmonstr-check-mark-icon.png
Normal file
|
After Width: | Height: | Size: 880 B |
BIN
src/icons/128/iconmonstr-email-4-icon.png
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
src/icons/128/iconmonstr-filter-2-icon.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
src/icons/128/iconmonstr-filter-3-icon.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
src/icons/128/iconmonstr-filter-4-icon.png
Normal file
|
After Width: | Height: | Size: 2.1 KiB |
BIN
src/icons/128/iconmonstr-filter-5-icon.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
src/icons/128/iconmonstr-filter-icon.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
src/icons/128/iconmonstr-gear-10-icon.png
Normal file
|
After Width: | Height: | Size: 4.2 KiB |
BIN
src/icons/128/iconmonstr-gear-9-icon.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
src/icons/128/iconmonstr-gear-icon.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
src/icons/128/iconmonstr-globe-4-icon.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
BIN
src/icons/128/iconmonstr-help-3-icon.png
Normal file
|
After Width: | Height: | Size: 4.9 KiB |
BIN
src/icons/128/iconmonstr-inbox-5-icon.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
src/icons/128/iconmonstr-laptop-3-icon.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
src/icons/128/iconmonstr-location-10-icon.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
src/icons/128/iconmonstr-location-11-icon.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
src/icons/128/iconmonstr-location-12-icon.png
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
src/icons/128/iconmonstr-location-13-icon.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
src/icons/128/iconmonstr-location-14-icon.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
src/icons/128/iconmonstr-location-15-icon.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
BIN
src/icons/128/iconmonstr-location-16-icon.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
src/icons/128/iconmonstr-location-17-icon.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
src/icons/128/iconmonstr-location-18-icon.png
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
src/icons/128/iconmonstr-location-2-icon.png
Normal file
|
After Width: | Height: | Size: 6.3 KiB |
BIN
src/icons/128/iconmonstr-location-5-icon.png
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
src/icons/128/iconmonstr-location-6-icon.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
BIN
src/icons/128/iconmonstr-location-7-icon.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
src/icons/128/iconmonstr-location-8-icon.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
src/icons/128/iconmonstr-location-9-icon.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
src/icons/128/iconmonstr-location-icon.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
src/icons/128/iconmonstr-map-2-icon.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
src/icons/128/iconmonstr-map-3-icon.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
src/icons/128/iconmonstr-map-4-icon.png
Normal file
|
After Width: | Height: | Size: 4.8 KiB |
BIN
src/icons/128/iconmonstr-map-5-icon.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
src/icons/128/iconmonstr-map-6-icon.png
Normal file
|
After Width: | Height: | Size: 4.2 KiB |
BIN
src/icons/128/iconmonstr-map-icon.png
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
src/icons/128/iconmonstr-menu-10-icon.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
src/icons/128/iconmonstr-menu-2-icon.png
Normal file
|
After Width: | Height: | Size: 998 B |
BIN
src/icons/128/iconmonstr-menu-3-icon.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
src/icons/128/iconmonstr-menu-4-icon.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
src/icons/128/iconmonstr-menu-5-icon.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
src/icons/128/iconmonstr-menu-6-icon.png
Normal file
|
After Width: | Height: | Size: 4.2 KiB |
BIN
src/icons/128/iconmonstr-menu-7-icon.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
src/icons/128/iconmonstr-menu-8-icon.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
src/icons/128/iconmonstr-menu-9-icon.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
src/icons/128/iconmonstr-menu-icon.png
Normal file
|
After Width: | Height: | Size: 700 B |
BIN
src/icons/128/iconmonstr-navigation-10-icon.png
Normal file
|
After Width: | Height: | Size: 5.6 KiB |
BIN
src/icons/128/iconmonstr-navigation-11-icon.png
Normal file
|
After Width: | Height: | Size: 5.7 KiB |
BIN
src/icons/128/iconmonstr-navigation-12-icon.png
Normal file
|
After Width: | Height: | Size: 3.0 KiB |
BIN
src/icons/128/iconmonstr-navigation-13-icon.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
src/icons/128/iconmonstr-navigation-14-icon.png
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
src/icons/128/iconmonstr-navigation-15-icon.png
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
src/icons/128/iconmonstr-navigation-2-icon.png
Normal file
|
After Width: | Height: | Size: 3.0 KiB |
BIN
src/icons/128/iconmonstr-navigation-3-icon.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
src/icons/128/iconmonstr-navigation-4-icon.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
src/icons/128/iconmonstr-navigation-5-icon.png
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
BIN
src/icons/128/iconmonstr-navigation-6-icon.png
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
src/icons/128/iconmonstr-navigation-7-icon.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
src/icons/128/iconmonstr-navigation-8-icon.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
src/icons/128/iconmonstr-navigation-9-icon.png
Normal file
|
After Width: | Height: | Size: 4.5 KiB |
BIN
src/icons/128/iconmonstr-navigation-icon.png
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
BIN
src/icons/128/iconmonstr-network-2-icon.png
Normal file
|
After Width: | Height: | Size: 5.7 KiB |
BIN
src/icons/128/iconmonstr-note-19-icon.png
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
BIN
src/icons/128/iconmonstr-note-25-icon.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
src/icons/128/iconmonstr-note-26-icon.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
src/icons/128/iconmonstr-note-27-icon.png
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
BIN
src/icons/128/iconmonstr-note-29-icon.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
src/icons/128/iconmonstr-thumb-10-icon.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
src/icons/128/iconmonstr-thumb-11-icon.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
src/icons/128/iconmonstr-thumb-12-icon.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
src/icons/128/iconmonstr-thumb-13-icon.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
BIN
src/icons/128/iconmonstr-thumb-14-icon.png
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
BIN
src/icons/128/iconmonstr-thumb-16-icon.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
src/icons/128/iconmonstr-thumb-17-icon.png
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
BIN
src/icons/128/iconmonstr-thumb-9-icon.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
src/icons/128/iconmonstr-webcam-3-icon.png
Normal file
|
After Width: | Height: | Size: 3.9 KiB |
BIN
src/icons/16/iconmonstr-bookmark-21-icon.png
Normal file
|
After Width: | Height: | Size: 368 B |
BIN
src/icons/16/iconmonstr-bookmark-22-icon.png
Normal file
|
After Width: | Height: | Size: 372 B |
BIN
src/icons/16/iconmonstr-bookmark-23-icon.png
Normal file
|
After Width: | Height: | Size: 394 B |
BIN
src/icons/16/iconmonstr-bookmark-24-icon.png
Normal file
|
After Width: | Height: | Size: 366 B |