diff --git a/build.gradle b/build.gradle index e611604..95a5ed3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,18 +9,20 @@ mainClassName = 'de.geofroggerfx.ui.GeoFroggerFX' repositories { mavenCentral() + jcenter() } dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' - compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.0' - compile group: 'org.springframework', name:'spring-context', version: '4.1.5.RELEASE' - compile group: 'org.springframework', name:'spring-jdbc', version: '4.1.5.RELEASE' + compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.7' + compile group: 'org.springframework', name:'spring-context', version: '4.3.2.RELEASE' + compile group: 'org.springframework', name:'spring-jdbc', version: '4.3.2.RELEASE' compile group: 'org.codehaus.woodstox', name: 'woodstox-core-asl', version: '4.4.1' compile group: 'org.codehaus.woodstox', name: 'stax2-api', version: '4.0.0' - compile group: 'com.h2database', name: 'h2', version: '1.4.186' - compile group: 'de.jensd', name: 'fontawesomefx', version: '8.2' - compile group: 'org.controlsfx', name: 'controlsfx', version: '8.20.8' - compile group: 'com.lynden', name: 'GMapsFX', version: '1.1.1' + compile group: 'com.h2database', name: 'h2', version: '1.4.192' + compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '8.12' + compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.6.50' + compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11' + compile group: 'com.lynden', name: 'GMapsFX', version: '2.0.9' } diff --git a/src/main/java/de/geofroggerfx/ui/GeocachingIcons.java b/src/main/java/de/geofroggerfx/ui/GeocachingIcons.java index 48ccfd3..d7cdd87 100644 --- a/src/main/java/de/geofroggerfx/ui/GeocachingIcons.java +++ b/src/main/java/de/geofroggerfx/ui/GeocachingIcons.java @@ -27,10 +27,9 @@ package de.geofroggerfx.ui; import de.geofroggerfx.model.Attribute; import de.geofroggerfx.model.Type; -import de.geofroggerfx.ui.glyphs.ElusiveIcons; import de.jensd.fx.glyphs.GlyphIcon; import de.jensd.fx.glyphs.GlyphIcons; -import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcons; +import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory; import javafx.scene.text.Text; import java.util.HashMap; @@ -38,9 +37,8 @@ import java.util.Map; import static de.geofroggerfx.model.Attribute.*; import static de.geofroggerfx.model.Type.*; -import static de.geofroggerfx.ui.glyphs.GeofroggerGlyphsDude.createIcon; -import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcons.*; -import static de.jensd.fx.glyphs.weathericons.WeatherIcons.*; + +import static de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon.*; /** * @author Andreas @@ -57,143 +55,143 @@ public class GeocachingIcons { static { attributeMap = new HashMap<>(); attributeMap.put(DOGS_TRUE, PAW); - attributeMap.put(DOGS_FALSE, PAW); - // attributeMap.put(ACCESS_OR_PARKING_FEE_TRUE,); - // attributeMap.put(ACCESS_OR_PARKING_FEE_FALSE, ); + attributeMap.put(DOGS_FALSE, PAW_OFF); + attributeMap.put(ACCESS_OR_PARKING_FEE_TRUE, CASH_USD); + attributeMap.put(ACCESS_OR_PARKING_FEE_FALSE, CASH_USD); // attributeMap.put(CLIMBING_GEAR_TRUE,); // attributeMap.put(CLIMBING_GEAR_FALSE,); - attributeMap.put(BOAT_TRUE, SHIP); - attributeMap.put(BOAT_FALSE, SHIP); - // attributeMap.put(SCUBA_GEAR_TRUE(5); - // attributeMap.put(SCUBA_GEAR_FALSE(-5); - attributeMap.put(RECOMMENDED_FOR_KIDS_TRUE, CHILD); - attributeMap.put(RECOMMENDED_FOR_KIDS_FALSE, CHILD); - attributeMap.put(TAKES_LESS_THAN_AN_HOUR_TRUE, TIME_1); - attributeMap.put(TAKES_LESS_THAN_AN_HOUR_FALSE, TIME_1); + attributeMap.put(BOAT_TRUE, FERRY); + attributeMap.put(BOAT_FALSE, FERRY); + attributeMap.put(SCUBA_GEAR_TRUE, LINUX); + attributeMap.put(SCUBA_GEAR_FALSE, LINUX); + attributeMap.put(RECOMMENDED_FOR_KIDS_TRUE, ODNOKLASSNIKI); + attributeMap.put(RECOMMENDED_FOR_KIDS_FALSE, ODNOKLASSNIKI); + //attributeMap.put(TAKES_LESS_THAN_AN_HOUR_TRUE, TIME_1); + //attributeMap.put(TAKES_LESS_THAN_AN_HOUR_FALSE, TIME_1); attributeMap.put(SCENIC_VIEW_TRUE, EYE); attributeMap.put(SCENIC_VIEW_FALSE, EYE); - // attributeMap.put(SIGNIFICANT_HIKE_TRUE(9); - // attributeMap.put(SIGNIFICANT_HIKE_FALSE(-9); - // attributeMap.put(DIFFICULT_CLIMBING_TRUE(10); - // attributeMap.put(DIFFICULT_CLIMBING_FALSE(-10); - // attributeMap.put(MAY_REQUIRE_WADING_TRUE(11); - // attributeMap.put(MAY_REQUIRE_WADING_FALSE(-11); - // attributeMap.put(MAY_REQUIRE_SWIMMING_TRUE(12); - // attributeMap.put(MAY_REQUIRE_SWIMMING_FALSE(-12); - attributeMap.put(AVAILABLE_AT_ALL_TIMES_TRUE, TIME_12); - attributeMap.put(AVAILABLE_AT_ALL_TIMES_FALSE, TIME_12); - attributeMap.put(RECOMMENDED_AT_NIGHT_TRUE, MOON_ALT); - attributeMap.put(RECOMMENDED_AT_NIGHT_FALSE, MOON_ALT); - attributeMap.put(AVAILABLE_DURING_WINTER_TRUE, SNOW); - attributeMap.put(AVAILABLE_DURING_WINTER_FALSE, SNOW); - // attributeMap.put(POISON_PLANTS_TRUE(17); - // attributeMap.put(POISON_PLANTS_FALSE(-17); - // attributeMap.put(DANGEROUS_ANIMALS_TRUE(18); - // attributeMap.put(DANGEROUS_ANIMALS_FALSE(-18); - // attributeMap.put(TICKS_TRUE(19); - // attributeMap.put(TICKS_FALSE(-19); - // attributeMap.put(ABANDONED_MINES_TRUE(20); - // attributeMap.put(ABANDONED_MINES_FALSE(-20); + attributeMap.put(SIGNIFICANT_HIKE_TRUE, TERRAIN); + attributeMap.put(SIGNIFICANT_HIKE_FALSE, TERRAIN); + attributeMap.put(DIFFICULT_CLIMBING_TRUE, HUMAN_HANDSUP); + attributeMap.put(DIFFICULT_CLIMBING_FALSE, HUMAN_HANDSUP); + attributeMap.put(MAY_REQUIRE_WADING_TRUE, POOL); + attributeMap.put(MAY_REQUIRE_WADING_FALSE, POOL); + attributeMap.put(MAY_REQUIRE_SWIMMING_TRUE, SWIM); + attributeMap.put(MAY_REQUIRE_SWIMMING_FALSE, SWIM); + attributeMap.put(AVAILABLE_AT_ALL_TIMES_TRUE, THEME_LIGHT_DARK); + attributeMap.put(AVAILABLE_AT_ALL_TIMES_FALSE, THEME_LIGHT_DARK); + attributeMap.put(RECOMMENDED_AT_NIGHT_TRUE, WEATHER_NIGHT); + attributeMap.put(RECOMMENDED_AT_NIGHT_FALSE, WEATHER_NIGHT); + attributeMap.put(AVAILABLE_DURING_WINTER_TRUE, WEATHER_SNOWY); + attributeMap.put(AVAILABLE_DURING_WINTER_FALSE, WEATHER_SNOWY); + attributeMap.put(POISON_PLANTS_TRUE, FLASK); + attributeMap.put(POISON_PLANTS_FALSE, FLASK); + attributeMap.put(DANGEROUS_ANIMALS_TRUE, GHOST); + attributeMap.put(DANGEROUS_ANIMALS_FALSE, GHOST); + attributeMap.put(TICKS_TRUE, BUG); + attributeMap.put(TICKS_FALSE, BUG); + //attributeMap.put(ABANDONED_MINES_TRUE, TOWER_FIRE); + //attributeMap.put(ABANDONED_MINES_FALSE, TOWER_FIRE); attributeMap.put(CLIFF_FALLING_ROCKS_TRUE, METEOR); attributeMap.put(CLIFF_FALLING_ROCKS_FALSE, METEOR); - // attributeMap.put(HUNTING_TRUE(22); - // attributeMap.put(HUNTING_FALSE(-22); - // attributeMap.put(DANGEROUS_AREA_TRUE(23); - // attributeMap.put(DANGEROUS_AREA_FALSE(-23); - attributeMap.put(WHEELCHAIR_ACCESSIBLE_TRUE, WHEELCHAIR); - attributeMap.put(WHEELCHAIR_ACCESSIBLE_FALSE, WHEELCHAIR); - // attributeMap.put(PARKING_AVAILABLE_TRUE(25); - // attributeMap.put(PARKING_AVAILABLE_FALSE(-25); + attributeMap.put(HUNTING_TRUE, TARGET); + attributeMap.put(HUNTING_FALSE, TARGET); + attributeMap.put(DANGEROUS_AREA_TRUE, ALERT); + attributeMap.put(DANGEROUS_AREA_FALSE, ALERT); + attributeMap.put(WHEELCHAIR_ACCESSIBLE_TRUE, WHEELCHAIR_ACCESSIBILITY); + attributeMap.put(WHEELCHAIR_ACCESSIBLE_FALSE, WHEELCHAIR_ACCESSIBILITY); + attributeMap.put(PARKING_AVAILABLE_TRUE, PARKING); + attributeMap.put(PARKING_AVAILABLE_FALSE, PARKING); attributeMap.put(PUBLIC_TRANSPORTATION_TRUE, BUS); attributeMap.put(PUBLIC_TRANSPORTATION_FALSE, BUS); - // attributeMap.put(DRINKING_WATER_NEARBY_TRUE(27); - // attributeMap.put(DRINKING_WATER_NEARBY_FALSE(-27); - // attributeMap.put(PUBLIC_RESTROOMS_NEARBY_TRUE(28); - // attributeMap.put(PUBLIC_RESTROOMS_NEARBY_FALSE(-28); + attributeMap.put(DRINKING_WATER_NEARBY_TRUE, BEER); + attributeMap.put(DRINKING_WATER_NEARBY_FALSE, BEER); + attributeMap.put(PUBLIC_RESTROOMS_NEARBY_TRUE, HUMAN_MALE_FEMALE); + attributeMap.put(PUBLIC_RESTROOMS_NEARBY_FALSE, HUMAN_MALE_FEMALE); attributeMap.put(TELEPHONE_NEARBY_TRUE, PHONE); attributeMap.put(TELEPHONE_NEARBY_FALSE, PHONE); - // attributeMap.put(PICNIC_TABLES_NEARBY_TRUE(30); - // attributeMap.put(PICNIC_TABLES_NEARBY_FALSE(-30); - // attributeMap.put(CAMPING_AVAILABLE_TRUE(31); - // attributeMap.put(CAMPING_AVAILABLE_FALSE(-31); - attributeMap.put(BICYCLES_TRUE, BICYCLE); - attributeMap.put(BICYCLES_FALSE, BICYCLE); - attributeMap.put(MOTORCYCLES_TRUE, MOTORCYCLE); - attributeMap.put(MOTORCYCLES_FALSE, MOTORCYCLE); + attributeMap.put(PICNIC_TABLES_NEARBY_TRUE, FORMAT_STRIKETHROUGH); + attributeMap.put(PICNIC_TABLES_NEARBY_FALSE, FORMAT_STRIKETHROUGH); + attributeMap.put(CAMPING_AVAILABLE_TRUE, TENT); + attributeMap.put(CAMPING_AVAILABLE_FALSE, TENT); + attributeMap.put(BICYCLES_TRUE, BIKE); + attributeMap.put(BICYCLES_FALSE, BIKE); + attributeMap.put(MOTORCYCLES_TRUE, MOTORBIKE); + attributeMap.put(MOTORCYCLES_FALSE, MOTORBIKE); // attributeMap.put(QUADS_TRUE(34); // attributeMap.put(QUADS_FALSE(-34); - // attributeMap.put(OFF_ROAD_VEHICLES_TRUE(35); - // attributeMap.put(OFF_ROAD_VEHICLES_FALSE(-35); + attributeMap.put(OFF_ROAD_VEHICLES_TRUE, JEEPNEY); + attributeMap.put(OFF_ROAD_VEHICLES_FALSE, JEEPNEY); // attributeMap.put(SNOWMOBILES_TRUE(36); // attributeMap.put(SNOWMOBILES_FALSE(-36); // attributeMap.put(HORSES_TRUE(37); // attributeMap.put(HORSES_FALSE(-37); - // attributeMap.put(CAMPFIRES_TRUE(38); - // attributeMap.put(CAMPFIRES_FALSE(-38); - // attributeMap.put(THORNS_TRUE(39); - // attributeMap.put(THORNS_FALSE(-39); - // attributeMap.put(STEALTH_REQUIRED_TRUE(40); - // attributeMap.put(STEALTH_REQUIRED_FALSE(-40); - // attributeMap.put(STROLLER_ACCESSIBLE_TRUE(41); - // attributeMap.put(STROLLER_ACCESSIBLE_FALSE(-41); - // attributeMap.put(WATCH_FOR_LIVESTOCK_TRUE(43); - // attributeMap.put(WATCH_FOR_LIVESTOCK_FALSE(-43); - // attributeMap.put(NEEDS_MAINTENANCE_TRUE(42); - // attributeMap.put(NEEDS_MAINTENANCE_FALSE(-42); - // attributeMap.put(FLASHLIGHT_REQUIRED_TRUE(44); - // attributeMap.put(FLASHLIGHT_REQUIRED_FALSE(-44); + attributeMap.put(CAMPFIRES_TRUE, FIRE); + attributeMap.put(CAMPFIRES_FALSE, FIRE); + attributeMap.put(THORNS_TRUE, BARLEY); + attributeMap.put(THORNS_FALSE, BARLEY); + attributeMap.put(STEALTH_REQUIRED_TRUE, INCOGNITO); + attributeMap.put(STEALTH_REQUIRED_FALSE, INCOGNITO); + attributeMap.put(STROLLER_ACCESSIBLE_TRUE, BABY); + attributeMap.put(STROLLER_ACCESSIBLE_FALSE, BABY); + attributeMap.put(WATCH_FOR_LIVESTOCK_TRUE, COW); + attributeMap.put(WATCH_FOR_LIVESTOCK_FALSE, COW); + attributeMap.put(NEEDS_MAINTENANCE_TRUE, WRENCH); + attributeMap.put(NEEDS_MAINTENANCE_FALSE, WRENCH); + attributeMap.put(FLASHLIGHT_REQUIRED_TRUE, FLASHLIGHT); + attributeMap.put(FLASHLIGHT_REQUIRED_FALSE, FLASHLIGHT); // attributeMap.put(LOST_AND_FOUND_TOUR_TRUE(45); // attributeMap.put(LOST_AND_FOUND_TOUR_FALSE(-45); - // attributeMap.put(TRUCK_DRIVER_RV_TRUE(46); - // attributeMap.put(TRUCK_DRIVER_RV_FALSE(-46); - // attributeMap.put(FIELD_PUZZLE_TRUE(47); - // attributeMap.put(FIELD_PUZZLE_FALSE(-47); - // attributeMap.put(UV_LIGHT_REQUIRED_TRUE(48); - // attributeMap.put(UV_LIGHT_REQUIRED_FALSE(-48); + attributeMap.put(TRUCK_DRIVER_RV_TRUE, TRUCK); + attributeMap.put(TRUCK_DRIVER_RV_FALSE, TRUCK); + attributeMap.put(FIELD_PUZZLE_TRUE, PUZZLE); + attributeMap.put(FIELD_PUZZLE_FALSE, PUZZLE); + attributeMap.put(UV_LIGHT_REQUIRED_TRUE, SPOTLIGHT_BEAM); + attributeMap.put(UV_LIGHT_REQUIRED_FALSE, SPOTLIGHT_BEAM); // attributeMap.put(SNOWSHOES_TRUE(49); // attributeMap.put(SNOWSHOES_FALSE(-49); // attributeMap.put(CROSS_COUNTRY_SKIS_TRUE(50); // attributeMap.put(CROSS_COUNTRY_SKIS_FALSE(-50); - // attributeMap.put(SPECIAL_TOOL_REQUIRED_TRUE(51); - // attributeMap.put(SPECIAL_TOOL_REQUIRED_FALSE(-51); - attributeMap.put(NIGHT_CACHE_TRUE, MOON_WANING_CRESCENT_2); - attributeMap.put(NIGHT_CACHE_FALSE, MOON_WANING_CRESCENT_2); - // attributeMap.put(PARK_AND_GRAB_TRUE(53); - // attributeMap.put(PARK_AND_GRAB_FALSE(-53); - // attributeMap.put(ABANDONED_STRUCTURE_TRUE(54); - // attributeMap.put(ABANDONED_STRUCTURE_FALSE(-54); - // attributeMap.put(SHORT_HIKE_LESS_THAN_1KM_TRUE(55); - // attributeMap.put(SHORT_HIKE_LESS_THAN_1KM_FALSE(-55); - // attributeMap.put(MEDIUM_HIKE_1KM_10KM_TRUE(56); - // attributeMap.put(MEDIUM_HIKE_1KM_10KM_FALSE(-56); - // attributeMap.put(LONG_HIKE_10KM_TRUE(57); - // attributeMap.put(LONG_HIKE_10KM_FALSE(-57); - // attributeMap.put(FUEL_NEARBY_TRUE(58); - // attributeMap.put(FUEL_NEARBY_FALSE(-58); - // attributeMap.put(FOOD_NEARBY_TRUE(59); - // attributeMap.put(FOOD_NEARBY_FALSE(-59); - // attributeMap.put(WIRELESS_BEACON_TRUE(60); - // attributeMap.put(WIRELESS_BEACON_FALSE(-60); - // attributeMap.put(PARTNERSHIP_CACHE_TRUE(61); - // attributeMap.put(PARTNERSHIP_CACHE_FALSE(-61); + attributeMap.put(SPECIAL_TOOL_REQUIRED_TRUE, SCREWDRIVER); + attributeMap.put(SPECIAL_TOOL_REQUIRED_FALSE, SCREWDRIVER); + attributeMap.put(NIGHT_CACHE_TRUE, BRIGHTNESS_3); + attributeMap.put(NIGHT_CACHE_FALSE, BRIGHTNESS_3); + attributeMap.put(PARK_AND_GRAB_TRUE, TIMER); + attributeMap.put(PARK_AND_GRAB_FALSE, TIMER); + attributeMap.put(ABANDONED_STRUCTURE_TRUE, FACTORY); + attributeMap.put(ABANDONED_STRUCTURE_FALSE, FACTORY); + attributeMap.put(SHORT_HIKE_LESS_THAN_1KM_TRUE, NUMERIC_1_BOX); + attributeMap.put(SHORT_HIKE_LESS_THAN_1KM_FALSE, NUMERIC_1_BOX_OUTLINE); + attributeMap.put(MEDIUM_HIKE_1KM_10KM_TRUE, NUMERIC_5_BOX); + attributeMap.put(MEDIUM_HIKE_1KM_10KM_FALSE, NUMERIC_5_BOX_OUTLINE); + attributeMap.put(LONG_HIKE_10KM_TRUE, NUMERIC_9_PLUS_BOX); + attributeMap.put(LONG_HIKE_10KM_FALSE, NUMERIC_9_PLUS_BOX_OUTLINE); + attributeMap.put(FUEL_NEARBY_TRUE, GAS_STATION); + attributeMap.put(FUEL_NEARBY_FALSE, GAS_STATION); + attributeMap.put(FOOD_NEARBY_TRUE, FOOD); + attributeMap.put(FOOD_NEARBY_FALSE, FOOD); + attributeMap.put(WIRELESS_BEACON_TRUE, ROUTER_WIRELESS); + attributeMap.put(WIRELESS_BEACON_FALSE, ROUTER_WIRELESS); + attributeMap.put(PARTNERSHIP_CACHE_TRUE, THUMB_UP); + attributeMap.put(PARTNERSHIP_CACHE_FALSE, THUMB_UP); attributeMap.put(SEASONAL_ACCESS_TRUE, THERMOMETER); attributeMap.put(SEASONAL_ACCESS_FALSE, THERMOMETER); - // attributeMap.put(TOURIST_FRIENDLY_TRUE(63); - // attributeMap.put(TOURIST_FRIENDLY_FALSE(-63); - // attributeMap.put(TREE_CLIMBING_TRUE(64); - // attributeMap.put(TREE_CLIMBING_FALSE(-64); + attributeMap.put(TOURIST_FRIENDLY_TRUE, WALLET_TRAVEL); + attributeMap.put(TOURIST_FRIENDLY_FALSE, WALLET_TRAVEL); + attributeMap.put(TREE_CLIMBING_TRUE, TREE); + attributeMap.put(TREE_CLIMBING_FALSE, TREE); // attributeMap.put(FRONT_YARD_PRIVATE_RESIDENCE_TRUE(65); // attributeMap.put(FRONT_YARD_PRIVATE_RESIDENCE_FALSE(-65); - // attributeMap.put(TEAMWORK_REQUIRED_TRUE(66); - // attributeMap.put(TEAMWORK_REQUIRED_FALSE(-66); - // attributeMap.put(GEOTOUR_TRUE(67); - // attributeMap.put(GEOTOUR_FALSE(-67); + attributeMap.put(TEAMWORK_REQUIRED_TRUE, ACCOUNT_MULTIPLE); + attributeMap.put(TEAMWORK_REQUIRED_FALSE, ACCOUNT_MULTIPLE); + attributeMap.put(GEOTOUR_TRUE, ROUTES); + attributeMap.put(GEOTOUR_FALSE, ROUTES); } public static GlyphIcons getIcon(Attribute attribute) { GlyphIcons iconName = attributeMap.get(attribute); if (iconName == null) { - iconName = FontAwesomeIcons.SQUARE_ALT; + iconName = SQUARE_INC; } return iconName; } @@ -206,11 +204,11 @@ public class GeocachingIcons { static { typeMap = new HashMap<>(); - typeMap.put(MULTI_CACHE, TAGS); + typeMap.put(MULTI_CACHE, TAG_MULTIPLE); typeMap.put(TRADITIONAL_CACHE, TAG); - typeMap.put(UNKNOWN_CACHE, QUESTION); - typeMap.put(EARTH_CACHE, GLOBE); - typeMap.put(LETTERBOX, ENVELOPE); + typeMap.put(UNKNOWN_CACHE, COMMENT_QUESTION_OUTLINE); + typeMap.put(EARTH_CACHE, EARTH); + typeMap.put(LETTERBOX, EMAIL); typeMap.put(EVENT, CALENDAR); typeMap.put(CITO_EVENT, CALENDAR); typeMap.put(MEGA_EVENT, CALENDAR); @@ -220,12 +218,9 @@ public class GeocachingIcons { } public static Text getIconAsText(Type type, String iconSize) { - return createIcon(getIcon(type), iconSize); + return MaterialDesignIconFactory.get().createIcon(getIcon(type), iconSize); } - public static Text getIconAsText(Type type) { - return getIconAsText(type, GlyphIcon.DEFAULT_ICON_SIZE); - } public static String getIconAsString(Type type) { return getIcon(type).characterToString(); @@ -234,7 +229,7 @@ public class GeocachingIcons { public static GlyphIcons getIcon(Type type) { GlyphIcons iconName = typeMap.get(type); if (iconName == null) { - iconName = FontAwesomeIcons.BLANK; + iconName = SQUARE_INC; } return iconName; } @@ -245,7 +240,7 @@ public class GeocachingIcons { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// public static Text getStars(String value) { - return getStarsAsText(value, GlyphIcon.DEFAULT_ICON_SIZE); + return getStarsAsText(value, GlyphIcon.DEFAULT_FONT_SIZE); } public static String getStarsAsString(String value) { @@ -308,14 +303,14 @@ public class GeocachingIcons { break; default: - stringBuffer.append(FontAwesomeIcons.BLANK.characterToString()); + stringBuffer.append(' '); System.out.println(value); } return stringBuffer.toString(); } public static Text getStarsAsText(String value, String iconSize) { - Text text = createIcon(FontAwesomeIcons.BLANK, iconSize); + Text text = MaterialDesignIconFactory.get().createIcon(STAR, iconSize); text.setText(value); return text; } diff --git a/src/main/java/de/geofroggerfx/ui/details/DetailsController.java b/src/main/java/de/geofroggerfx/ui/details/DetailsController.java index faa0dfd..fa38dc1 100644 --- a/src/main/java/de/geofroggerfx/ui/details/DetailsController.java +++ b/src/main/java/de/geofroggerfx/ui/details/DetailsController.java @@ -34,8 +34,10 @@ import de.geofroggerfx.model.Attribute; import de.geofroggerfx.model.Cache; import de.geofroggerfx.model.Log; import de.geofroggerfx.ui.FXMLController; -import de.geofroggerfx.ui.glyphs.GeofroggerGlyphsDude; -import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcons; +import de.geofroggerfx.ui.GeocachingIcons; +import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; +import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView; +import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory; import javafx.fxml.FXML; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -54,9 +56,8 @@ import java.net.URL; import java.util.ResourceBundle; import static de.geofroggerfx.application.SessionContext.CURRENT_CACHE; -import static de.geofroggerfx.ui.GeocachingIcons.getIcon; import static de.geofroggerfx.ui.GeocachingIcons.getStarsAsString; -import static de.jensd.fx.glyphs.GlyphsDude.createIcon; +import static de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon.CHECK; /** * Created by Andreas on 09.03.2015. @@ -149,7 +150,7 @@ public class DetailsController extends FXMLController { } private void setLogLinkButton() { - Button logLink = GeofroggerGlyphsDude.createIconButton(FontAwesomeIcons.EXTERNAL_LINK); + Button logLink = MaterialDesignIconFactory.get().createIconButton(MaterialDesignIcon.LINK_VARIANT); logLink.setStyle("-fx-background-color: transparent;"); logButtonPane.getChildren().add(logLink); @@ -178,7 +179,7 @@ public class DetailsController extends FXMLController { BorderPane borderPane = new BorderPane(); - Text icon = GeofroggerGlyphsDude.createIcon(FontAwesomeIcons.CHECK); + Text icon = new MaterialDesignIconView(CHECK); Label date = new Label(log.getDate().toString()); date.setStyle("-fx-font-weight: bold; -fx-font-size: 1.2em;"); Label name = new Label(log.getFinder().getName()); @@ -225,7 +226,7 @@ public class DetailsController extends FXMLController { popOver.setContentNode(anchorPane); popOver.setDetached(true); - popOver.setDetachedTitle("Log Entries"); + //popOver.setDetachedTitle("Log Entries"); popOver.show(logLink.getScene().getWindow()); } @@ -251,7 +252,7 @@ public class DetailsController extends FXMLController { attributeList.getChildren().clear(); for (Attribute attribute: cache.getAttributes()) { - attributeList.getChildren().add(createIcon(getIcon(attribute), "1.6em")); + attributeList.getChildren().add(MaterialDesignIconFactory.get().createIcon(GeocachingIcons.getIcon(attribute))); } logList.getChildren().clear(); @@ -276,7 +277,7 @@ public class DetailsController extends FXMLController { } private void setLogIcon(int row) { - logList.add(GeofroggerGlyphsDude.createIcon(FontAwesomeIcons.CHECK), 0, row); + logList.add(MaterialDesignIconFactory.get().createIcon(CHECK), 0, row); } private void setLogText(int row, Log log) { diff --git a/src/main/java/de/geofroggerfx/ui/glyphs/ElusiveIcon.java b/src/main/java/de/geofroggerfx/ui/glyphs/ElusiveIcon.java deleted file mode 100644 index 85ca19a..0000000 --- a/src/main/java/de/geofroggerfx/ui/glyphs/ElusiveIcon.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) Andreas Billmann - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -package de.geofroggerfx.ui.glyphs; - -import de.jensd.fx.glyphs.GlyphIcon; -import javafx.scene.text.Font; - -public class ElusiveIcon extends GlyphIcon { - - public final static String TTF_PATH = "/fonts/elusive/Elusive-Icons.ttf"; - public final static String FONT_FAMILY = "\'Elusive-Icons\'"; - - static { - Font.loadFont(ElusiveIcon.class.getResource(TTF_PATH).toExternalForm(), 10.0); - } - - @Override - public ElusiveIcons getDefaultGlyph() { - return ElusiveIcons.USER; - } - -} \ No newline at end of file diff --git a/src/main/java/de/geofroggerfx/ui/glyphs/ElusiveIcons.java b/src/main/java/de/geofroggerfx/ui/glyphs/ElusiveIcons.java deleted file mode 100644 index 3ab636b..0000000 --- a/src/main/java/de/geofroggerfx/ui/glyphs/ElusiveIcons.java +++ /dev/null @@ -1,359 +0,0 @@ -/* - * Copyright (c) Andreas Billmann - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -package de.geofroggerfx.ui.glyphs; - -import de.jensd.fx.glyphs.GlyphIcons; - -public enum ElusiveIcons implements GlyphIcons { - - ZOOM_OUT('\uE600'), - ZOOM_IN('\uE601'), - YOUTUBE('\uE602'), - WRENCH_ALT('\uE603'), - WRENCH('\uE604'), - WORDPRESS('\uE605'), - WHEELCHAIR('\uE606'), - WEBSITE_ALT('\uE607'), - WEBSITE('\uE608'), - WARNING_SIGN('\uE609'), - W3C('\uE60A'), - VOLUME_UP('\uE60B'), - VOLUME_OFF('\uE60C'), - VOLUME_DOWN('\uE60D'), - VKONTAKTE('\uE60E'), - VIMEO('\uE60F'), - VIEW_MODE('\uE610'), - VIDEO_CHAT('\uE611'), - VIDEO_ALT('\uE612'), - VIDEO('\uE613'), - VIADEO('\uE614'), - USER('\uE615'), - USD('\uE616'), - UPLOAD('\uE617'), - UNLOCK_ALT('\uE618'), - UNLOCK('\uE619'), - UNIVERSAL_ACCESS('\uE61A'), - TWITTER('\uE61B'), - TUMBLR('\uE61C'), - TRASH_ALT('\uE61D'), - TRASH('\uE61E'), - TORSO('\uE61F'), - TINT('\uE620'), - TIME_ALT('\uE621'), - TIME('\uE622'), - THUMBS_UP('\uE623'), - THUMBS_DOWN('\uE624'), - TH_LIST('\uE625'), - TH_LARGE('\uE626'), - TH('\uE627'), - TEXT_WIDTH('\uE628'), - TEXT_HEIGHT('\uE629'), - TASKS('\uE62A'), - TAGS('\uE62B'), - TAG('\uE62C'), - STUMBLEUPON('\uE62D'), - STOP_ALT('\uE62E'), - STOP('\uE62F'), - STEP_FORWARD('\uE630'), - STEP_BACKWARD('\uE631'), - STAR_EMPTY('\uE632'), - STAR_ALT('\uE633'), - STAR('\uE634'), - STACKOVERFLOW('\uE635'), - SPOTIFY('\uE636'), - SPEAKER('\uE637'), - SOUNDCLOUD('\uE638'), - SMILEY_ALT('\uE639'), - SMILEY('\uE63A'), - SLIDESHARE('\uE63B'), - SKYPE('\uE63C'), - SIGNAL('\uE63D'), - SHOPPING_CART_SIGN('\uE63E'), - SHOPPING_CART('\uE63F'), - SHARE_ALT('\uE640'), - SHARE('\uE641'), - SEARCH_ALT('\uE642'), - SEARCH('\uE643'), - SCREENSHOT('\uE644'), - SCREEN_ALT('\uE645'), - SCREEN('\uE646'), - SCISSORS('\uE647'), - RSS('\uE648'), - ROAD('\uE649'), - REVERSE_ALT('\uE64A'), - RETWEET('\uE64B'), - RETURN_KEY('\uE64C'), - RESIZE_VERTICAL('\uE64D'), - RESIZE_SMALL('\uE64E'), - RESIZE_HORIZONTAL('\uE64F'), - RESIZE_FULL('\uE650'), - REPEAT_ALT('\uE651'), - REPEAT('\uE652'), - REMOVE_SIGN('\uE653'), - REMOVE_CIRCLE('\uE654'), - REMOVE('\uE655'), - REFRESH('\uE656'), - REDDIT('\uE657'), - RECORD('\uE658'), - RANDOM('\uE659'), - QUOTES_ALT('\uE65A'), - QUOTES('\uE65B'), - QUESTION_SIGN('\uE65C'), - QUESTION('\uE65D'), - QRCODE('\uE65E'), - PUZZLE('\uE65F'), - PRINT('\uE660'), - PODCAST('\uE661'), - PLUS_SIGN('\uE662'), - PLUS('\uE663'), - PLAY_CIRCLE('\uE664'), - PLAY_ALT('\uE665'), - PLAY('\uE666'), - PLANE('\uE667'), - PINTEREST('\uE668'), - PICTURE('\uE669'), - PICASA('\uE66A'), - PHOTO_ALT('\uE66B'), - PHOTO('\uE66C'), - PHONE_ALT('\uE66D'), - PHONE('\uE66E'), - PERSON('\uE66F'), - PENCIL_ALT('\uE670'), - PENCIL('\uE671'), - PAUSE_ALT('\uE672'), - PAUSE('\uE673'), - PATH('\uE674'), - PAPER_CLIP_ALT('\uE675'), - PAPER_CLIP('\uE676'), - OPENSOURCE('\uE677'), - OK_SIGN('\uE678'), - OK_CIRCLE('\uE679'), - OK('\uE67A'), - OFF('\uE67B'), - NETWORK('\uE67C'), - MYSPACE('\uE67D'), - MUSIC('\uE67E'), - MOVE('\uE67F'), - MINUS_SIGN('\uE680'), - MINUS('\uE681'), - MIC_ALT('\uE682'), - MIC('\uE683'), - MAP_MARKER_ALT('\uE684'), - MAP_MARKER('\uE685'), - MALE('\uE686'), - MAGNET('\uE687'), - MAGIC('\uE688'), - LOCK_ALT('\uE689'), - LOCK('\uE68A'), - LIVEJOURNAL('\uE68B'), - LIST_ALT('\uE68C'), - LIST('\uE68D'), - LINKEDIN('\uE68E'), - LINK('\uE68F'), - LINES('\uE690'), - LEAF('\uE691'), - LASTFM('\uE692'), - LAPTOP_ALT('\uE693'), - LAPTOP('\uE694'), - KEY('\uE695'), - ITALIC('\uE696'), - IPHONE_HOME('\uE697'), - INSTAGRAM('\uE698'), - INFO_SIGN('\uE699'), - INDENT_RIGHT('\uE69A'), - INDENT_LEFT('\uE69B'), - INBOX_BOX('\uE69C'), - INBOX_ALT('\uE69D'), - INBOX('\uE69E'), - IDEA_ALT('\uE69F'), - IDEA('\uE6A0'), - HOURGLASS('\uE6A1'), - HOME_ALT('\uE6A2'), - HOME('\uE6A3'), - HEART_EMPTY('\uE6A4'), - HEART_ALT('\uE6A5'), - HEART('\uE6A6'), - HEARING_IMPAIRED('\uE6A7'), - HEADPHONES('\uE6A8'), - HDD('\uE6A9'), - HAND_UP('\uE6AA'), - HAND_RIGHT('\uE6AB'), - HAND_LEFT('\uE6AC'), - HAND_DOWN('\uE6AD'), - GUIDEDOG('\uE6AE'), - GROUP_ALT('\uE6AF'), - GROUP('\uE6B0'), - GRAPH_ALT('\uE6B1'), - GRAPH('\uE6B2'), - GOOGLEPLUS('\uE6B3'), - GLOBE_ALT('\uE6B4'), - GLOBE('\uE6B5'), - GLASSES('\uE6B6'), - GLASS('\uE6B7'), - GITHUB_TEXT('\uE6B8'), - GITHUB('\uE6B9'), - GIFT('\uE6BA'), - GBP('\uE6BB'), - FULLSCREEN('\uE6BC'), - FRIENDFEED_RECT('\uE6BD'), - FRIENDFEED('\uE6BE'), - FOURSQUARE('\uE6BF'), - FORWARD_ALT('\uE6C0'), - FORWARD('\uE6C1'), - FORK('\uE6C2'), - FONTSIZE('\uE6C3'), - FONT('\uE6C4'), - FOLDER_SIGN('\uE6C5'), - FOLDER_OPEN('\uE6C6'), - FOLDER_CLOSE('\uE6C7'), - FOLDER('\uE6C8'), - FLICKR('\uE6C9'), - FLAG_ALT('\uE6CA'), - FLAG('\uE6CB'), - FIRE('\uE6CC'), - FILTER('\uE6CD'), - FILM('\uE6CE'), - FILE_NEW_ALT('\uE6CF'), - FILE_NEW('\uE6D0'), - FILE_EDIT_ALT('\uE6D1'), - FILE_EDIT('\uE6D2'), - FILE_ALT('\uE6D3'), - FILE('\uE6D4'), - FEMALE('\uE6D5'), - FAST_FORWARD('\uE6D6'), - FAST_BACKWARD('\uE6D7'), - FACETIME_VIDEO('\uE6D8'), - FACEBOOK('\uE6D9'), - EYE_OPEN('\uE6DA'), - EYE_CLOSE('\uE6DB'), - EXCLAMATION_SIGN('\uE6DC'), - EUR('\uE6DD'), - ERROR_ALT('\uE6DE'), - ERROR('\uE6DF'), - ENVELOPE_ALT('\uE6E0'), - ENVELOPE('\uE6E1'), - EJECT('\uE6E2'), - EDIT('\uE6E3'), - DRIBBBLE('\uE6E4'), - DOWNLOAD_ALT('\uE6E5'), - DOWNLOAD('\uE6E6'), - DIGG('\uE6E7'), - DEVIANTART('\uE6E8'), - DELICIOUS('\uE6E9'), - DASHBOARD('\uE6EA'), - CSS('\uE6EB'), - CREDIT_CARD('\uE6EC'), - COMPASS_ALT('\uE6ED'), - COMPASS('\uE6EE'), - COMMENT_ALT('\uE6EF'), - COMMENT('\uE6F0'), - COGS('\uE6F1'), - COG_ALT('\uE6F2'), - COG('\uE6F3'), - CLOUD_ALT('\uE6F4'), - CLOUD('\uE6F5'), - CIRCLE_ARROW_UP('\uE6F6'), - CIRCLE_ARROW_RIGHT('\uE6F7'), - CIRCLE_ARROW_LEFT('\uE6F8'), - CIRCLE_ARROW_DOWN('\uE6F9'), - CHILD('\uE6FA'), - CHEVRON_UP('\uE6FB'), - CHEVRON_RIGHT('\uE6FC'), - CHEVRON_LEFT('\uE6FD'), - CHEVRON_DOWN('\uE6FE'), - CHECK_EMPTY('\uE6FF'), - CHECK('\uE700'), - CERTIFICATE('\uE701'), - CC('\uE702'), - CARET_UP('\uE703'), - CARET_RIGHT('\uE704'), - CARET_LEFT('\uE705'), - CARET_DOWN('\uE706'), - CAR('\uE707'), - CAMERA('\uE708'), - CALENDAR_SIGN('\uE709'), - CALENDAR('\uE70A'), - BULLHORN('\uE70B'), - BULB('\uE70C'), - BRUSH('\uE70D'), - BROOM('\uE70E'), - BRIEFCASE('\uE70F'), - BRAILLE('\uE710'), - BOOKMARK_EMPTY('\uE711'), - BOOKMARK('\uE712'), - BOOK('\uE713'), - BOLD('\uE714'), - BLOGGER('\uE715'), - BLIND('\uE716'), - BELL('\uE717'), - BEHANCE('\uE718'), - BARCODE('\uE719'), - BAN_CIRCLE('\uE71A'), - BACKWARD('\uE71B'), - ASL('\uE71C'), - ARROW_UP('\uE71D'), - ARROW_RIGHT('\uE71E'), - ARROW_LEFT('\uE71F'), - ARROW_DOWN('\uE720'), - ALIGN_RIGHT('\uE721'), - ALIGN_LEFT('\uE722'), - ALIGN_JUSTIFY('\uE723'), - ALIGN_CENTER('\uE724'), - ADULT('\uE725'), - ADJUST_ALT('\uE726'), - ADJUST('\uE727'), - ADDRESS_BOOK_ALT('\uE728'), - ADDRESS_BOOK('\uE729'), - ASTERISK('\uE72A'); - - private final char character; - - private ElusiveIcons(char character) { - this.character = character; - } - - - @Override - public char getChar() { - return character; - } - - @Override - public String unicodeToString() { - return String.format("\\u%04x", (int) character); - } - - @Override - public String characterToString() { - return Character.toString(character); - } - - @Override - public String getFontFamily() { - return ElusiveIcon.FONT_FAMILY; - } - -} diff --git a/src/main/java/de/geofroggerfx/ui/glyphs/GeofroggerGlyphsDude.java b/src/main/java/de/geofroggerfx/ui/glyphs/GeofroggerGlyphsDude.java deleted file mode 100644 index 2c645bc..0000000 --- a/src/main/java/de/geofroggerfx/ui/glyphs/GeofroggerGlyphsDude.java +++ /dev/null @@ -1,11 +0,0 @@ -package de.geofroggerfx.ui.glyphs; - -import de.jensd.fx.glyphs.GlyphsDude; -import javafx.scene.text.Font; - -/** - * Created by Andreas on 23.03.2015. - */ -public class GeofroggerGlyphsDude extends GlyphsDude { - -} diff --git a/src/main/java/de/geofroggerfx/ui/list/CacheListCell.java b/src/main/java/de/geofroggerfx/ui/list/CacheListCell.java index 63d9763..88041fc 100644 --- a/src/main/java/de/geofroggerfx/ui/list/CacheListCell.java +++ b/src/main/java/de/geofroggerfx/ui/list/CacheListCell.java @@ -27,8 +27,8 @@ package de.geofroggerfx.ui.list; import de.geofroggerfx.model.CacheListEntry; import de.geofroggerfx.ui.GeocachingIcons; -import de.jensd.fx.glyphs.GlyphsDude; -import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcons; +import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; +import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory; import javafx.geometry.Insets; import javafx.scene.control.Label; import javafx.scene.control.ListCell; @@ -37,6 +37,7 @@ import javafx.scene.layout.GridPane; import javafx.scene.layout.Priority; import javafx.scene.text.Text; +import static de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon.CHECKBOX_BLANK_OUTLINE; /** * Multi-Column-Row list cell to shows the most important data in a list. @@ -47,11 +48,11 @@ public class CacheListCell extends ListCell { private static final String YELLOW = ";-fx-fill: linear-gradient(#e8e474 0%, #edcf59 70%, #bfba26 85%);"; private static final String GRAY = ";-fx-fill: linear-gradient(#cccccc 0%, #999999 70%, #888888 85%);"; private final GridPane grid = new GridPane(); - private final Text icon = GlyphsDude.createIcon(FontAwesomeIcons.BLANK, "20.0"); - private final Text foundIcon = GlyphsDude.createIcon(FontAwesomeIcons.BLANK, "10.0"); + private final Text icon = MaterialDesignIconFactory.get().createIcon(CHECKBOX_BLANK_OUTLINE, "20.0"); + private final Text foundIcon = MaterialDesignIconFactory.get().createIcon(CHECKBOX_BLANK_OUTLINE, "10.0"); private final Label name = new Label(); - private final Text difficultyStars = GlyphsDude.createIcon(FontAwesomeIcons.BLANK, "8.0"); - private final Text terrainStars = GlyphsDude.createIcon(FontAwesomeIcons.BLANK, "8.0"); + private final Text difficultyStars = MaterialDesignIconFactory.get().createIcon(CHECKBOX_BLANK_OUTLINE, "8.0"); + private final Text terrainStars = MaterialDesignIconFactory.get().createIcon(CHECKBOX_BLANK_OUTLINE, "8.0"); public CacheListCell() { this.getStyleClass().add("cache-list-cell"); @@ -162,9 +163,9 @@ public class CacheListCell extends ListCell { private void setFoundIcon(CacheListEntry cache) { if (cache.getFound()) { - foundIcon.setText(FontAwesomeIcons.CHECK.characterToString()); + foundIcon.setText(MaterialDesignIcon.CHECK.characterToString()); } else { - foundIcon.setText(FontAwesomeIcons.BLANK.characterToString()); + foundIcon.setText(""); } } diff --git a/src/main/resources/de/geofroggerfx/ui/details/details.fxml b/src/main/resources/de/geofroggerfx/ui/details/details.fxml index 5f0d945..de73be9 100644 --- a/src/main/resources/de/geofroggerfx/ui/details/details.fxml +++ b/src/main/resources/de/geofroggerfx/ui/details/details.fxml @@ -1,22 +1,13 @@ - - - - - - - - - + - @@ -82,9 +73,9 @@