From 7ba39a47591415a11f2c0adbd36dbc71511e0b49 Mon Sep 17 00:00:00 2001 From: liwen Date: Wed, 10 Feb 2021 08:49:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- falsework-sever/src/main/resources/application-mysql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/falsework-sever/src/main/resources/application-mysql.yml b/falsework-sever/src/main/resources/application-mysql.yml index eb66a25..44b4bcd 100644 --- a/falsework-sever/src/main/resources/application-mysql.yml +++ b/falsework-sever/src/main/resources/application-mysql.yml @@ -5,7 +5,7 @@ spring: # 使用druid数据源 type: com.alibaba.druid.pool.DruidDataSource druid: - url: jdbc:mysql://${MYSQL_HOST:10.211.55.3}:${MYSQL_PORT:3306}/fx_falsework_db?serverTimezone=Asia/Shanghai + url: jdbc:mysql://${MYSQL_HOST:10.211.55.3}:${MYSQL_PORT:3306}/ipsm_dba?serverTimezone=Asia/Shanghai username: root password: Root@12345 driver-class-name: com.mysql.cj.jdbc.Driver From 90bc915eac8ab1cddfda083e8a7f7fec06894042 Mon Sep 17 00:00:00 2001 From: liwen Date: Wed, 7 Apr 2021 11:47:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uicomponents/basicInfo/IconSwitch.java | 63 ++++++ .../basicInfo/skin/IconSwitchSkin.java | 197 ++++++++++++++++++ .../uicomponents/control/LFXDecorator.java | 39 +--- .../uicomponents/login/LoginController.java | 2 +- .../gui/uicomponents/main/MainController.java | 32 +-- .../src/main/resources/css/app-dark.css | 3 +- .../src/main/resources/css/app-light.css | 4 +- .../src/main/resources/css/iconswitch.css | 52 +++++ .../src/main/resources/fxml/main/main.fxml | 57 +++-- 9 files changed, 374 insertions(+), 75 deletions(-) create mode 100644 falsework-client/src/main/java/com/fx/client/gui/uicomponents/basicInfo/IconSwitch.java create mode 100644 falsework-client/src/main/java/com/fx/client/gui/uicomponents/basicInfo/skin/IconSwitchSkin.java create mode 100644 falsework-client/src/main/resources/css/iconswitch.css diff --git a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/basicInfo/IconSwitch.java b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/basicInfo/IconSwitch.java new file mode 100644 index 0000000..a0e34b5 --- /dev/null +++ b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/basicInfo/IconSwitch.java @@ -0,0 +1,63 @@ +package com.fx.client.gui.uicomponents.basicInfo; + +import com.fx.client.gui.uicomponents.basicInfo.skin.IconSwitchSkin; +import javafx.beans.property.BooleanProperty; +import javafx.beans.property.SimpleBooleanProperty; +import javafx.scene.control.ContentDisplay; +import javafx.scene.control.Control; +import javafx.scene.control.Label; +import javafx.scene.control.Skin; + +/** + * @version： 0.0.1 + * @description: + * @className: IconSwitch + * @author: liwen + * @date: 2021/2/22 10:21 + */ +public class IconSwitch extends Control { + + // CSS pseudo classes + private BooleanProperty selected; + + private final Label symbol; + + // ******************** Constructors ************************************** + public IconSwitch() { + getStyleClass().addAll("icon-switch"); + symbol = new Label(); + symbol.setContentDisplay(ContentDisplay.GRAPHIC_ONLY); + } + + // ******************** Methods ******************************************* + public final boolean isSelected() { + return null == selected ? false : selected.get(); + } + + public final void setSelected(final boolean ON) { + selectedProperty().set(ON); + } + + public final BooleanProperty selectedProperty() { + if (null == selected) { + selected = new SimpleBooleanProperty(); + } + return selected; + } + + // ******************** Style related ************************************* + @Override + protected Skin createDefaultSkin() { + return new IconSwitchSkin(this); + } + + @Override + public String getUserAgentStylesheet() { + return getClass().getResource("/css/iconswitch.css").toExternalForm(); + } + + + public Label getSymbol() { + return symbol; + } +} diff --git a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/basicInfo/skin/IconSwitchSkin.java b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/basicInfo/skin/IconSwitchSkin.java new file mode 100644 index 0000000..5038568 --- /dev/null +++ b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/basicInfo/skin/IconSwitchSkin.java @@ -0,0 +1,197 @@ +package com.fx.client.gui.uicomponents.basicInfo.skin; + +import com.fx.client.gui.uicomponents.basicInfo.IconSwitch; +import com.jfoenix.svg.SVGGlyph; +import javafx.animation.TranslateTransition; +import javafx.geometry.Pos; +import javafx.scene.control.ContentDisplay; +import javafx.scene.control.Label; +import javafx.scene.control.SkinBase; +import javafx.scene.layout.Pane; +import javafx.scene.shape.Rectangle; +import javafx.util.Duration; + +/** + * @version： 0.0.1 + * @description: + * @className: IconSwitch + * @author: liwen + * @date: 2021/2/22 10:21 + */ +public class IconSwitchSkin extends SkinBase { + private static final double PREFERRED_WIDTH = 80; + private static final double PREFERRED_HEIGHT = 32; + private static final double MINIMUM_WIDTH = 20; + private static final double MINIMUM_HEIGHT = 8; + private static final double MAXIMUM_WIDTH = 1024; + private static final double MAXIMUM_HEIGHT = 1024; + private double size; + + private double aspectRatio; + private double width; + private double height; + private Pane pane; + private Rectangle background; + private SVGGlyph symbol; + private Label thumb; + private TranslateTransition moveToDeselected; + private TranslateTransition moveToSelected; + + // ******************** Constructors ************************************** + public IconSwitchSkin(final IconSwitch CONTROL) { + super(CONTROL); + init(); + initGraphics(); + registerListeners(); + resize(); + } + + // ******************** Initialization ************************************ + private void init() { + if (Double.compare(getSkinnable().getPrefWidth(), 0.0) <= 0 || Double.compare(getSkinnable().getPrefHeight(), 0.0) <= 0 || + Double.compare(getSkinnable().getWidth(), 0.0) <= 0 || Double.compare(getSkinnable().getHeight(), 0.0) <= 0) { + if (getSkinnable().getPrefWidth() > 0 && getSkinnable().getPrefHeight() > 0) { + getSkinnable().setPrefSize(getSkinnable().getPrefWidth(), getSkinnable().getPrefHeight()); + } else { + getSkinnable().setPrefSize(PREFERRED_WIDTH, PREFERRED_HEIGHT); + } + } + + if (Double.compare(getSkinnable().getMinWidth(), 0.0) <= 0 || Double.compare(getSkinnable().getMinHeight(), 0.0) <= 0) { + getSkinnable().setMinSize(MINIMUM_WIDTH, MINIMUM_HEIGHT); + } + + if (Double.compare(getSkinnable().getMaxWidth(), 0.0) <= 0 || Double.compare(getSkinnable().getMaxHeight(), 0.0) <= 0) { + getSkinnable().setMaxSize(MAXIMUM_WIDTH, MAXIMUM_HEIGHT); + } + + if (getSkinnable().getPrefWidth() != PREFERRED_WIDTH || getSkinnable().getPrefHeight() != PREFERRED_HEIGHT) { + aspectRatio = getSkinnable().getPrefHeight() / getSkinnable().getPrefWidth(); + } + } + + + private void initGraphics() { + + background = new Rectangle(); + background.getStyleClass().setAll("background"); + + + symbol = new SVGGlyph(""); + symbol.setSize(20, 20); + symbol.setId("symbol-a"); + + thumb = new Label(""); + thumb.setGraphic(symbol); + thumb.setAlignment(Pos.CENTER); + thumb.setContentDisplay(ContentDisplay.GRAPHIC_ONLY); + thumb.getStyleClass().setAll("thumb-a"); + thumb.setMouseTransparent(true); + + + pane = new Pane(background, thumb); + pane.getStyleClass().setAll("icon-switch"); + + moveToDeselected = new TranslateTransition(Duration.millis(180), thumb); + moveToSelected = new TranslateTransition(Duration.millis(180), thumb); + + // Add all nodes + getChildren().setAll(pane); + } + + private void registerListeners() { + getSkinnable().widthProperty().addListener(observable -> handleControlPropertyChanged("RESIZE")); + getSkinnable().heightProperty().addListener(observable -> handleControlPropertyChanged("RESIZE")); + getSkinnable().selectedProperty().addListener(observable -> handleControlPropertyChanged("SELECTED")); + pane.setOnMouseClicked(mouseEvent -> { + getSkinnable().setSelected(!getSkinnable().isSelected()); + }); + } + + // ******************** Methods ******************************************* + protected void handleControlPropertyChanged(final String PROPERTY) { + if ("RESIZE".equals(PROPERTY)) { + resize(); + } else if ("SELECTED".equals(PROPERTY)) { + + thumb.getStyleClass().removeAll("thumb-a-selected" , "thumb-a"); + thumb.getStyleClass().setAll(getSkinnable().isSelected() ? "thumb-a-selected" : "thumb-a"); + symbol.setId(getSkinnable().isSelected() ? "symbol-a-selected" : "symbol-a"); +// symbol.setStyle(getSkinnable().isSelected() ? "-fx-background-color: #191e1e;" : " -fx-background-color: #ffffff;"); + if (getSkinnable().isSelected()) { + moveToSelected.play(); + } else { + moveToDeselected.play(); + } + } + } + + + @Override + protected double computeMinWidth(final double HEIGHT, double TOP_INSET, double RIGHT_INSET, double BOTTOM_INSET, double LEFT_INSET) { + return super.computeMinWidth(Math.max(MINIMUM_HEIGHT, HEIGHT - TOP_INSET - BOTTOM_INSET), TOP_INSET, RIGHT_INSET, BOTTOM_INSET, LEFT_INSET); + } + + @Override + protected double computeMinHeight(final double WIDTH, double TOP_INSET, double RIGHT_INSET, double BOTTOM_INSET, double LEFT_INSET) { + return super.computeMinHeight(Math.max(MINIMUM_WIDTH, WIDTH - LEFT_INSET - RIGHT_INSET), TOP_INSET, RIGHT_INSET, BOTTOM_INSET, LEFT_INSET); + } + + @Override + protected double computeMaxWidth(final double HEIGHT, double TOP_INSET, double RIGHT_INSET, double BOTTOM_INSET, double LEFT_INSET) { + return super.computeMaxWidth(Math.min(MAXIMUM_HEIGHT, HEIGHT - TOP_INSET - BOTTOM_INSET), TOP_INSET, RIGHT_INSET, BOTTOM_INSET, LEFT_INSET); + } + + @Override + protected double computeMaxHeight(final double WIDTH, double TOP_INSET, double RIGHT_INSET, double BOTTOM_INSET, double LEFT_INSET) { + return super.computeMaxHeight(Math.min(MAXIMUM_WIDTH, WIDTH - LEFT_INSET - RIGHT_INSET), TOP_INSET, RIGHT_INSET, BOTTOM_INSET, LEFT_INSET); + } + + @Override + protected double computePrefWidth(final double HEIGHT, double TOP_INSET, double RIGHT_INSET, double BOTTOM_INSET, double LEFT_INSET) { + double prefHeight = PREFERRED_HEIGHT; + if (HEIGHT != -1) { + prefHeight = Math.max(0, HEIGHT - TOP_INSET - BOTTOM_INSET); + } + return super.computePrefWidth(prefHeight, TOP_INSET, RIGHT_INSET, BOTTOM_INSET, LEFT_INSET); + } + + @Override + protected double computePrefHeight(final double WIDTH, double TOP_INSET, double RIGHT_INSET, double BOTTOM_INSET, double LEFT_INSET) { + double prefWidth = PREFERRED_WIDTH; + if (WIDTH != -1) { + prefWidth = Math.max(0, WIDTH - LEFT_INSET - RIGHT_INSET); + } + return super.computePrefHeight(prefWidth, TOP_INSET, RIGHT_INSET, BOTTOM_INSET, LEFT_INSET); + } + + + // ******************** Private Methods *********************************** + private void resize() { + width = getSkinnable().getWidth(); + height = getSkinnable().getHeight(); + size = (width < height ? width : height)*.65; + + if (width > 0 && height > 0) { + + background.heightProperty().set(height * 0.35); + background.widthProperty().set(width); + background.arcHeightProperty().setValue(background.getHeight()); + background.arcWidthProperty().setValue(background.getHeight()); + background.setTranslateY((height - background.getHeight()) / 2.0); + + thumb.setPrefSize(size, size); + thumb.setTranslateX(getSkinnable().isSelected() ? width - size : 0); + thumb.setTranslateY((height - size) / 2.0); + + symbol.setSize((size * 0.65), (size * 0.65)); + + moveToDeselected.setFromX(width -size); + moveToDeselected.setToX(0); + + moveToSelected.setFromX(0); + moveToSelected.setToX(width - size); + } + } + +} diff --git a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/control/LFXDecorator.java b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/control/LFXDecorator.java index 9d04923..d36dbd1 100644 --- a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/control/LFXDecorator.java +++ b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/control/LFXDecorator.java @@ -2,18 +2,9 @@ package com.fx.client.gui.uicomponents.control; import com.jfoenix.controls.JFXButton; import com.jfoenix.svg.SVGGlyph; -import javafx.animation.Animation; -import javafx.animation.Interpolator; -import javafx.animation.KeyFrame; -import javafx.animation.KeyValue; -import javafx.animation.Timeline; +import javafx.animation.*; import javafx.application.Platform; -import javafx.beans.property.BooleanProperty; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleBooleanProperty; -import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.property.SimpleStringProperty; -import javafx.beans.property.StringProperty; +import javafx.beans.property.*; import javafx.geometry.BoundingBox; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -21,21 +12,10 @@ import javafx.geometry.Rectangle2D; import javafx.scene.Cursor; import javafx.scene.Node; import javafx.scene.control.Tooltip; +import javafx.scene.effect.BlendMode; import javafx.scene.input.MouseEvent; -import javafx.scene.layout.Background; -import javafx.scene.layout.BackgroundFill; -import javafx.scene.layout.Border; -import javafx.scene.layout.BorderStroke; -import javafx.scene.layout.BorderStrokeStyle; -import javafx.scene.layout.BorderWidths; -import javafx.scene.layout.CornerRadii; -import javafx.scene.layout.HBox; -import javafx.scene.layout.Priority; -import javafx.scene.layout.Region; -import javafx.scene.layout.StackPane; -import javafx.scene.layout.VBox; +import javafx.scene.layout.*; import javafx.scene.paint.Color; -import javafx.scene.shape.Rectangle; import javafx.scene.text.Text; import javafx.stage.Screen; import javafx.stage.Stage; @@ -351,7 +331,6 @@ public class LFXDecorator extends StackPane { } }); buttonsContainer.setMinWidth(180); - contentPlaceHolder.getStyleClass().add("lfx-decorator-content-container"); contentPlaceHolder.setMinSize(0, 0); StackPane clippedContainer = new StackPane(node); contentPlaceHolder.getChildren().add(clippedContainer); @@ -361,15 +340,9 @@ public class LFXDecorator extends StackPane { // BINDING - Rectangle clip = new Rectangle(); - clip.setArcWidth(20); - clip.setArcHeight(20); - clip.widthProperty().bind(contentPane.widthProperty()); - clip.heightProperty().bind(contentPane.heightProperty()); - VBox.setVgrow(contentPlaceHolder, Priority.ALWAYS); - contentPane.getChildren().addAll(buttonsContainer, contentPlaceHolder); - contentPane.setClip(clip); + contentPane.getChildren().addAll(buttonsContainer,contentPlaceHolder); + contentPane.setBlendMode(BlendMode.SRC_ATOP); this.setPadding(new Insets(3,3,3,3)); this.getChildren().addAll(contentPane); diff --git a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/login/LoginController.java b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/login/LoginController.java index a10d4ec..ceb9fea 100644 --- a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/login/LoginController.java +++ b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/login/LoginController.java @@ -179,7 +179,7 @@ public class LoginController { registeredPane.managedProperty().bind(registeredPane.visibleProperty()); initAnimation(); - loadingImage(); +// loadingImage(); initAction(); } diff --git a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/main/MainController.java b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/main/MainController.java index 16a3448..afffe95 100644 --- a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/main/MainController.java +++ b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/main/MainController.java @@ -3,6 +3,7 @@ package com.fx.client.gui.uicomponents.main; import com.fx.client.AppStartup; import com.fx.client.bean.MenuVoCell; import com.fx.client.gui.feature.FeatureResourceConsumer; +import com.fx.client.gui.uicomponents.basicInfo.IconSwitch; import com.fx.client.gui.uicomponents.home.HomeController; import com.fx.client.gui.uicomponents.login.LoginController; import com.fx.client.gui.uicomponents.main.components.UserInfoController; @@ -82,9 +83,8 @@ public class MainController { @FXML @ActionTrigger("goHome") private JFXButton homeButton; - @FXML @ActionTrigger("showSkinPane") - private JFXToggleNode styleNode; + private IconSwitch styleNode; //刷新按钮 @FXML @EventTrigger("refresh") @@ -127,7 +127,9 @@ public class MainController { @PostConstruct public void init() throws FlowException { - + styleNode=new IconSwitch(); + styleNode.setPrefSize(50,32); + rightHbox.getChildren().add(0,styleNode); navigationList=new JFXListView<>(); navigationList.getStyleClass().add("navigation-list"); leftDrawer = new JFXDrawer(); @@ -147,7 +149,6 @@ public class MainController { refreshButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".shuaxin1")); bellButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".cc-bell-o")); userButton.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".ChevronDownCircle")); - styleNode.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".moon-fill")); } catch (Exception e) { e.printStackTrace(); @@ -205,8 +206,16 @@ public class MainController { }); drawersStack.toggle(leftDrawer); drawersStack.setEffect(null); - - styleNode.selectedProperty().bindBidirectional(ApplicatonStore.styleProperty()); + ApplicatonStore.styleProperty().bindBidirectional( styleNode.selectedProperty()); + styleNode.selectedProperty().addListener((observable, oldValue, newValue) -> { + try { + showSkinPane(); + } catch (VetoException e) { + e.printStackTrace(); + } catch (FlowException e) { + e.printStackTrace(); + } + }); featureResourceConsumer.consumeResource(this); navigationList.setCellFactory(listView -> new JFXListCell() { @@ -412,19 +421,10 @@ public class MainController { String style2 = AppStartup.class.getResource("/css/app-dark.css").toExternalForm(); if (styleNode.isSelected()) { - try { - styleNode.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".taiyang")); - } catch (Exception e) { - e.printStackTrace(); - } + styleNode.getScene().getStylesheets().removeAll(style1); styleNode.getScene().getStylesheets().addAll(style2); } else { - try { - styleNode.setGraphic(SVGGlyphLoader.getIcoMoonGlyph(ApplicatonStore.ICON_FONT_KEY + ".moon-fill")); - } catch (Exception e) { - e.printStackTrace(); - } styleNode.getScene().getStylesheets().removeAll(style2); styleNode.getScene().getStylesheets().addAll(style1); diff --git a/falsework-client/src/main/resources/css/app-dark.css b/falsework-client/src/main/resources/css/app-dark.css index 816453c..21c992b 100644 --- a/falsework-client/src/main/resources/css/app-dark.css +++ b/falsework-client/src/main/resources/css/app-dark.css @@ -222,7 +222,8 @@ .lfx-decorator { -fx-decorator-color: -fx-main-base; - -fx-background-color: transparent; + -fx-background-color: -fx-main-base; + -fx-background-radius: 11; } diff --git a/falsework-client/src/main/resources/css/app-light.css b/falsework-client/src/main/resources/css/app-light.css index 2285798..048b555 100644 --- a/falsework-client/src/main/resources/css/app-light.css +++ b/falsework-client/src/main/resources/css/app-light.css @@ -219,8 +219,8 @@ .lfx-decorator { -fx-decorator-color: -fx-main-base; - -fx-background-color: transparent; - + -fx-background-color: -fx-main-base; + -fx-background-radius: 11; } .lfx-decorator .lfx-decorator-buttons-container { diff --git a/falsework-client/src/main/resources/css/iconswitch.css b/falsework-client/src/main/resources/css/iconswitch.css new file mode 100644 index 0000000..4856dec --- /dev/null +++ b/falsework-client/src/main/resources/css/iconswitch.css @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2013 by Gerrit Grunwald + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/************************************************************ +* ICON-SWITCH class * +************************************************************/ +.icon-switch { + -fx-skin: "com.fx.client.gui.uicomponents.basicInfo.skin.IconSwitchSkin"; + -switch-color: white; + -thumb-color: white; +} + +.icon-switch > .background { + -fx-fill: #41464b; +} + +.icon-switch > .thumb-a { + -fx-background-color: #909191; + -fx-background-radius: 1024; +} + +.icon-switch > .thumb-a-selected { + -fx-background-color: #9b9b9b; + -fx-background-radius: 1024; +} + + + +.icon-switch .thumb-a .jfx-svg-glyph { + -fx-shape: "M511.951 74.082c16.284 0 29.529-13.001 29.904-29.18l0.008-0.706v-81.31c0-16.506-13.392-29.886-29.912-29.886-16.283 0-29.528 13-29.903 29.18l-0.008 0.706v81.31c0 16.505 13.392 29.886 29.911 29.886z m-219.283 93.56c11.514-11.505 11.679-30.056 0.493-41.761l-0.493-0.505-57.545-57.495c-11.68-11.67-30.62-11.67-42.301 0-11.515 11.505-11.68 30.055-0.494 41.76l0.494 0.505 57.544 57.495c11.681 11.671 30.62 11.671 42.302 0z m484.965 0.492l0.505-0.493 57.545-57.495c11.681-11.67 11.681-30.593 0-42.265-11.515-11.504-30.08-11.669-41.797-0.493l-0.505 0.493-57.544 57.495c-11.682 11.671-11.682 30.594 0 42.265 11.514 11.505 30.08 11.669 41.796 0.493zM511.951 645.787c143.596 0 260.003-116.306 260.003-259.778 0-143.471-116.407-259.778-260.003-259.778-143.595 0-260.003 116.307-260.003 259.778 0 143.472 116.408 259.778 260.003 259.778z m0-59.772c-110.556 0-200.179-89.545-200.179-200.006 0-110.46 89.623-200.006 200.18-200.006 110.555 0 200.179 89.546 200.179 200.006s-89.624 200.006-200.18 200.006z m-336.694-167.07c16.505 0 29.886-13.391 29.886-29.911 0-16.284-13.001-29.529-29.18-29.904l-0.706-0.008h-81.31c-16.506 0-29.886 13.392-29.886 29.912 0 16.284 13 29.528 29.18 29.904l0.706 0.008h81.31z m747.796 0c16.506 0 29.886-13.391 29.886-29.911 0-16.284-13-29.529-29.18-29.904l-0.706-0.008h-81.31c-16.505 0-29.886 13.392-29.886 29.912 0 16.284 13.001 29.528 29.18 29.904l0.706 0.008h81.31zM234.618 708.382l0.505-0.493 57.545-57.495c11.681-11.671 11.681-30.594 0-42.265-11.515-11.505-30.08-11.67-41.797-0.493l-0.505 0.493-57.544 57.494c-11.682 11.672-11.682 30.594 0 42.265 11.514 11.505 30.08 11.67 41.796 0.494z m596.463-0.493c11.515-11.505 11.679-30.055 0.494-41.76l-0.494-0.506-57.544-57.494c-11.682-11.671-30.62-11.671-42.302 0-11.515 11.504-11.679 30.055-0.494 41.76l0.494 0.505 57.544 57.495c11.682 11.67 30.62 11.67 42.302 0zM511.951 832c16.284 0 29.529-13 29.904-29.18l0.008-0.706v-81.31c0-16.505-13.392-29.886-29.912-29.886-16.283 0-29.528 13.001-29.903 29.18l-0.008 0.706v81.31C482.04 818.62 495.432 832 511.95 832z"; +} + +.icon-switch .thumb-a-selected .jfx-svg-glyph { + -fx-shape: "M485.546667 809.856a320 320 0 1 1 452.266666-452.266667C924.245333 134.229333 738.816-42.666667 512.042667-42.666667 276.352-42.666667 85.333333 148.352 85.333333 384c0 226.773333 176.896 412.202667 400.213334 425.856z"; +} + +.icon-switch:disabled { + -fx-opacity: 0.4; +} diff --git a/falsework-client/src/main/resources/fxml/main/main.fxml b/falsework-client/src/main/resources/fxml/main/main.fxml index af3b8f0..e19e5db 100644 --- a/falsework-client/src/main/resources/fxml/main/main.fxml +++ b/falsework-client/src/main/resources/fxml/main/main.fxml @@ -22,70 +22,83 @@ - + - + - + - + - + - + - - + + - + - + - - - + + + - + - + - - + - + - + - + From bd37b8d3fcd6ef43c439b6d16f0b02b21ba0284e Mon Sep 17 00:00:00 2001 From: liwen Date: Fri, 16 Apr 2021 15:52:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/META-INF/MANIFEST.MF | 102 ++++++++---------- .../src/test/java/JavaFxTest.java | 9 ++ .../src/main/resources/META-INF/MANIFEST.MF | 50 +++++++++ 3 files changed, 106 insertions(+), 55 deletions(-) create mode 100644 falsework-client/src/test/java/JavaFxTest.java create mode 100644 falsework-sever/src/main/resources/META-INF/MANIFEST.MF diff --git a/falsework-client/src/main/java/META-INF/MANIFEST.MF b/falsework-client/src/main/java/META-INF/MANIFEST.MF index fcfd6bc..6df2a18 100644 --- a/falsework-client/src/main/java/META-INF/MANIFEST.MF +++ b/falsework-client/src/main/java/META-INF/MANIFEST.MF @@ -1,58 +1,50 @@ Manifest-Version: 1.0 Main-Class: com.fx.client.AppStartup -Class-Path: . libs/annotations-2.0.0.jar libs/feign-slf4j-10.9.jar libs/se - rvo-core-0.10.1.jar libs/jackson-databind-2.10.0.pr3.jar libs/netflix-c - ommons-util-0.1.1.jar libs/ribbon-loadbalancer-2.3.0.jar libs/pagehelpe - r-5.1.4.jar libs/spring-boot-starter-websocket-2.4.1.jar libs/fontaweso - mefx-8.9.jar libs/httpcore-4.2.1.jar libs/HikariCP-3.4.5.jar libs/log4j - -to-slf4j-2.13.3.jar libs/javafx-graphics-11.0.2-mac.jar libs/log4j-api - -2.13.3.jar libs/spring-boot-starter-jdbc-2.4.0.jar libs/feign-okhttp-1 - 0.9.jar libs/druid-spring-boot-starter-1.1.14.jar libs/spring-web-5.3.2 - .jar libs/spring-security-config-5.4.2.jar libs/spring-boot-starter-2.4 - .1.jar libs/ribbon-core-2.3.0.jar libs/jackson-datatype-jsr310-2.11.3.j - ar libs/spring-aop-5.3.2.jar libs/junit-4.12.jar libs/spring-boot-start - er-quartz-2.4.1.jar libs/logback-core-1.1.7.jar libs/hamcrest-core-1.3. - jar libs/feign-core-10.9.jar libs/spring-security-core-5.4.2.jar libs/j - ersey-core-1.19.1.jar libs/spring-boot-2.4.1.jar libs/mybatis-spring-bo - ot-autoconfigure-2.1.4.jar libs/feign-jackson-10.9.jar libs/okio-1.17.2 - .jar libs/mybatis-spring-2.0.6.jar libs/jakarta.annotation-api-1.3.5.ja - r libs/tomcat-embed-websocket-9.0.41.jar libs/feign-ribbon-10.9.jar lib - s/datafx-flow-8.0.2-SNAPSHOT.jar libs/snakeyaml-1.27.jar libs/javassist - -3.18.1-GA.jar libs/joda-time-2.10.1.jar libs/spring-boot-starter-secur - ity-2.4.1.jar libs/okhttp-3.14.6.jar libs/DmJdbcDriver-1.0.0.jar libs/d - ruid-1.1.14.jar libs/jackson-annotations-2.10.0.pr3.jar libs/ikonli-jav - afx-2.4.0.jar libs/Java-WebSocket-1.5.1.jar libs/jsr305-3.0.1.jar libs/ - mybatis-spring-boot-starter-2.1.4.jar libs/commons-lang-2.6.jar libs/sp - ring-context-support-5.3.2.jar libs/spring-context-5.3.2.jar libs/jacks - on-module-parameter-names-2.11.3.jar libs/spring-boot-autoconfigure-1.5 - .12.RELEASE.jar libs/javafx-base-11.0.2.jar libs/ikonli-core-2.4.0.jar - libs/feign-hystrix-10.9.jar libs/spring-security-web-5.4.2.jar libs/spr - ing-expression-5.2.11.RELEASE.jar libs/rxjava-1.2.0.jar libs/slf4j-api- - 1.7.21.jar libs/spring-boot-starter-json-2.4.1.jar libs/lombok-1.18.16. - jar libs/javafx-media-11.0.2.jar libs/c3p0-0.9.5.4.jar libs/datafx-inje - ction-8.0.2-SNAPSHOT.jar libs/jul-to-slf4j-1.7.30.jar libs/jersey-apach - e-client4-1.19.1.jar libs/jfoenix-8.0.10.jar libs/jjwt-0.7.0.jar libs/c - ommons-lang3-3.4.jar libs/tomcat-embed-core-9.0.41.jar libs/netflix-sta - tistics-0.1.1.jar libs/controlsfx-11.0.3.jar libs/spring-messaging-5.3. - 2.jar libs/spring-tx-5.3.2.jar libs/spring-boot-starter-web-2.4.1.jar l - ibs/spring-boot-starter-tomcat-2.4.1.jar libs/spring-jcl-5.3.2.jar libs - /HikariCP-java7-2.4.13.jar libs/spring-beans-5.3.2.jar libs/HdrHistogra - m-2.1.9.jar libs/guava-16.0.1.jar libs/pinyin4j-2.5.0.jar libs/spring-w - ebsocket-5.3.2.jar libs/commons-collections-3.2.1.jar libs/datafx-event - system-8.0.2-SNAPSHOT.jar libs/httpclient-4.2.1.jar libs/mchange-common - s-java-0.2.15.jar libs/jakarta.el-3.0.3.jar libs/pagehelper-spring-boot - -autoconfigure-1.2.5.jar libs/javafx-base-11.0.2-mac.jar libs/jackson-c - ore-2.10.0.pr3.jar libs/ribbon-httpclient-2.2.0.jar libs/spring-boot-st - arter-cache-2.4.1.jar libs/commons-logging-1.1.1.jar libs/javafx-media- - 11.0.2-mac.jar libs/jsqlparser-1.0.jar libs/javafx-controls-11.0.2-mac. - jar libs/archaius-core-0.7.6.jar libs/spring-boot-starter-logging-2.4.1 - .jar libs/mysql-connector-java-8.0.20.jar libs/javafx-graphics-11.0.2.j - ar libs/javafx-controls-11.0.2.jar libs/javax.inject-1.jar libs/datafx- - core-8.0.2-SNAPSHOT.jar libs/quartz-2.3.2.jar libs/logback-classic-1.1. - 7.jar libs/spring-jdbc-5.3.1.jar libs/ikonli-fontawesome5-pack-2.4.0.ja - r libs/hystrix-core-1.5.18.jar libs/jersey-client-1.19.1.jar libs/commo - ns-configuration-1.8.jar libs/jsr311-api-1.1.1.jar libs/mybatis-3.5.6.j - ar libs/spring-webmvc-5.3.2.jar libs/servo-internal-0.10.1.jar libs/spr - ing-core-5.3.2.jar libs/jackson-datatype-jdk8-2.11.3.jar libs/pagehelpe - r-spring-boot-starter-1.2.5.jar libs/commons-codec-1.6.jar +Class-Path: tomcat-embed-core-9.0.41.jar Java-WebSocket-1.5.1.jar hystri + x-core-1.5.18.jar druid-spring-boot-starter-1.1.14.jar commons-lang-2.6 + .jar jersey-core-1.19.1.jar pagehelper-5.1.4.jar spring-security-web-5. + 4.2.jar spring-boot-starter-security-2.4.1.jar okhttp-3.14.6.jar datafx + -eventsystem-8.0.2-SNAPSHOT.jar spring-context-support-5.3.2.jar okio-1 + .17.2.jar ribbon-core-2.3.0.jar druid-1.1.14.jar junit-4.12.jar spring- + boot-starter-quartz-2.4.1.jar jackson-datatype-jsr310-2.11.3.jar spring + -jcl-5.3.2.jar tilesfx-1.6.8.jar spring-boot-2.4.1.jar datafx-flow-8.0. + 2-SNAPSHOT.jar HdrHistogram-2.1.9.jar slf4j-api-1.7.21.jar fontawesomef + x-8.9.jar netflix-statistics-0.1.1.jar spring-tx-5.3.2.jar feign-core-1 + 0.9.jar commons-codec-1.6.jar spring-context-5.3.2.jar jsr305-3.0.1.jar + archaius-core-0.7.6.jar DmJdbcDriver-1.0.0.jar spring-beans-5.3.2.jar + ribbon-loadbalancer-2.3.0.jar httpclient-4.2.1.jar spring-boot-starter- + logging-2.4.1.jar jjwt-0.7.0.jar jfoenix-8.0.10.jar spring-boot-starter + -tomcat-2.4.1.jar pagehelper-spring-boot-autoconfigure-1.2.5.jar httpco + re-4.2.1.jar c3p0-0.9.5.4.jar feign-hystrix-10.9.jar guava-16.0.1.jar j + avafx-base-11.0.2-mac.jar ikonli-javafx-2.4.0.jar spring-security-core- + 5.4.2.jar snakeyaml-1.27.jar jackson-datatype-jdk8-2.11.3.jar jakarta.a + nnotation-api-1.3.5.jar commons-logging-1.1.1.jar mchange-commons-java- + 0.2.15.jar javafx-media-11.0.2-mac.jar ribbon-httpclient-2.2.0.jar quar + tz-2.3.2.jar javafx-media-11.0.2.jar log4j-api-2.13.3.jar annotations-2 + .0.0.jar jackson-module-parameter-names-2.11.3.jar jakarta.el-3.0.3.jar + spring-boot-autoconfigure-1.5.12.RELEASE.jar jackson-databind-2.10.0.p + r3.jar tomcat-embed-websocket-9.0.41.jar logback-core-1.1.7.jar pagehel + per-spring-boot-starter-1.2.5.jar commons-configuration-1.8.jar mybatis + -3.5.6.jar commons-lang3-3.4.jar javafx-graphics-11.0.2-mac.jar ikonli- + fontawesome5-pack-2.4.0.jar feign-okhttp-10.9.jar jul-to-slf4j-1.7.30.j + ar spring-websocket-5.3.2.jar spring-messaging-5.3.2.jar spring-aop-5.3 + .2.jar spring-boot-starter-2.4.1.jar pinyin4j-2.5.0.jar jackson-annotat + ions-2.10.0.pr3.jar spring-web-5.3.2.jar spring-jdbc-5.3.1.jar spring-c + ore-5.3.2.jar javafx-controls-11.0.2.jar spring-expression-5.2.11.RELEA + SE.jar feign-slf4j-10.9.jar mybatis-spring-2.0.6.jar servo-core-0.10.1. + jar controlsfx-11.0.3.jar lombok-1.18.16.jar spring-boot-starter-websoc + ket-2.4.1.jar jersey-apache-client4-1.19.1.jar HikariCP-java7-2.4.13.ja + r javafx-graphics-11.0.2.jar servo-internal-0.10.1.jar log4j-to-slf4j-2 + .13.3.jar kotlin-compiler-1.0.6.jar datafx-injection-8.0.2-SNAPSHOT.jar + spring-security-config-5.4.2.jar jsqlparser-1.0.jar commons-collection + s-3.2.1.jar jsr311-api-1.1.1.jar jackson-core-2.10.0.pr3.jar spring-boo + t-starter-jdbc-2.4.0.jar logback-classic-1.1.7.jar spring-webmvc-5.3.2. + jar spring-boot-starter-json-2.4.1.jar javax.inject-1.jar joda-time-2.1 + 0.1.jar rxjava-1.2.0.jar netflix-commons-util-0.1.1.jar datafx-core-8.0 + .2-SNAPSHOT.jar spring-boot-starter-web-2.4.1.jar mybatis-spring-boot-s + tarter-2.1.4.jar hamcrest-core-1.3.jar mysql-connector-java-8.0.20.jar + HikariCP-3.4.5.jar ikonli-core-2.4.0.jar javafx-controls-11.0.2-mac.jar + javafx-base-11.0.2.jar feign-jackson-10.9.jar feign-ribbon-10.9.jar sp + ring-boot-starter-cache-2.4.1.jar javassist-3.18.1-GA.jar jersey-client + -1.19.1.jar mybatis-spring-boot-autoconfigure-2.1.4.jar diff --git a/falsework-client/src/test/java/JavaFxTest.java b/falsework-client/src/test/java/JavaFxTest.java new file mode 100644 index 0000000..cf65ecc --- /dev/null +++ b/falsework-client/src/test/java/JavaFxTest.java @@ -0,0 +1,9 @@ +package PACKAGE_NAME;/** + * @version： 0.0.1 + * @description: + * + * @className: JavaFxTest + * @author: liwen + * @date: 2021/4/13 15:16 + */public class JavaFxTest { +} diff --git a/falsework-sever/src/main/resources/META-INF/MANIFEST.MF b/falsework-sever/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..6df2a18 --- /dev/null +++ b/falsework-sever/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,50 @@ +Manifest-Version: 1.0 +Main-Class: com.fx.client.AppStartup +Class-Path: tomcat-embed-core-9.0.41.jar Java-WebSocket-1.5.1.jar hystri + x-core-1.5.18.jar druid-spring-boot-starter-1.1.14.jar commons-lang-2.6 + .jar jersey-core-1.19.1.jar pagehelper-5.1.4.jar spring-security-web-5. + 4.2.jar spring-boot-starter-security-2.4.1.jar okhttp-3.14.6.jar datafx + -eventsystem-8.0.2-SNAPSHOT.jar spring-context-support-5.3.2.jar okio-1 + .17.2.jar ribbon-core-2.3.0.jar druid-1.1.14.jar junit-4.12.jar spring- + boot-starter-quartz-2.4.1.jar jackson-datatype-jsr310-2.11.3.jar spring + -jcl-5.3.2.jar tilesfx-1.6.8.jar spring-boot-2.4.1.jar datafx-flow-8.0. + 2-SNAPSHOT.jar HdrHistogram-2.1.9.jar slf4j-api-1.7.21.jar fontawesomef + x-8.9.jar netflix-statistics-0.1.1.jar spring-tx-5.3.2.jar feign-core-1 + 0.9.jar commons-codec-1.6.jar spring-context-5.3.2.jar jsr305-3.0.1.jar + archaius-core-0.7.6.jar DmJdbcDriver-1.0.0.jar spring-beans-5.3.2.jar + ribbon-loadbalancer-2.3.0.jar httpclient-4.2.1.jar spring-boot-starter- + logging-2.4.1.jar jjwt-0.7.0.jar jfoenix-8.0.10.jar spring-boot-starter + -tomcat-2.4.1.jar pagehelper-spring-boot-autoconfigure-1.2.5.jar httpco + re-4.2.1.jar c3p0-0.9.5.4.jar feign-hystrix-10.9.jar guava-16.0.1.jar j + avafx-base-11.0.2-mac.jar ikonli-javafx-2.4.0.jar spring-security-core- + 5.4.2.jar snakeyaml-1.27.jar jackson-datatype-jdk8-2.11.3.jar jakarta.a + nnotation-api-1.3.5.jar commons-logging-1.1.1.jar mchange-commons-java- + 0.2.15.jar javafx-media-11.0.2-mac.jar ribbon-httpclient-2.2.0.jar quar + tz-2.3.2.jar javafx-media-11.0.2.jar log4j-api-2.13.3.jar annotations-2 + .0.0.jar jackson-module-parameter-names-2.11.3.jar jakarta.el-3.0.3.jar + spring-boot-autoconfigure-1.5.12.RELEASE.jar jackson-databind-2.10.0.p + r3.jar tomcat-embed-websocket-9.0.41.jar logback-core-1.1.7.jar pagehel + per-spring-boot-starter-1.2.5.jar commons-configuration-1.8.jar mybatis + -3.5.6.jar commons-lang3-3.4.jar javafx-graphics-11.0.2-mac.jar ikonli- + fontawesome5-pack-2.4.0.jar feign-okhttp-10.9.jar jul-to-slf4j-1.7.30.j + ar spring-websocket-5.3.2.jar spring-messaging-5.3.2.jar spring-aop-5.3 + .2.jar spring-boot-starter-2.4.1.jar pinyin4j-2.5.0.jar jackson-annotat + ions-2.10.0.pr3.jar spring-web-5.3.2.jar spring-jdbc-5.3.1.jar spring-c + ore-5.3.2.jar javafx-controls-11.0.2.jar spring-expression-5.2.11.RELEA + SE.jar feign-slf4j-10.9.jar mybatis-spring-2.0.6.jar servo-core-0.10.1. + jar controlsfx-11.0.3.jar lombok-1.18.16.jar spring-boot-starter-websoc + ket-2.4.1.jar jersey-apache-client4-1.19.1.jar HikariCP-java7-2.4.13.ja + r javafx-graphics-11.0.2.jar servo-internal-0.10.1.jar log4j-to-slf4j-2 + .13.3.jar kotlin-compiler-1.0.6.jar datafx-injection-8.0.2-SNAPSHOT.jar + spring-security-config-5.4.2.jar jsqlparser-1.0.jar commons-collection + s-3.2.1.jar jsr311-api-1.1.1.jar jackson-core-2.10.0.pr3.jar spring-boo + t-starter-jdbc-2.4.0.jar logback-classic-1.1.7.jar spring-webmvc-5.3.2. + jar spring-boot-starter-json-2.4.1.jar javax.inject-1.jar joda-time-2.1 + 0.1.jar rxjava-1.2.0.jar netflix-commons-util-0.1.1.jar datafx-core-8.0 + .2-SNAPSHOT.jar spring-boot-starter-web-2.4.1.jar mybatis-spring-boot-s + tarter-2.1.4.jar hamcrest-core-1.3.jar mysql-connector-java-8.0.20.jar + HikariCP-3.4.5.jar ikonli-core-2.4.0.jar javafx-controls-11.0.2-mac.jar + javafx-base-11.0.2.jar feign-jackson-10.9.jar feign-ribbon-10.9.jar sp + ring-boot-starter-cache-2.4.1.jar javassist-3.18.1-GA.jar jersey-client + -1.19.1.jar mybatis-spring-boot-autoconfigure-2.1.4.jar + From 8ba5431f8818866446a35087a0e2946b3484c53b Mon Sep 17 00:00:00 2001 From: liwen Date: Tue, 20 Apr 2021 14:16:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/META-INF/MANIFEST.MF | 50 ------- .../src/main/resources/META-INF/MANIFEST.MF | 59 ++++++++ .../src/test/java/DynamicEnumUtil.java | 129 ------------------ falsework-client/src/test/java/YesNoEnum.java | 49 ------- 4 files changed, 59 insertions(+), 228 deletions(-) delete mode 100644 falsework-client/src/main/java/META-INF/MANIFEST.MF create mode 100644 falsework-client/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 falsework-client/src/test/java/DynamicEnumUtil.java delete mode 100644 falsework-client/src/test/java/YesNoEnum.java diff --git a/falsework-client/src/main/java/META-INF/MANIFEST.MF b/falsework-client/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 6df2a18..0000000 --- a/falsework-client/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,50 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.fx.client.AppStartup -Class-Path: tomcat-embed-core-9.0.41.jar Java-WebSocket-1.5.1.jar hystri - x-core-1.5.18.jar druid-spring-boot-starter-1.1.14.jar commons-lang-2.6 - .jar jersey-core-1.19.1.jar pagehelper-5.1.4.jar spring-security-web-5. - 4.2.jar spring-boot-starter-security-2.4.1.jar okhttp-3.14.6.jar datafx - -eventsystem-8.0.2-SNAPSHOT.jar spring-context-support-5.3.2.jar okio-1 - .17.2.jar ribbon-core-2.3.0.jar druid-1.1.14.jar junit-4.12.jar spring- - boot-starter-quartz-2.4.1.jar jackson-datatype-jsr310-2.11.3.jar spring - -jcl-5.3.2.jar tilesfx-1.6.8.jar spring-boot-2.4.1.jar datafx-flow-8.0. - 2-SNAPSHOT.jar HdrHistogram-2.1.9.jar slf4j-api-1.7.21.jar fontawesomef - x-8.9.jar netflix-statistics-0.1.1.jar spring-tx-5.3.2.jar feign-core-1 - 0.9.jar commons-codec-1.6.jar spring-context-5.3.2.jar jsr305-3.0.1.jar - archaius-core-0.7.6.jar DmJdbcDriver-1.0.0.jar spring-beans-5.3.2.jar - ribbon-loadbalancer-2.3.0.jar httpclient-4.2.1.jar spring-boot-starter- - logging-2.4.1.jar jjwt-0.7.0.jar jfoenix-8.0.10.jar spring-boot-starter - -tomcat-2.4.1.jar pagehelper-spring-boot-autoconfigure-1.2.5.jar httpco - re-4.2.1.jar c3p0-0.9.5.4.jar feign-hystrix-10.9.jar guava-16.0.1.jar j - avafx-base-11.0.2-mac.jar ikonli-javafx-2.4.0.jar spring-security-core- - 5.4.2.jar snakeyaml-1.27.jar jackson-datatype-jdk8-2.11.3.jar jakarta.a - nnotation-api-1.3.5.jar commons-logging-1.1.1.jar mchange-commons-java- - 0.2.15.jar javafx-media-11.0.2-mac.jar ribbon-httpclient-2.2.0.jar quar - tz-2.3.2.jar javafx-media-11.0.2.jar log4j-api-2.13.3.jar annotations-2 - .0.0.jar jackson-module-parameter-names-2.11.3.jar jakarta.el-3.0.3.jar - spring-boot-autoconfigure-1.5.12.RELEASE.jar jackson-databind-2.10.0.p - r3.jar tomcat-embed-websocket-9.0.41.jar logback-core-1.1.7.jar pagehel - per-spring-boot-starter-1.2.5.jar commons-configuration-1.8.jar mybatis - -3.5.6.jar commons-lang3-3.4.jar javafx-graphics-11.0.2-mac.jar ikonli- - fontawesome5-pack-2.4.0.jar feign-okhttp-10.9.jar jul-to-slf4j-1.7.30.j - ar spring-websocket-5.3.2.jar spring-messaging-5.3.2.jar spring-aop-5.3 - .2.jar spring-boot-starter-2.4.1.jar pinyin4j-2.5.0.jar jackson-annotat - ions-2.10.0.pr3.jar spring-web-5.3.2.jar spring-jdbc-5.3.1.jar spring-c - ore-5.3.2.jar javafx-controls-11.0.2.jar spring-expression-5.2.11.RELEA - SE.jar feign-slf4j-10.9.jar mybatis-spring-2.0.6.jar servo-core-0.10.1. - jar controlsfx-11.0.3.jar lombok-1.18.16.jar spring-boot-starter-websoc - ket-2.4.1.jar jersey-apache-client4-1.19.1.jar HikariCP-java7-2.4.13.ja - r javafx-graphics-11.0.2.jar servo-internal-0.10.1.jar log4j-to-slf4j-2 - .13.3.jar kotlin-compiler-1.0.6.jar datafx-injection-8.0.2-SNAPSHOT.jar - spring-security-config-5.4.2.jar jsqlparser-1.0.jar commons-collection - s-3.2.1.jar jsr311-api-1.1.1.jar jackson-core-2.10.0.pr3.jar spring-boo - t-starter-jdbc-2.4.0.jar logback-classic-1.1.7.jar spring-webmvc-5.3.2. - jar spring-boot-starter-json-2.4.1.jar javax.inject-1.jar joda-time-2.1 - 0.1.jar rxjava-1.2.0.jar netflix-commons-util-0.1.1.jar datafx-core-8.0 - .2-SNAPSHOT.jar spring-boot-starter-web-2.4.1.jar mybatis-spring-boot-s - tarter-2.1.4.jar hamcrest-core-1.3.jar mysql-connector-java-8.0.20.jar - HikariCP-3.4.5.jar ikonli-core-2.4.0.jar javafx-controls-11.0.2-mac.jar - javafx-base-11.0.2.jar feign-jackson-10.9.jar feign-ribbon-10.9.jar sp - ring-boot-starter-cache-2.4.1.jar javassist-3.18.1-GA.jar jersey-client - -1.19.1.jar mybatis-spring-boot-autoconfigure-2.1.4.jar - diff --git a/falsework-client/src/main/resources/META-INF/MANIFEST.MF b/falsework-client/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..8cda51e --- /dev/null +++ b/falsework-client/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,59 @@ +Manifest-Version: 1.0 +Main-Class: com.fx.client.AppStartup +Class-Path: . libs/kotlin-compiler-1.0.6.jar libs/datafx-flow-8.0.2-SNAP + SHOT.jar libs/jersey-apache-client4-1.19.1.jar libs/HikariCP-java7-2.4. + 13.jar libs/hystrix-core-1.5.18.jar libs/spring-boot-starter-web-2.4.1. + jar libs/HikariCP-3.4.5.jar libs/netflix-statistics-0.1.1.jar libs/comm + ons-lang3-3.4.jar libs/datafx-core-8.0.2-SNAPSHOT.jar libs/spring-boot- + starter-websocket-2.4.1.jar libs/jersey-core-1.19.1.jar libs/tilesfx-1. + 6.8.jar libs/spring-beans-5.3.2.jar libs/javax.inject-1.jar libs/spring + -boot-starter-security-2.4.1.jar libs/spring-expression-5.2.11.RELEASE. + jar libs/spring-websocket-5.3.2.jar libs/c3p0-0.9.5.4.jar libs/spring-w + ebmvc-5.3.2.jar libs/logback-classic-1.1.7.jar libs/spring-boot-autocon + figure-1.5.12.RELEASE.jar libs/jackson-databind-2.10.0.pr3.jar libs/rib + bon-httpclient-2.2.0.jar libs/spring-boot-starter-tomcat-2.4.1.jar libs + /spring-web-5.3.2.jar libs/feign-jackson-10.9.jar libs/httpclient-4.2.1 + .jar libs/junit-4.12.jar libs/mybatis-3.5.6.jar libs/spring-tx-5.3.2.ja + r libs/spring-messaging-5.3.2.jar libs/javafx-graphics-11.0.2.jar libs/ + javafx-base-11.0.2-mac.jar libs/spring-context-support-5.3.2.jar libs/d + atafx-eventsystem-8.0.2-SNAPSHOT.jar libs/javafx-base-11.0.2.jar libs/p + agehelper-spring-boot-autoconfigure-1.2.5.jar libs/slf4j-api-1.7.21.jar + libs/javassist-3.18.1-GA.jar libs/commons-logging-1.1.1.jar libs/mysql + -connector-java-8.0.20.jar libs/jakarta.el-3.0.3.jar libs/jackson-modul + e-parameter-names-2.11.3.jar libs/spring-boot-starter-cache-2.4.1.jar l + ibs/spring-security-web-5.4.2.jar libs/jul-to-slf4j-1.7.30.jar libs/spr + ing-security-config-5.4.2.jar libs/spring-boot-2.4.1.jar libs/pagehelpe + r-5.1.4.jar libs/ikonli-javafx-2.4.0.jar libs/spring-boot-starter-loggi + ng-2.4.1.jar libs/spring-jcl-5.3.2.jar libs/servo-core-0.10.1.jar libs/ + jackson-core-2.10.0.pr3.jar libs/log4j-to-slf4j-2.13.3.jar libs/hamcres + t-core-1.3.jar libs/spring-jdbc-5.3.1.jar libs/log4j-api-2.13.3.jar lib + s/jakarta.annotation-api-1.3.5.jar libs/mchange-commons-java-0.2.15.jar + libs/javafx-controls-11.0.2-mac.jar libs/jackson-datatype-jdk8-2.11.3. + jar libs/archaius-core-0.7.6.jar libs/pinyin4j-2.5.0.jar libs/mybatis-s + pring-boot-autoconfigure-2.1.4.jar libs/commons-configuration-1.8.jar l + ibs/tomcat-embed-core-9.0.41.jar libs/jsr305-3.0.1.jar libs/snakeyaml-1 + .27.jar libs/commons-codec-1.6.jar libs/druid-1.1.14.jar libs/feign-rib + bon-10.9.jar libs/spring-boot-starter-2.4.1.jar libs/spring-core-5.3.2. + jar libs/okio-1.17.2.jar libs/ikonli-core-2.4.0.jar libs/jjwt-0.7.0.jar + libs/rxjava-1.2.0.jar libs/DmJdbcDriver-1.0.0.jar libs/guava-16.0.1.ja + r libs/okhttp-3.14.6.jar libs/druid-spring-boot-starter-1.1.14.jar libs + /datafx-injection-8.0.2-SNAPSHOT.jar libs/mybatis-spring-boot-starter-2 + .1.4.jar libs/spring-boot-starter-jdbc-2.4.0.jar libs/ribbon-core-2.3.0 + .jar libs/logback-core-1.1.7.jar libs/feign-okhttp-10.9.jar libs/pagehe + lper-spring-boot-starter-1.2.5.jar libs/ikonli-fontawesome5-pack-2.4.0. + jar libs/feign-slf4j-10.9.jar libs/netflix-commons-util-0.1.1.jar libs/ + fontawesomefx-8.9.jar libs/Java-WebSocket-1.5.1.jar libs/HdrHistogram-2 + .1.9.jar libs/javafx-controls-11.0.2.jar libs/jersey-client-1.19.1.jar + libs/spring-aop-5.3.2.jar libs/tomcat-embed-websocket-9.0.41.jar libs/c + ontrolsfx-11.0.3.jar libs/spring-context-5.3.2.jar libs/javafx-media-11 + .0.2-mac.jar libs/jsr311-api-1.1.1.jar libs/jfoenix-9.0.10.jar libs/jsq + lparser-1.0.jar libs/spring-boot-starter-quartz-2.4.1.jar libs/annotati + ons-2.0.0.jar libs/ribbon-loadbalancer-2.3.0.jar libs/mybatis-spring-2. + 0.6.jar libs/spring-security-core-5.4.2.jar libs/commons-lang-2.6.jar l + ibs/commons-collections-3.2.1.jar libs/servo-internal-0.10.1.jar libs/f + eign-core-10.9.jar libs/feign-hystrix-10.9.jar libs/httpcore-4.2.1.jar + libs/javafx-graphics-11.0.2-mac.jar libs/joda-time-2.10.1.jar libs/lomb + ok-1.18.16.jar libs/quartz-2.3.2.jar libs/jackson-annotations-2.10.0.pr + 3.jar libs/jackson-datatype-jsr310-2.11.3.jar libs/javafx-media-11.0.2. + jar libs/spring-boot-starter-json-2.4.1.jar + diff --git a/falsework-client/src/test/java/DynamicEnumUtil.java b/falsework-client/src/test/java/DynamicEnumUtil.java deleted file mode 100644 index b42a630..0000000 --- a/falsework-client/src/test/java/DynamicEnumUtil.java +++ /dev/null @@ -1,129 +0,0 @@ -import sun.reflect.ConstructorAccessor; -import sun.reflect.FieldAccessor; -import sun.reflect.ReflectionFactory; - -import java.lang.reflect.AccessibleObject; -import java.lang.reflect.Array; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class DynamicEnumUtil { - - private static ReflectionFactory reflectionFactory = ReflectionFactory.getReflectionFactory(); - - private static void setFailsafeFieldValue(Field field, Object target, Object value) throws NoSuchFieldException, - IllegalAccessException { - - // let's make the field accessible - field.setAccessible(true); - - // next we change the modifier in the Field instance to - // not be final anymore, thus tricking reflection into - // letting us modify the static final field - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - int modifiers = modifiersField.getInt(field); - - // blank out the final bit in the modifiers int - modifiers &= ~Modifier.FINAL; - modifiersField.setInt(field, modifiers); - - FieldAccessor fa = reflectionFactory.newFieldAccessor(field, false); - fa.set(target, value); - } - - private static void blankField(Class enumClass, String fieldName) throws NoSuchFieldException, - IllegalAccessException { - for (Field field : Class.class.getDeclaredFields()) { - if (field.getName().contains(fieldName)) { - AccessibleObject.setAccessible(new Field[] { field }, true); - setFailsafeFieldValue(field, enumClass, null); - break; - } - } - } - - private static void cleanEnumCache(Class enumClass) throws NoSuchFieldException, IllegalAccessException { - blankField(enumClass, "enumConstantDirectory"); // Sun (Oracle?!?) JDK 1.5/6 - blankField(enumClass, "enumConstants"); // IBM JDK - } - - private static ConstructorAccessor getConstructorAccessor(Class enumClass, Class[] additionalParameterTypes) - throws NoSuchMethodException { - Class[] parameterTypes = new Class[additionalParameterTypes.length + 2]; - parameterTypes[0] = String.class; - parameterTypes[1] = int.class; - System.arraycopy(additionalParameterTypes, 0, parameterTypes, 2, additionalParameterTypes.length); - return reflectionFactory.newConstructorAccessor(enumClass.getDeclaredConstructor(parameterTypes)); - } - - private static Object makeEnum(Class enumClass, String value, int ordinal, Class[] additionalTypes, - Object[] additionalValues) throws Exception { - Object[] parms = new Object[additionalValues.length + 2]; - parms[0] = value; - parms[1] = Integer.valueOf(ordinal); - System.arraycopy(additionalValues, 0, parms, 2, additionalValues.length); -// parms[1] = parms[parms.length-1]; - return enumClass.cast(getConstructorAccessor(enumClass, additionalTypes).newInstance(parms)); - } - - /** - * Add an enum instance to the enum class given as argument - * - * @param the type of the enum (implicit) - * @param enumType the class of the enum to be modified - * @param enumName the name of the new enum instance to be added to the class. - */ - @SuppressWarnings("unchecked") - public static > T addEnum(Class enumType, String enumName, Class[] additionalTypes, Object[] additionalValues) { - - // 0. Sanity checks - if (!Enum.class.isAssignableFrom(enumType)) { - throw new RuntimeException("class " + enumType + " is not an instance of Enum"); - } - - // 1. Lookup "$VALUES" holder in enum class and get previous enum instances - Field valuesField = null; - Field[] fields = enumType.getDeclaredFields(); - for (Field field : fields) { - if (field.getName().contains("$VALUES")) { - valuesField = field; - break; - } - } - AccessibleObject.setAccessible(new Field[] { valuesField }, true); - - try { - - // 2. Copy it - T[] previousValues = (T[]) valuesField.get(enumType); - List values = new ArrayList(Arrays.asList(previousValues)); - - // 3. build new enum - T newValue = (T) makeEnum(enumType, enumName, values.size(), additionalTypes, additionalValues); - - // 4. add new value - values.add(newValue); - - // 5. Set new values field - setFailsafeFieldValue(valuesField, null, values.toArray((T[]) Array.newInstance(enumType, 0))); - - // 6. Clean enum cache - cleanEnumCache(enumType); - return newValue; - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e.getMessage(), e); - } - } - - - public static void main(String[] args) { - - } - - -} \ No newline at end of file diff --git a/falsework-client/src/test/java/YesNoEnum.java b/falsework-client/src/test/java/YesNoEnum.java deleted file mode 100644 index 8ba925f..0000000 --- a/falsework-client/src/test/java/YesNoEnum.java +++ /dev/null @@ -1,49 +0,0 @@ -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; - -public enum YesNoEnum { - YES(1, "yes"), - NO(0, "no"); - - private Integer value; - private String name; - private static Map enumMap = new HashMap<>(); - - static { - // 可以在这里加载枚举的配置文件 比如从 properties 数据库中加载 - // 加载完后 使用DynamicEnumUtil.addEnum 动态增加枚举值 - // 然后正常使用枚举即可 - EnumSet set = EnumSet.allOf(YesNoEnum.class); - for (YesNoEnum each : set) { - // 增加一个缓存 减少对枚举的修改 - enumMap.put(each.value, each); - } - } - - YesNoEnum(Integer value, String name) { - this.value = value; - this.name = name; - } - - public Integer getValue() { - return value; - } - - public String getName() { - return name; - } - - // 根据关键字段获取枚举值 可以在这里做一些修改 来达到动态添加的效果 - public YesNoEnum getEnum(Integer value) { - // 这里可以做一些修改 比如若从 enumMap 中没有取得 则加载配置动态添加 - return enumMap.get(value); - } - - // 动态添加方法 添加完后加入缓存 减少对枚举的修改 - public YesNoEnum addEnum(String enumName, Integer value, String name) { - YesNoEnum yesNoEnum = DynamicEnumUtil.addEnum(YesNoEnum.class, enumName, new Class[]{Integer.class, String.class}, new Object[]{value, name}); - enumMap.put(value, yesNoEnum); - return yesNoEnum; - } -} \ No newline at end of file From 209c8e77a04425fb965a932912ccf42a5fb705b8 Mon Sep 17 00:00:00 2001 From: liwen Date: Tue, 20 Apr 2021 16:19:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- falsework-client/pom.xml | 8 ++------ .../src/main/java/com/fx/client/AppStartup.java | 6 +++--- .../gui/uicomponents/login/LoginController.java | 2 +- .../main/java/com/fx/client/request/Request.java | 2 ++ .../src/main/resources/css/app-dark.css | 15 ++++++++------- .../src/main/resources/css/app-light.css | 16 +++++++++------- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/falsework-client/pom.xml b/falsework-client/pom.xml index b9a5654..5fc8f2e 100644 --- a/falsework-client/pom.xml +++ b/falsework-client/pom.xml @@ -22,8 +22,6 @@ - - com.fx falsework-sever @@ -36,11 +34,9 @@ 11.0.3 - jfoenix + com.jfoenix jfoenix - ${jfoenix.version} - system - ${pom.basedir}/libs/jfoenix-8.0.10.jar + 8.0.10 tilesfx diff --git a/falsework-client/src/main/java/com/fx/client/AppStartup.java b/falsework-client/src/main/java/com/fx/client/AppStartup.java index db4fc37..fd71d36 100644 --- a/falsework-client/src/main/java/com/fx/client/AppStartup.java +++ b/falsework-client/src/main/java/com/fx/client/AppStartup.java @@ -1,10 +1,10 @@ package com.fx.client; -import com.fx.client.gui.uicomponents.control.LFXDecorator; import com.fx.client.gui.uicomponents.login.LoginController; import com.fx.client.store.ApplicatonStore; import com.fx.client.websocket.WSClient; import com.jfoenix.assets.JFoenixResources; +import com.jfoenix.controls.JFXDecorator; import com.jfoenix.svg.SVGGlyph; import com.jfoenix.svg.SVGGlyphLoader; import com.netflix.config.ConfigurationManager; @@ -45,7 +45,7 @@ public class AppStartup extends Application { InputStream in = AppStartup.class.getClassLoader().getResourceAsStream("fonts/msyh.ttf"); Font font1 = Font.loadFont(in, 12); - System.err.println(font1.getName() + "\t" + font1.getFamily()); +// System.err.println(font1.getName() + "\t" + font1.getFamily()); ConfigurationManager.loadPropertiesFromResources("sample-client.properties"); // @@ -74,7 +74,7 @@ public class AppStartup extends Application { applicationContext.register("ContentFlowHandler", contentFlowHandler); contentFlowHandler.start(container); - LFXDecorator wfxDecorator = new LFXDecorator(stage, container.getView(), false, true, true); + JFXDecorator wfxDecorator = new JFXDecorator(stage, container.getView()); wfxDecorator.setCustomMaximize(true); wfxDecorator.setGraphic(new SVGGlyph("")); diff --git a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/login/LoginController.java b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/login/LoginController.java index ceb9fea..a10d4ec 100644 --- a/falsework-client/src/main/java/com/fx/client/gui/uicomponents/login/LoginController.java +++ b/falsework-client/src/main/java/com/fx/client/gui/uicomponents/login/LoginController.java @@ -179,7 +179,7 @@ public class LoginController { registeredPane.managedProperty().bind(registeredPane.visibleProperty()); initAnimation(); -// loadingImage(); + loadingImage(); initAction(); } diff --git a/falsework-client/src/main/java/com/fx/client/request/Request.java b/falsework-client/src/main/java/com/fx/client/request/Request.java index dfa5097..1444d09 100644 --- a/falsework-client/src/main/java/com/fx/client/request/Request.java +++ b/falsework-client/src/main/java/com/fx/client/request/Request.java @@ -115,8 +115,10 @@ public class Request { @Override public LBClient create(String clientName) { + System.err.println("--------------------"+clientName+"--------------------"); IClientConfig config = ClientFactory.getNamedConfig(clientName); ILoadBalancer lb = ClientFactory.getNamedLoadBalancer(clientName); + ZoneAwareLoadBalancer zb = (ZoneAwareLoadBalancer) lb; zb.setRule(new BestAvailableRule()); LBClient lbClient = LBClient.create(lb, config); diff --git a/falsework-client/src/main/resources/css/app-dark.css b/falsework-client/src/main/resources/css/app-dark.css index 21c992b..54a4ba7 100644 --- a/falsework-client/src/main/resources/css/app-dark.css +++ b/falsework-client/src/main/resources/css/app-dark.css @@ -42,6 +42,7 @@ } .jfx-svg-glyph { -fx-background-color: -fx-text-color; + -jfx-size:15px } .glyph-icon { @@ -220,35 +221,35 @@ * * *******************************************************************************/ -.lfx-decorator { +.jfx-decorator { -fx-decorator-color: -fx-main-base; -fx-background-color: -fx-main-base; -fx-background-radius: 11; } -.lfx-decorator .lfx-decorator-buttons-container { +.jfx-decorator .jfx-decorator-buttons-container { -fx-background-color: -fx-decorator-color; } -.lfx-decorator .resize-border { +.jfx-decorator .resize-border { -fx-border-color: -fx-decorator-color; - -fx-border-width: 0; + -fx-border-width: 0 4 4 4; } -.lfx-decorator .lfx-decorator-title-container .lfx-decorator-text { +.jfx-decorator .jfx-decorator-title-container .jfx-decorator-text { -fx-fill: -fx-text-color; -fx-font-size: 16px; } -.lfx-decorator .lfx-decorator-title-container .jfx-svg-glyph { +.jfx-decorator .jfx-decorator-title-container .jfx-svg-glyph { /*-fx-shape: "M223.3 179.2l-6.9-6.9-5.9 6.6-41 42.3-6.4 6.4 7.2 6.5 43.6 41.3 7.4 7.4 7.6-8-1-0.8 38.1-39.3 1.4 1.3 7.8-8m-54.3 39.3L178 226.5l38.1-39.3 43 40.8-38.2 39.3z M188.9 222.7l-5.6 5.4 7.1 6.9 5.2-5.8 8.1-8.4 6.3 6-6.4 6.7-5.6 5.5 7.1 6.6 5.3-5.7 6.4-6.7 8.8 8.3-8.7 9-5.8 5.6 7 6.6 5.4-5.9 24.6-25.4 6-5.9-7-6.6-4.5 5.1c-0.2-2.3-0.2-4.3-0.4-6.2l-3.1 0.1-4.3 0.3c-0.8 0-1.8 0-3.1-0.1l4.9-4.6-7.2-6.8-3.9 4.3-7.8 8.1-6.5-6 8.3-8.5 5.8-5.4-7.2-6.9-5.7 6.3-23.5 24.1z m39.9-1.8c0.1 2.4-0.1 4.6-0.5 6.5 4.1-0.5 6.8-0.6 7.9-0.5 1.2 0.1 2.4 0.2 3.2 0.4l-6.1 6.3-8.7-8.3 4.2-4.4zM346.9 144.6c1.8-3.3 3.9-7.1 6.4-11.4-4.5-0.6-7.3-1.1-8.3-1.4-1-0.3-2.2-0.7-3.5-1.3l-2.1 5.7c-0.5 1.6-2.8 6-6.9 13.5l-2.7-1.3c-0.9-0.5-3.1-0.9-6.4-1.4 1.9-2.9 3.9-5.9 5.9-9-1.6-0.2-3.1-0.4-4.6-0.7l11.9-6.1 7.8-3.8-4.4-8.4-7.7 4.1-33.5 17.3-7.1 3.4 4.5 8.5 6.8-3.8 11.8-6.1c-5 6.9-9.6 11.9-13.8 14.9-4.1 2.9-7.3 5.3-9.8 6.9 3.5 1.9 5.7 3.1 6.6 3.8 0.8 0.6 1.9 1.4 2.9 2.4 4-3.7 7-6.3 8.8-8.1 1.8-1.6 4.2-4.3 7.5-7.8l1.3 0.3c-2.1 3.7-4.5 7.2-7.1 10.6-2.7 3.2-5 5.8-7 7.8-2 1.9-4.4 3.9-7.4 6.1 3 1.6 5 2.7 6.1 3.5 0.9 0.6 2 1.4 3.2 2.4 5.7-5.6 9.9-10.3 12.4-14 2.7-3.6 5.5-7.8 8.5-12.8 0.5 0.3 1.2 0.8 1.7 1.3-2 4.1-5.2 9.4-9.5 15.6-4.3 6.3-10.6 12.7-18.7 19l4.4 2.2c1.3 0.6 3.1 1.9 5.6 3.8l8.5-9.4c2.5-2.6 5.3-6.2 8.5-10.6 3.1-4.5 5.6-8.5 7.5-12l0.4 1c0.5 0.9 1.1 2.3 1.7 4 0.7 1.6 0.7 3.1-0.1 4.3-0.6 1.3-3.3 2.6-7.8 4.1l3.4 2.7c0.9 0.6 2.6 2.5 5.2 5.6 6.3-3.4 9.9-6.3 10.8-8.7 0.9-2.5 0.9-4.9 0.4-7.2-0.7-2.1-1.8-4.8-3.5-8-1.8-3.1-2.9-5.3-3.7-6.4-0.7-1-1.5-2.2-2.4-3.5l2.1-3.1c3.5 3.5 6.7 6.2 9.6 8.3 2.9 1.9 6.2 3.5 10 4.9 3.8 1.4 9.1 2.2 16 2.7 0.3-3.3 0.6-5.6 0.9-7 0.3-1.4 0.7-3.1 1.3-5.3-4.8 0.5-9.7 0.2-14.7-1-4.8-1-8.7-2.8-11.6-5.3-2.7-2.4-4.7-4.4-6.1-5.8z M280.2 150.5l2 4.4 10.3-5.3-2.4-4.2-2.8-5.5 52-26.9 3 5.8 2.2 4.5 10.3-5.2-2.6-4.4-4.6-8.7-2.8-5.9-8.3 4.6-23.1 11.9c0.3-0.8 0.7-1.8 1.3-2.8-2.5-0.7-6.3-1.7-11.4-2.8-2 3.1-3.3 5.2-3.9 6-0.6 0.9-1.5 1.9-2.4 3 2.7 0.6 4.8 1.2 6.4 1.8l-21.6 11.1-9.2 4.3 3.1 5.6 4.5 8.7zM415.5 124.3l1.2 9.3 11.3-1.8-0.3-1.3 17.2-2.7 2 13c0.3 2 0.7 3.6 1.4 4.8 0.7 1.1 1.9 2.1 3.8 2.8 1.9 0.7 4.5 0.9 8 0.3 3.5-0.5 7.9-1.1 13.5-1.8 5.8-0.7 10-1.4 12.8-1.9 2.8-0.6 4.8-1.3 6.1-2 1.3-0.8 2.4-1.9 3.4-3.4s1.9-5.4 2.8-11.8c-3.3-0.6-7.2-1.8-11.6-3.5v3.6c0.1 2.3-0.4 4-1.4 5.1-1 1.1-2.4 1.8-4.1 2.3-1.8 0.5-4.8 0.9-9.1 1.5l-9.8 1.3c-2.1 0.3-3.5 0.1-4.1-0.4-0.6-0.7-0.9-1.3-1.1-2.1l-1.5-9.4 19.5-3.1 0.3 1.7 11.2-1.7-1.6-8.7-5.5-35.2-1-7.9-7.3 1.4-23.5 3.6-0.8-5-0.9-7.1-11.6 1.8 1.4 7 0.7 5.1-19.8 3.1-8.6 1 1.6 7.9 5.4 34.2z m56.6-21.1l1.6 10.1-19.5 3.1-1.6-10.2 19.5-3z m-3.2-19.8l1.6 10.3-19.5 3-1.6-10.3 19.5-3z m-25.6 34.7l-17.1 2.6-1.6-10.2 17-2.6 1.7 10.2z m-4.8-30l1.7 10.4-17.1 2.6-1.6-10.3 17-2.7zM616.3 76.1l-51.8-9-10.9-2.3-1.7 10.9-9.5 53.4-2.2 11.7 11.7 2.1 2-11.8 1.9-10.9c1.9 2.7 3.1 4.6 3.7 5.6 0.5 1.1 1.2 2.2 1.7 3.3 4-3.8 6.5-6.4 7.6-7.7 1.1-1.3 2-2.4 2.7-3.5l0.8 2.6c0.2 0.5 0.3 1.7 0.5 3.9l2.4-1.6c1.5-0.9 4-2 7.7-3.3-1.4-4.6-2.9-9-4.6-13.2l1.5-2.9c0.5-1 1.5-3.3 3-6.8 2.3 3.9 3.7 6.5 4.2 7.6 0.4 1 1.4 3.5 2.6 7.1l-2 3.5c-1.4 2.5-3.3 4.9-5.4 7.3-2.1 2.3-5 4.6-8.5 7 2.7 2.2 4.5 3.7 5.3 4.7 0.8 0.9 1.7 2 2.6 3.1 2-1.4 3.7-2.8 4.9-4.1 1.3-1.3 4-4.3 8-9.1l1.4 5.3c0.2 0.5 0.5 2.1 1 4.8 3.6-2.5 6.9-4.6 9.8-6.2l-1-3.2c-0.1-0.3-1.7-4.5-4.7-12.4l2.3-5.4c0.8-2 1.8-4.7 3.1-8.1l1.8-5.2c0.1-0.5 0.4-1.5 0.9-2.6-3.6-0.9-7.2-2-10.9-3.5l-0.5 2.8c-0.3 1.5-1.1 4.4-2.5 8.7-1.2-2.4-2.2-4.7-3.3-6.6l-2.2 1.4c-1.3 0.8-3.5 1.6-6.5 2.3l1.8-4.5c0-0.1 0.3-0.8 0.7-2.2 0.5-1.3 0.9-2.5 1.3-3.4-4.3-1.1-7.8-2.4-10.6-3.9l-0.8 3.7c-0.3 1.5-0.7 2.9-1.1 4.3-0.4 1.2-0.9 2.7-1.6 4.1-1.3-2.8-2.5-5.3-3.4-7.6-2.7 1.5-4.5 2.4-5.4 2.6-0.9 0.3-1.8 0.6-2.8 0.8l2.2-12.3 50.8 8.8-9.3 52.5c-0.2 1.1-0.5 1.8-1 2.3-0.5 0.6-1.9 0.6-4.1 0.1-1.9-0.4-3.9-0.9-5.9-1.6l0.9 3.1c0.8 3 1.1 5.2 1 6.6 0 1.5-0.2 2.6-0.2 3.5 5.8 0.7 10.1 0.7 12.8 0.3 2.7-0.5 4.5-1.4 5.2-2.9 0.7-1.6 1.2-3.3 1.6-5.1l10-56.6 2.2-10.8-11.2-1.5zM562.5 95c0.4 0.9 2 4.4 4.5 10.4-1.8 3.5-3.5 6.1-5.1 7.9-1.6 1.8-3.6 3.7-6 5.6l4.9-27.3 1.7 3.4zM731.6 161.2c1.8 4.6 4.5 9.1 7.7 13.4 4.5-3 7.2-4.8 8.3-5.4 1.1-0.6 2.3-1.1 3.5-1.5-2.6-2.5-4.3-4.4-5.2-5.5-0.7-1.1-1.7-2.6-2.6-4.3-1-1.8-2-4.3-3.2-7.7-1.2-3.4-1.5-7.1-0.9-11 0.5-4 1.1-6.6 1.6-8.2 0.5-1.4 0.9-2.6 1.5-3.5 0.5-1 1-2 1.8-3-4-1.9-7.5-4-10.6-6.3-1.9 5-3.1 8.5-3.7 10.6-0.6 2.2-1 5.1-1.5 8.5-0.4 3.6-0.5 7.2 0 11 0.3 4.1 1.5 8.3 3.3 12.9zM676.6 139.4c5-1 10.6-2.4 16.8-4.3 6.2-1.9 11.3-4 15.3-6.3 4-2.2 8.9-5 14.7-8.3-2.8-3-5.3-6.3-7.6-10.1l-2.2 1.9c-3.5 3-7.5 5.6-12.1 7.8-4.7 2.1-9.5 3.9-14.6 5.2-5.2 1.3-9.7 1.8-13.6 1.3l1.2 2.8c0.5 1.7 1.3 5.1 2.1 10zM673.8 174.3c2.3 1 8.2 3.4 18 7.7 9.8 4.2 17.2 7.5 22.4 9.9 0.2 3 0.3 5 0.2 6.1-0.1 1.1-0.1 2.3-0.3 3.7l3.4-0.8c0.2-0.1 3.4-0.5 9.9-1.4-0.9-8.5-2.3-19.5-4.2-33l-2.4 0.3c-1.4 0.2-4.5 0.1-9.3-0.5l1.2 5.8c0.3 1.5 0.7 4.6 1.2 9.5-10.1-5-20.4-9.9-30.7-15.1 5-1.5 9.2-2.9 12.7-4.2 3.5-1.4 6.9-2.8 10.4-4.4l7.3-3.5c0.9-0.4 2.2-1 4-1.9-2.6-3.7-5-7.7-7.1-11.9l-1.8 1.7c-0.9 0.7-2.9 2.3-6.3 4.5-3.3 2.3-6.6 4.1-9.9 5.7-3.3 1.5-6.5 2.8-9.5 3.9-3.1 1.1-5.6 1.8-7.4 2.1-1.8 0.3-4.6 0.5-8.3 0.7l0.1 3.1c0.1 2-0.3 5.2-1.3 9.6 2.8 0.7 5.4 1.6 7.7 2.4zM821.3 234l-18.7-20-5.9-6.8-5.8 5.8-11.5 10.7-6.7 5.6 6.4 6.4 18.8 19.9 6.6 7.4 6.2-6.2 11.5-10.7 6.3-5.2-7.2-6.9z m-17 14l-16.5-17.5 9-8.3 16.5 17.4-9 8.4z M829.4 233.1l7.5 8.4 7.9-7.3-8.1-7.9-26.3-28-6.8-7.6-7.8 7.2 7.3 7.3z M855 233.2l-40.8 37.7c-1.3 1.2-2.2 1.7-2.9 1.8-0.7 0-1.7-0.6-3-1.9-0.5-0.4-1.3-1.3-2.3-2.4-1.1-1.2-2.1-2.4-3-3.4l-1.4 3.3c-0.8 1.8-1.6 3.3-2.6 4.5-0.9 1.2-1.8 2.3-2.6 3.3 5.4 5 9.2 7.9 11.7 8.8 2.4 0.9 4.1 1.2 5.2 0.8 1-0.3 2.6-1.4 4.5-3.3l45.4-41.8 7.2-6.1-7.2-7.3-36.2-38.5-7.9-8.7-8 7.3 8.4 8.4 35.5 37.5zM120.2 359.2c4.7 2.2 8.9 2.7 12.7 1.6 3.8-1.2 8-4.3 12.7-9.8 0.5-0.5 1.2-1.3 2.2-2.4 6.4-7.7 11.2-10.7 14.2-9.3 1.7 0.8 2.8 2.2 3.3 4.2 0.4 2 0 4.1-1.1 6.4-1.5 3.1-4.1 5.6-7.6 7.4-3.6 1.8-7.7 2.6-12.5 2.6l-0.5 6.4 19.4 4 2.4-4.9-2.4-2.5c2.2-1.2 4.2-2.6 5.8-4.3 1.6-1.7 3-3.7 4.1-5.8 2.6-5.3 3-10.5 1.3-15.7-1.8-5.2-5.3-9-10.6-11.5-2.7-1.3-5.4-1.9-8.1-2-2.7-0.1-5.3 0.5-7.6 1.6-1.1 0.6-2.7 1.7-4.5 3.5-1.8 1.8-4.2 4.2-7.2 7.3-0.4 0.5-0.9 1.1-1.7 2-5.8 6.5-10.3 9-13.3 7.5-2-1-3.4-2.7-4-5.3-0.6-2.4-0.3-5 1-7.6 1.8-3.8 5-6.6 9.4-8.6 4.5-2 9.8-2.9 16.1-2.7l0.6-7.1-24.5-4.2-2.3 4.7 3.2 2.6c-2.4 1.6-4.7 3.3-6.5 5.4-1.9 2.1-3.5 4.3-4.7 6.9-3 5.9-3.4 11.5-1.4 17 1.9 5.3 6 9.5 12.1 12.6zM96.8 396.5c1.6-0.4 4.8 0 9.5 1.5l34.2 10.9-0.2 0.9c-1.2 3.5-3 6.2-5.8 7.9-2.7 1.7-6.7 2.9-12.1 3.6l0.6 6 20.8-0.3 14.7-45-16.7-12.2-4 4.5c4.1 3.6 6.6 6.9 7.7 9.8 1.2 3 1.2 6.2-0.1 9.8l-0.2 0.9-34.2-10.9c-4.8-1.6-7.7-2.9-8.7-4.3-1-1.4-1.1-3.2-0.4-5.8l-7.5-2.4-8.8 27.2 7.6 2.3c0.8-2.4 2-4 3.6-4.4zM89.1 469l0.4-0.1 49.7-6.9 2.5-12.9-41.4-24.4c-0.3-0.1-0.6-0.3-1.1-0.6-5.4-3.1-8.1-6.8-7.9-10.9l-7.8-1.4-4.5 23.5 7.6 1.5c0.5-2.4 1.2-3.9 2-4.7 0.9-0.7 2.2-1 3.7-0.6 0.2 0 0.5 0.1 0.8 0.2 0.3 0.1 0.6 0.2 1 0.3l8.2 4-3.3 17.3-9.3 1.3c-0.4 0.1-0.8 0.1-1.3 0.1-0.5-0.1-1-0.1-1.6-0.2-1.3-0.2-2.2-0.8-2.6-1.7-0.4-0.9-0.4-2.4 0-4.4l0.1-0.7-7.6-1.4-5.3 27.4 7.8 1.4c1.4-3.3 4.6-5.3 9.9-6.1z m20.5-28.6l17 9.5-19.1 1.9 2.1-11.4zM81.1 510c1.4-0.9 4.6-1.2 9.7-1l35.8 1.6v0.9c-0.1 3.7-1.3 6.7-3.5 9.2-2.1 2.3-5.6 4.5-10.7 6.5l2.2 5.6 20-5.6 2.1-47.3-19.3-7.4-2.7 5.3c4.8 2.5 8.1 5 10.1 7.5 1.8 2.6 2.7 5.7 2.5 9.4l-0.1 0.9-35.8-1.7c-5.1-0.2-8.3-0.8-9.5-1.9-1.4-0.9-2-2.8-1.9-5.5l-7.9-0.3-1.4 28.4 7.9 0.4c0.3-2.4 1.2-4 2.5-5zM103.2 590.2c-5.9-2.4-10.6-5.4-14.2-9.3-3.6-3.8-5.7-7.8-6.3-12.1-0.3-2.6 0-4.3 0.9-5.3s3-1.8 6.4-2.2l14.9-1.8 0.3 2.8c0.3 2.2-0.3 4.1-1.9 5.5-1.6 1.4-4.2 2.6-7.9 3.5l0.7 6 28.9-3.4-0.7-6c-4.1 0.3-6.9 0-8.3-0.9-1.3-0.8-2.2-2.7-2.6-5.6l-0.4-2.8 9.2-1c3.4-0.5 5.7-0.3 6.8 0.5 1 0.8 1.8 2.4 2.1 4.9 0.5 4.3-0.2 8.4-2.2 12.3-2 3.9-5.3 7.7-9.8 11.2l3.8 4.9 18.3-9.9-5.8-47.1-7.8 0.9c0.2 2.5-0.2 4.3-1.4 5.4-1.3 1.1-4.3 1.8-9.6 2.4L92.2 546c-5.2 0.6-8.5 0.6-10-0.1-1.4-0.8-2.3-2.4-2.6-5l-7.9 0.9 5.9 48.3 22.9 6 2.7-5.9zM126.5 677.5c1.5 0.3 3 1.6 4.5 3.9l6.9-2.7-9.6-24.8-7 2.7c0.8 2.4 1 4.3 0.3 5.7-0.5 1.4-1.9 2.5-4.1 3.3-3.1 1.3-6 1.3-8.6-0.1-2.7-1.2-4.6-3.5-5.9-6.8-1.6-4.1-0.9-8.1 2-11.7 3-3.7 8.1-6.9 15.3-9.6 7.5-2.9 13.6-3.9 18.4-3.3 4.9 0.8 8 3.2 9.7 7.3 1.3 3.3 1.2 6.8-0.2 10.2-1.4 3.5-4.4 7.6-8.8 12.2l5 5.2 18.4-12.7-1.9-5.1-2.9-0.2c0.3-2.5 0.3-4.8 0.1-6.9-0.3-2-0.8-4.1-1.5-6.1-3.1-7.9-8.5-13.3-16.3-16.2-7.8-2.9-16.1-2.6-25.1 0.8-9.7 3.8-16.5 9-20.7 15.6-4.1 6.7-4.7 13.7-1.8 21.1 1.2 3.1 2.8 5.8 4.6 7.9 1.9 2.1 4.2 4.1 7.1 5.7l-4.1 4.1 3.1 7.9 15.9-6.1c3.4-1.3 5.8-1.7 7.2-1.3zM183.4 696.3l-15.9-28.8-6.9 3.8c1.2 2.5 1.5 4.4 0.8 5.8-0.8 1.5-3.3 3.5-7.8 6l-21.8 11.7c-4.5 2.4-7.5 3.5-9.2 3.4-1.6-0.2-3.1-1.5-4.6-3.9l-6.9 3.8 13.9 25.2 7-3.7c-1.3-2.5-1.5-4.4-0.8-5.9s3.4-3.4 7.9-5.8l7.1-3.9 2.7 5-15.6 29.2 8.9 16.1 6.8-3.7c-0.9-1.9-1.2-3.7-1.1-5.4 0-1.6 0.6-3.5 1.7-5.7l8.5-17.8c3.5 3.3 6.9 5.2 10.4 5.8 3.5 0.5 7.1-0.2 11-2.2 5.2-2.8 8-6.6 8.6-11.5 0.7-4.6-0.8-10.5-4.7-17.5z m-6.8 9.5c-0.5 2.8-2.1 4.8-4.7 6.3-3 1.6-5.8 1.6-8.6 0.1-2.7-1.6-5.5-4.8-8-9.5-0.4-0.7-0.8-1.3-1-1.7-0.2-0.4-0.4-0.8-0.5-1.2l10.4-5.5c3-1.6 5.1-2.2 6.4-2 1.3 0.3 2.6 1.7 3.9 4.1 1.9 3.4 2.5 6.6 2.1 9.4zM168 772.7c0.5-1.6 2.9-3.9 6.9-6.8l20.1-14.3c4-2.9 6.9-4.5 8.6-4.4 1.7 0 3.4 1.1 5.2 3.3l6.4-4.7-17.2-23.5-6.4 4.6c1.6 2.4 2 4.3 1.5 5.8-0.5 1.6-2.8 3.8-6.9 6.8l-20.1 14.4c-4 2.8-7 4.4-8.6 4.3-1.7 0-3.4-1.1-5.1-3.3l-6.5 4.6 17.2 23.5 6.4-4.5c-1.6-2.3-2.1-4.2-1.5-5.8zM236.8 771.1L219 749.4l-6.2 4.9c1.6 2 2.2 3.7 1.7 5.2-0.5 1.6-2.7 3.9-6.9 7.2l-19 15.3c-4.1 3.2-7 4.9-8.5 5-1.6 0.2-3.2-0.7-4.9-2.7l-6.2 4.9 17.8 21.9c6.9 8.3 14.1 13 22.1 13.9 7.9 1 15.9-1.7 23.9-8.2 8.1-6.5 12.5-13.6 13.2-21.4 0.5-7.8-2.5-15.9-9.2-24.3z m-3.2 18.7c-1.4 5.1-5 10.1-10.9 14.8-5.8 4.6-11.5 7.1-16.8 7.3-5.4 0.2-9.7-1.9-13.2-6.1-1.5-1.9-2.3-3.5-2.1-4.7 0.2-1.2 1.6-2.9 4.4-5.1l25.2-20.1c2.8-2.2 4.8-3.3 6-3.2 1.2 0.1 2.6 1.1 4.2 3 3.4 4.3 4.5 9 3.2 14.1zM307.3 862l8.3-23.2-3.7-2.7-3.2 2.5c-1.1-2.6-2.3-4.8-3.7-6.7-1.4-1.9-3.1-3.5-4.8-5-6.9-5.1-14.4-7-22.7-5.5-8.3 1.5-15.3 6.1-21.2 13.8-6.2 8.1-9 16.3-8.3 24.5 0.7 8.2 4.7 15.1 12.1 20.7 5.1 3.9 10.6 5.9 16.4 6.2 5.9 0.3 12-1.5 18.6-4.9l-3.6-6.9c-4.4 2.1-8.8 3.1-13.2 2.9-4.4 0-8-1.1-10.8-3.3-4.1-3.1-6.1-7.3-5.8-12.5 0.3-5.3 2.7-10.9 7.4-16.9 4.5-6 9.4-10 14.4-11.7 4.9-1.8 9.3-1.3 13.2 1.6 3 2.3 4.7 5.7 5.6 10.1 0.8 4.6 0.5 9.6-1 15.2l6 1.8zM366.7 873.4c-2.6-8-8-14-16.5-17.9-8.4-4-16.5-4.4-24.4-1.4-7.8 3.1-13.9 9.1-18.2 18.1-4.3 9-5.2 17.5-2.6 25.4 2.6 8 8 13.9 16.4 17.9 8.4 3.9 16.5 4.4 24.4 1.3 7.9-3.1 14-9.1 18.3-18 4.3-9 5.2-17.5 2.6-25.4z m-17.1 18.5c-3.4 7.2-7.3 12.1-11.6 15.1-4.3 2.8-8.7 3.3-12.9 1.2-4.4-2-6.8-5.6-7.3-10.7s1-11.2 4.4-18.5c3.5-7.2 7.4-12.2 11.7-15.1 4.3-2.8 8.7-3.3 13-1.3 4.3 2.1 6.6 5.6 7.1 10.8 0.5 5.2-1 11.3-4.4 18.5zM429.2 903c1.7-5.5 1-10.3-1.9-14.1-3-3.9-8.3-6.9-15.9-9.2l-31.8-9.4-2.2 7.4c2.6 0.9 4.2 2.2 4.7 3.7s0 4.7-1.4 9.6l-7.1 23.5c-1.5 4.8-2.8 7.7-4.1 8.7-1.2 0.9-3.3 1.2-6 0.5l-2.3 7.6 27.9 8.3 2.2-7.6c-2.6-0.8-4.2-2.1-4.7-3.6-0.5-1.6 0-4.8 1.4-9.6l2.4-7.7 5.5 1.7 9.7 31.6 17.8 5.2 2.3-7.3c-1.9-0.9-3.5-1.8-4.6-3-1.2-1.3-2.2-3-2.9-5.4l-6.6-18.6c4.9-0.1 8.6-1.1 11.6-3.1 2.7-1.9 4.7-5 6-9.2z m-14.9-4.1c-1 3.2-2.9 5.2-6 6-3.1 0.9-7.2 0.5-12.5-1.2-0.9-0.3-1.5-0.4-2-0.5-0.4-0.1-0.8-0.3-1.1-0.4l3.4-11.2c0.9-3.2 2-5.2 3.2-5.8 1.2-0.7 3.1-0.6 5.6 0.1 3.8 1.1 6.6 2.8 8.2 5.1 1.7 2.4 2.1 5 1.2 7.9zM471.7 891.8l-30.4-3.8-1 7.7c2.5 0.4 4.2 1.3 4.9 2.7 0.7 1.4 0.7 4.7 0.1 9.9l-3.1 24.2c-0.7 5.2-1.5 8.2-2.6 9.4-1.1 1.2-2.8 1.6-5.4 1.4l-1 7.8 28 3.5 0.9-7.7c-2.6-0.5-4.2-1.3-4.9-2.8-0.7-1.4-0.8-4.6-0.1-9.7l0.9-6.5 9.9 1.3c7 0.9 12.6 0.1 16.5-2.6 3.9-2.5 6.2-6.9 7.1-13 0.8-6.2-0.4-11.2-3.8-14.9-3.4-3.8-8.7-6-16-6.9z m4.7 19.2c-0.4 3.6-1.9 6.3-4.4 7.9-2.4 1.6-5.9 2.1-10.3 1.6-0.6-0.1-1.2-0.2-1.6-0.3-0.4-0.1-0.7-0.1-1.2-0.2l1.8-13.6c0.4-3.3 1.1-5.4 2-6.3 0.8-0.9 2.3-1.3 4.5-1 3.3 0.4 5.8 1.7 7.3 3.9 1.7 2 2.3 4.7 1.9 8zM556.7 925.4c-0.3-9.9-3.6-17.9-9.6-23.7-6-5.9-13.7-8.7-23-8.4-9.2 0.5-16.7 3.7-22.2 10-5.6 6.4-8.1 14.4-7.8 24.3s3.5 17.9 9.6 23.8c6 5.9 13.5 8.7 23 8.3 9.2-0.3 16.6-3.6 22.2-10 5.5-6.3 8.1-14.4 7.8-24.3z m-19.5 19.2c-2.4 4.5-6.1 6.9-10.9 7-4.8 0.2-8.6-1.9-11.5-6.2-2.8-4.3-4.3-10.4-4.6-18.3-0.3-7.9 0.8-14.2 3.3-18.7s6.1-6.8 10.9-7c4.8-0.1 8.5 1.9 11.4 6.2 2.8 4.4 4.5 10.5 4.7 18.4 0.4 7.9-0.7 14-3.3 18.6zM622.3 936.9c-1.6-0.6-3.3-1.7-4.9-3.5l-14.2-13.8c4.3-2.1 7.3-4.7 9-7.7 1.7-3.1 2.2-6.7 1.6-11.1-1-5.7-3.7-9.6-8-11.9-4.4-2.2-10.5-2.6-18.4-1.3l-32.7 5.3 1.3 7.8c2.7-0.4 4.7 0 5.8 1.2 1.2 1.2 2.2 4.2 3 9.2l4 24.2c0.8 5 0.9 8.3 0.1 9.6-0.7 1.5-2.4 2.5-5.1 3l1.3 7.7 28.6-4.6-1.3-7.7c-2.8 0.4-4.6-0.1-5.8-1.2-1.2-1.2-2.1-4.3-2.9-9.3l-1.3-7.9 5.7-0.9 22.7 24.3 18.3-3.1-1.2-7.5c-2.2 0.1-4-0.1-5.6-0.8z m-26.5-25.3c-2.4 2.1-6.2 3.5-11.7 4.4-0.9 0.1-1.6 0.3-2 0.4-0.5 0-0.9 0.1-1.3 0.1l-2-11.6c-0.5-3.3-0.4-5.5 0.3-6.7 0.8-1 2.5-1.9 5.2-2.2 3.9-0.6 7.1-0.3 9.5 1 2.5 1.4 4 3.6 4.5 6.6 0.8 3.2-0.1 6-2.5 8zM681.3 908.2l-0.3-0.3-32.3-38.2-12.3 4.7 1 47.7v1.2c0.1 6.2-1.6 10.4-5.2 12.5l2.9 7.3 22.5-8.6-2.8-7.1c-2.2 0.7-3.9 1-5.1 0.8-1.2-0.4-2-1.3-2.6-2.8-0.1-0.2-0.2-0.5-0.3-0.8-0.1-0.4-0.1-0.7-0.2-1l-0.9-9.1 16.6-6.3 6 7.1c0.3 0.3 0.5 0.7 0.7 1 0.3 0.5 0.4 0.9 0.7 1.4 0.4 1.2 0.4 2.2-0.2 3.1-0.5 0.8-1.8 1.6-3.6 2.3l-0.7 0.3 2.8 7.2 26.2-10-2.8-7.4c-3.2 0.8-6.7-0.9-10.1-5z m-35.4-2.1l-0.9-19.3 11.8 15.1-10.9 4.2zM722.1 896.2c-1.5-0.8-3.5-3.4-5.8-7.8L699.6 857l0.9-0.4c3.3-1.8 6.6-2.3 9.7-1.7 3.2 0.6 6.9 2.4 11.2 5.8l3.8-4.7-15.2-14.1-42.2 22 3.3 20.3 6-0.4c-0.3-5.4 0.2-9.6 1.5-12.5 1.2-2.9 3.5-5.2 6.9-7l0.8-0.4 16.7 31.5c2.4 4.4 3.5 7.4 3.3 9s-1.5 3.1-3.8 4.4l3.7 6.9 25.5-13.3-3.7-7c-2.5 1.4-4.5 1.5-5.9 0.8zM767.3 868.2c-1.7-0.5-3.9-2.9-6.7-7l-14-20.2c-2.8-4.1-4.2-7-4.2-8.7 0.1-1.6 1.2-3.3 3.5-5l-4.5-6.4-24.2 16.5 4.5 6.4c2.4-1.4 4.4-1.9 5.9-1.4 1.6 0.6 3.8 2.9 6.7 7l14 20.2c2.9 4.1 4.3 7 4.3 8.7-0.1 1.6-1.2 3.3-3.5 5l4.4 6.4 24.3-16.5-4.5-6.5c-2.4 1.6-4.5 2-6 1.5zM811.5 808.1c-5.9-7.9-13.1-12.8-21.4-14.2-8.3-1.5-16.2 0.5-23.7 6-7.5 5.6-11.7 12.5-12.6 20.8-0.9 8.3 1.6 16.3 7.6 24.3s13.2 12.7 21.5 14.2 16.2-0.5 23.7-6c7.4-5.5 11.6-12.4 12.6-20.8 0.9-8.2-1.6-16.4-7.7-24.3z m-9.8 38.6c-3.9 2.8-8.2 3.2-13 1.2-4.8-2-9.6-6.1-14.4-12.5-4.8-6.4-7.5-12.1-8-17.2s1.2-9.1 5-12c3.8-2.8 8.1-3.2 12.9-1.2 4.8 2 9.6 6.2 14.5 12.5 4.7 6.4 7.4 12.1 7.9 17.2 0.5 5.2-1.2 9.1-4.9 12zM914.6 695.8c-3.1-7.9-9.1-13.9-18.2-18.2-9.2-4.2-17.7-5.1-25.7-2.5-8.1 2.6-14 8.1-18 16.4-4 8.3-4.4 16.4-1.3 24.2 3.1 7.7 9.2 13.8 18.3 18 9 4.2 17.6 5.1 25.6 2.5 8.1-2.5 14.2-8 18.1-16.3 3.9-8.4 4.4-16.4 1.2-24.1z m-8.6 20.5c-2.1 4.3-5.7 6.7-10.8 7.2-5.2 0.5-11.4-0.9-18.7-4.3-7.3-3.4-12.4-7.3-15.3-11.5-3-4.3-3.3-8.5-1.3-12.8 2-4.2 5.6-6.6 10.7-7.1 5.3-0.5 11.5 0.9 18.8 4.3 7.3 3.4 12.3 7.2 15.2 11.4 3 4.3 3.4 8.6 1.4 12.8zM926.4 657.2c-1.6 0.5-4.7-0.1-9.5-1.8l-10.2-3.5 0.9-2.5c0.9-2.5 2.4-4.1 4.5-4.9 2.2-0.7 5-0.7 8.7 0.1l1.8-5.1-28.3-9.6-1.8 5.1c3.6 1.4 6 3 6.9 4.5 0.8 1.5 0.7 3.9-0.3 7.1l-0.9 2.5-8.4-2.9c-3.3-1.1-5.2-2.2-5.8-3.5-0.5-1.2-0.4-3.3 0.5-5.9 1.5-4.2 3.9-7.6 7.2-10.3 3.4-2.7 7.7-4.7 12.9-6l-1-5.8-20.2 1.9-15.8 45.4 7.4 2.5c1.1-2.5 2.5-4 4.1-4.5 1.5-0.6 4.6 0.1 9.4 1.8l23.5 7.9c4.8 1.7 7.7 3.2 8.6 4.5 0.9 1.4 0.9 3.3 0.2 6l7.5 2.6 9.6-27.6-7.5-2.6c-1 2.6-2.3 4.1-4 4.6zM957.1 551.7c-2.6-5.1-7.1-9.6-13.4-13.6l-4.4 6.5c4 2.8 7.1 6.2 9.1 10 2.2 3.9 3 7.5 2.5 11-0.7 5.2-3.4 8.8-8.1 11.2-4.8 2.3-10.9 3-18.6 1.9-7.5-1-13.3-3.2-17.4-6.6-4.1-3.4-5.8-7.5-5.1-12.2 0.5-3.6 2.4-6.9 6-9.8 3.6-3 8.2-5.2 13.8-6.6l-1.3-6.3-24.5 4.3-0.6 4.5 3.8 1.6c-1.8 2.2-3.1 4.4-4.1 6.5-1 2.1-1.7 4.3-2 6.5-1.2 8.5 1 15.9 6.4 22.3 5.4 6.3 13 10.2 22.6 11.4 10.2 1.4 18.6-0.3 25.6-4.9 6.9-4.7 11-11.6 12.2-20.6 1.2-6.2 0.2-11.9-2.5-17.1zM947.4 473.6c-1.4 1-4.5 1.6-9.7 1.8l-24.6 1c-5.2 0.3-8.5-0.1-9.9-1-1.3-0.9-2.1-2.6-2.3-5.3l-7.9 0.3 1.2 28.6 7.6-0.4c0-2.6 0.6-4.4 2-5.4 1.3-1.1 4.5-1.6 9.7-1.8l6.5-0.3 0.9 21.7-6.4 0.3c-5.1 0.1-8.3-0.2-9.8-1-1.5-0.9-2.3-2.7-2.5-5.3l-7.6 0.3 1.2 28.5 7.9-0.3c0-2.6 0.6-4.4 2-5.4s4.5-1.6 9.7-1.8l24.7-1c5-0.1 8.3 0.1 9.7 1 1.4 0.9 2.2 2.6 2.4 5.3l7.9-0.3-1.2-28.4-7.7 0.3c0.1 2.7-0.6 4.5-1.8 5.4-1.3 0.9-4.5 1.6-9.7 1.8l-10.8 0.4-0.9-21.7 10.8-0.4c5.1-0.2 8.4 0.1 9.8 1 1.5 0.9 2.2 2.7 2.4 5.3l7.6-0.3-1.2-28.5-7.9 0.3c-0.2 2.5-0.9 4.3-2.1 5.3zM941.9 434.6c-1.2 1.2-4.2 2.3-9.1 3.1l-24.4 4.3c-4.9 0.9-8.2 1-9.7 0.3-1.5-0.8-2.6-2.4-3.3-5.2l-7.8 1.4s0.8 3.4 2.4 13 2.8 15.6 2.8 15.6l7.8-1.4c-0.3-2.8 0-4.7 1.2-5.9 1.2-1.2 4.2-2.3 9.3-3.2l24.3-4.3c4.9-0.9 8.2-1 9.7-0.2 1.5 0.7 2.6 2.4 3.2 5.1l7.8-1.4-5.2-28.6-7.8 1.4c0.3 2.9 0 4.8-1.2 6zM882.4 381.1c-1.6-0.5-2.8-2-3.6-4.6l-7.6 2.2 5.8 20.4 7.4-2.1c-0.6-2.6-0.4-4.5 0.7-5.8 1-1.1 4-2.4 8.9-3.8l16.6-4.7-29.9 29.1 6.6 23.4 7.8-2.1c-0.7-2.6-0.5-4.5 0.5-5.8 1.1-1.3 4.1-2.6 9-3.9l23.7-6.6c5-1.4 8.1-1.8 9.7-1.3 1.6 0.5 2.8 2.1 3.6 4.5l7.6-2-5.9-20.7-7.4 2.1c0.6 2.6 0.4 4.6-0.6 5.7-1.1 1.3-4.1 2.6-9 3.9l-28.7 8.1 40.2-39.4-2.9-10-42.8 11.9c-4.9 1.6-8.2 2.1-9.7 1.5zM863.9 363.8l48.2-3.5c0.3 0 0.7-0.1 1.2-0.1 6.3-0.5 10.6 1.1 12.8 4.3l7.3-3.2-9.9-21.8-7.1 3.2c0.9 2.2 1.4 3.9 1.1 5-0.3 1.2-1.1 2-2.6 2.7-0.2 0.1-0.5 0.2-0.9 0.3-0.3 0.1-0.7 0.2-0.9 0.3l-9.2 1.4-7.3-16.1 6.9-6.3c0.3-0.2 0.6-0.5 1-0.7 0.4-0.3 0.9-0.5 1.4-0.7 1.2-0.5 2.2-0.6 3.2 0 0.8 0.5 1.6 1.8 2.5 3.5l0.2 0.6 7.2-3.1-11.6-25.4-7.3 3.2c1 3.2-0.4 6.7-4.3 10.4l-0.3 0.1-36.8 34 5.2 11.9z m26.6-21.7l4.8 10.6-19.4 2M830.5 748.1c-0.5-1.6 0.1-3.5 1.8-5.6l-6.1-5-13.8 16.3 5.9 4.9c1.8-1.9 3.5-2.8 5.2-2.6 1.6 0.2 4.3 2 8.2 5.2l13.2 10.9-41.1-8.1-15.8 18.6 6 5.1c1.8-2 3.5-2.9 5.1-2.8 1.7 0.1 4.5 1.9 8.3 5.1l18.9 15.6c3.9 3.3 6.1 5.7 6.5 7.3 0.5 1.5-0.1 3.4-1.8 5.5l6.1 5.1 13.9-16.4-6-4.9c-1.8 1.9-3.6 2.8-5.2 2.7-1.7-0.2-4.4-1.9-8.3-5.1l-22.8-19 55.4 10.7 6.7-8-34-28.3c-3.7-3.3-5.9-5.7-6.3-7.2zM320.9 587.9c18.7 6.1 38.5 11.1 59.1 14.9-4.3-27.3-6.7-56.1-6.7-85.8 0.1-140.7 52.6-260.5 126-305.7-57.9 63.3-95.4 164.7-95.5 279 0 41.4 4.9 81.2 14 118.1 27.5 3.1 56.1 4.2 85.5 3 154.3-6 283.2-71.8 328.4-158.2-27.4-153-161-269.2-322-269.3h-0.3C400 214 317.1 355.3 317 525.2c0 21.5 1.4 42.4 3.9 62.7zM403.2 679.4c-5.2-15.7-9.6-32.2-13.1-49.4-21.5-4.8-41.8-10.8-60.5-17.8 2.8 16.9 6.4 33.3 10.9 49.2 19.7 7.1 40.7 13.2 62.7 18zM416.9 715.3c-21.6-2.8-42.4-6.7-62.1-11.5 16.1 40.8 37.7 76.3 63.3 104.4-35.3-21.8-65.7-60.8-87.8-111-48.6-14.7-89.6-35.5-118.9-60.6 48.2 120.5 166 205.6 303.8 205.7 7.6 0 15.2-0.3 22.7-0.8-49.5-14.2-92.3-60.6-121-126.2z M537.3 642.3c-37.2 1.5-73.2-0.4-106.8-5.1 5.4 17.5 11.7 34.3 18.9 50.2 24.2 3.1 49.3 4.8 75 4.9 118 0.1 222.7-34.5 288-87.8-46.7 67.6-170.2 116.1-315.4 116-10.4 0-20.7-0.3-30.9-0.8 32.4 55.9 76.6 96.4 127 113.3 142.6-34.7 248.6-162.7 249.6-315.7-45.2 67.9-164.1 119.5-305.4 125zM190.2 553c25 39.1 68 72.8 122.9 97.3-4.8-16-8.8-32.9-12.1-50.3-34.8-16.8-62.3-37.7-80-61.6 21.8 16.7 47.8 31.1 76.9 42.9-3.7-25.3-5.6-51.7-5.6-79 0.1-130.5 45.2-243 110.4-294.7C277.5 253.5 188.1 373.7 188 514.9c0 12.9 0.8 25.6 2.2 38.1z M167 515c0 192.3 155.9 348.2 348.3 348.2 192.3 0 348.2-155.9 348.2-348.2 0-192.4-155.9-348.3-348.2-348.3-192.4 0-348.3 156-348.3 348.3z m348.3-340.2c187.9 0 340.2 152.3 340.2 340.2 0 187.9-152.3 340.2-340.2 340.2-187.9 0-340.2-152.3-340.2-340.2 0-187.9 152.3-340.2 340.2-340.2z";*/ -fx-shape: "M890.76 623.29c-2 6.51-3.27 13.14-5.63 19.59-35.77 97.63-107.49 175.65-201.95 219.7C630.8 887 575.23 899.39 518 899.39c-52.2 0-102.23-11.87-148.7-31.51-24.5 4.26-48.84 7.94-72.52 9.95-13.34 1.13-24.97 1.8-35.96 2.25 75.15 52.43 164.79 81.55 257.19 81.55 64.17 0 129.43-13.7 191.48-42.64 152.06-70.9 245.13-215.38 258.67-370.84-7.63 8.57-15.03 17.15-23.44 25.72-16.65 16.94-35.05 33.29-53.96 49.42z M1012.01 264.62c-21.89-46.94-71.87-76.62-139.28-89.83 12.48 13.42 24.72 28.02 36.84 44.2 17.23 23.01 30.18 44.14 41.49 65.21 1.87 3.49 3.92 7.02 5.68 10.52 7.92 20.48 5.44 47.02-6.6 77.12-9.44 23.6-24.75 49.25-45.42 75.79-3.07 3.94-5.86 7.83-9.16 11.8-7.04 8.46-14.73 16.83-22.58 25.18-67.75 72.09-164.54 139.45-276.75 191.77-111.82 52.15-225.4 82.97-324.02 88.67-10.97 0.63-21.89 1.19-32.46 1.19-4.83 0-9.29-0.33-13.97-0.47-0.44-0.01-0.8-0.09-1.24-0.11-32.83-1.07-61.8-5.43-85.74-12.87-0.5-0.16-0.89-0.37-1.38-0.53-0.03-0.01-0.04-0.02-0.07-0.03-31.33-9.98-53.77-25.05-64.74-44.32-1.84-4.18-3.41-8.49-5.13-12.73-9.72-23.88-18.18-48.41-24.06-73.78-4.18-18.02-7.14-36.65-9.16-55.62-33.24 60.14-42.6 117.5-20.71 164.44 26.62 57.09 94.17 89.3 184.9 96.61 13.3 1.07 27.06 1.64 41.3 1.64 17.18 0 35.2-1.06 53.57-2.62 99.04-8.41 213.76-39.22 329.21-93.06 117.2-54.65 215.79-123.97 286.1-195.56 23.56-23.99 44.05-48.2 60.81-72.24 50.88-73.02 68.78-144.15 42.57-200.37z M67.66 514.54c0.14 32.84 3.51 65.9 11.11 98.67 0.09 0.4 0.25 0.79 0.34 1.19 4.43 18.91 10.57 37.63 17.55 56.21 0.25 0.69 0.18 1.28 0.46 1.98 0.18 0.6 2.05 6.08 2.22 6.71 0.13 0.23 0.94 0.61 1.17 0.86 5.07 5.53 32.28 16.2 52.62 22.67l13.75 4.37c5.38 1.23 11.94 1.76 17.87 2.69 0.02 0 0.04 0.01 0.06 0.01-6.74-11.16-13.55-22.3-19.13-34.27-21.03-45.1-32.74-92.86-35.53-141.12-1.88-32.47 0.6-65.1 7.05-97.37 3.93-19.66 8.94-39.21 15.98-58.41 3.32-9.08 7.27-17.8 11.21-26.53 3.68 4.86 7.78 9.66 12.85 14.19 24.08 21.52 57.43 30.67 99.21 27.42 45.3-3.62 59.03 6.03 62.09 9.07 1.98 1.95 2.3 3.75 2.46 3.75 0 0 0.03 0 0.03-0.03l-0.84 4 0.46 4.08c1.11 10.18 12.81 61.89 136.87 80.73 0.38 0.03 0.99 0.03 1.8 0.03 9.09 0 44.39-1.72 64.8-27.45 9.34-11.78 18.64-32.69 9.83-65.56l-2.38-5.87c-11.93-21.5-30.92-72.75-13.55-94.02 37.17-45.48 30.39-116.66 29.55-123.95-0.13-1.55-2.92-28.48-20.06-54.51 57.04 4.22 111.61 20.64 160.45 47.6 28.58 15.78 55.01 34.93 78.83 57.33 35.09 33 64.84 72.04 85.8 117 5.47 11.73 9.53 23.82 13.72 35.87 0.11 0.32 0.19 0.64 0.3 0.96l0.03-0.06c6.38-10.56 11.56-20.74 15.36-30.21 7.53-18.81 17.08-45.55 16.17-52.79-0.04-0.3 0.18-1.07 0.1-1.3l-1.1-2-1.59-1.54c-0.04-0.09-0.12-0.13-0.16-0.21-10.66-18.87-22.17-36.99-34.9-53.98-11.23-15-23.3-29.12-35.93-42.58-0.31-0.37-0.47-0.93-0.79-1.28l-3.01-2.41c-8.91-9.25-17.86-18.46-27.57-26.72-26.13-22.22-54.76-40.89-84.89-56.51-14.65-7.6-29.7-14.36-45.07-20.28-30.74-11.83-62.76-20.25-95.49-25.16a462.045 462.045 0 0 0-49.55-4.71c-5.97-0.24-11.87-1.1-17.87-1.1h-0.02c-64.17 0-129.43 13.7-191.48 42.64l-0.01 0.01c-0.01 0.01-0.02 0.01-0.03 0.01-131.67 61.37-218.68 178.06-248.77 309.07-2.64 11.51-4.42 23.2-6.31 34.87l0.02 0.14c-3.58 22.07-6.2 44.31-6.14 66.88-0.01 0.31 0.05 0.61 0.05 0.92z m287.45-355.49c33.42-15.58 68.25-25.7 103.89-31.38 12.41 0.92 22.91 4.35 31.38 10.28 22.23 15.55 25.5 45.02 25.58 45.71 1.7 15.73 1.75 61.79-18.11 86.07-40.87 50.09-3.24 129.93 6.66 148.82 1.22 5.52 2.13 13.19-0.99 17.17-4.51 5.77-18.21 7.98-21.25 8.18-63.26-9.72-85.69-28.54-89.59-34.06 0.46-11.85-3.09-27.5-14.74-40.72-19.4-21.95-54.98-31.02-105.65-26.99-26.61 2.25-46.97-2.53-60.09-14.03-11.97-10.44-15.82-24.7-17-31.46 39.29-59.11 93.86-106.79 159.91-137.59z"; -jfx-size: 20px; -fx-background-color: -fx-text-color; } -.lfx-decorator-button { +.jfx-decorator-button { -fx-fill: -fx-text-color; -fx-text-fill: -fx-text-color; -fx-prompt-text-fill: -fx-text-color; diff --git a/falsework-client/src/main/resources/css/app-light.css b/falsework-client/src/main/resources/css/app-light.css index 048b555..7b3a384 100644 --- a/falsework-client/src/main/resources/css/app-light.css +++ b/falsework-client/src/main/resources/css/app-light.css @@ -40,6 +40,8 @@ .jfx-svg-glyph { -fx-background-color: -fx-text-color; + -jfx-size:15px + } .glyph-icon { @@ -217,34 +219,34 @@ * * *******************************************************************************/ -.lfx-decorator { +.jfx-decorator { -fx-decorator-color: -fx-main-base; -fx-background-color: -fx-main-base; -fx-background-radius: 11; } -.lfx-decorator .lfx-decorator-buttons-container { +.jfx-decorator .jfx-decorator-buttons-container { -fx-background-color: -fx-decorator-color; } -.lfx-decorator .resize-border { +.jfx-decorator .resize-border { -fx-border-color: -fx-decorator-color; - -fx-border-width: 0; + -fx-border-width: 0 4 4 4; } -.lfx-decorator .lfx-decorator-title-container .lfx-decorator-text { +.jfx-decorator .jfx-decorator-title-container .jfx-decorator-text { -fx-fill: -fx-text-color; -fx-font-size: 16px; } -.lfx-decorator .lfx-decorator-title-container .jfx-svg-glyph { +.jfx-decorator .jfx-decorator-title-container .jfx-svg-glyph { /*-fx-shape: "M223.3 179.2l-6.9-6.9-5.9 6.6-41 42.3-6.4 6.4 7.2 6.5 43.6 41.3 7.4 7.4 7.6-8-1-0.8 38.1-39.3 1.4 1.3 7.8-8m-54.3 39.3L178 226.5l38.1-39.3 43 40.8-38.2 39.3z M188.9 222.7l-5.6 5.4 7.1 6.9 5.2-5.8 8.1-8.4 6.3 6-6.4 6.7-5.6 5.5 7.1 6.6 5.3-5.7 6.4-6.7 8.8 8.3-8.7 9-5.8 5.6 7 6.6 5.4-5.9 24.6-25.4 6-5.9-7-6.6-4.5 5.1c-0.2-2.3-0.2-4.3-0.4-6.2l-3.1 0.1-4.3 0.3c-0.8 0-1.8 0-3.1-0.1l4.9-4.6-7.2-6.8-3.9 4.3-7.8 8.1-6.5-6 8.3-8.5 5.8-5.4-7.2-6.9-5.7 6.3-23.5 24.1z m39.9-1.8c0.1 2.4-0.1 4.6-0.5 6.5 4.1-0.5 6.8-0.6 7.9-0.5 1.2 0.1 2.4 0.2 3.2 0.4l-6.1 6.3-8.7-8.3 4.2-4.4zM346.9 144.6c1.8-3.3 3.9-7.1 6.4-11.4-4.5-0.6-7.3-1.1-8.3-1.4-1-0.3-2.2-0.7-3.5-1.3l-2.1 5.7c-0.5 1.6-2.8 6-6.9 13.5l-2.7-1.3c-0.9-0.5-3.1-0.9-6.4-1.4 1.9-2.9 3.9-5.9 5.9-9-1.6-0.2-3.1-0.4-4.6-0.7l11.9-6.1 7.8-3.8-4.4-8.4-7.7 4.1-33.5 17.3-7.1 3.4 4.5 8.5 6.8-3.8 11.8-6.1c-5 6.9-9.6 11.9-13.8 14.9-4.1 2.9-7.3 5.3-9.8 6.9 3.5 1.9 5.7 3.1 6.6 3.8 0.8 0.6 1.9 1.4 2.9 2.4 4-3.7 7-6.3 8.8-8.1 1.8-1.6 4.2-4.3 7.5-7.8l1.3 0.3c-2.1 3.7-4.5 7.2-7.1 10.6-2.7 3.2-5 5.8-7 7.8-2 1.9-4.4 3.9-7.4 6.1 3 1.6 5 2.7 6.1 3.5 0.9 0.6 2 1.4 3.2 2.4 5.7-5.6 9.9-10.3 12.4-14 2.7-3.6 5.5-7.8 8.5-12.8 0.5 0.3 1.2 0.8 1.7 1.3-2 4.1-5.2 9.4-9.5 15.6-4.3 6.3-10.6 12.7-18.7 19l4.4 2.2c1.3 0.6 3.1 1.9 5.6 3.8l8.5-9.4c2.5-2.6 5.3-6.2 8.5-10.6 3.1-4.5 5.6-8.5 7.5-12l0.4 1c0.5 0.9 1.1 2.3 1.7 4 0.7 1.6 0.7 3.1-0.1 4.3-0.6 1.3-3.3 2.6-7.8 4.1l3.4 2.7c0.9 0.6 2.6 2.5 5.2 5.6 6.3-3.4 9.9-6.3 10.8-8.7 0.9-2.5 0.9-4.9 0.4-7.2-0.7-2.1-1.8-4.8-3.5-8-1.8-3.1-2.9-5.3-3.7-6.4-0.7-1-1.5-2.2-2.4-3.5l2.1-3.1c3.5 3.5 6.7 6.2 9.6 8.3 2.9 1.9 6.2 3.5 10 4.9 3.8 1.4 9.1 2.2 16 2.7 0.3-3.3 0.6-5.6 0.9-7 0.3-1.4 0.7-3.1 1.3-5.3-4.8 0.5-9.7 0.2-14.7-1-4.8-1-8.7-2.8-11.6-5.3-2.7-2.4-4.7-4.4-6.1-5.8z M280.2 150.5l2 4.4 10.3-5.3-2.4-4.2-2.8-5.5 52-26.9 3 5.8 2.2 4.5 10.3-5.2-2.6-4.4-4.6-8.7-2.8-5.9-8.3 4.6-23.1 11.9c0.3-0.8 0.7-1.8 1.3-2.8-2.5-0.7-6.3-1.7-11.4-2.8-2 3.1-3.3 5.2-3.9 6-0.6 0.9-1.5 1.9-2.4 3 2.7 0.6 4.8 1.2 6.4 1.8l-21.6 11.1-9.2 4.3 3.1 5.6 4.5 8.7zM415.5 124.3l1.2 9.3 11.3-1.8-0.3-1.3 17.2-2.7 2 13c0.3 2 0.7 3.6 1.4 4.8 0.7 1.1 1.9 2.1 3.8 2.8 1.9 0.7 4.5 0.9 8 0.3 3.5-0.5 7.9-1.1 13.5-1.8 5.8-0.7 10-1.4 12.8-1.9 2.8-0.6 4.8-1.3 6.1-2 1.3-0.8 2.4-1.9 3.4-3.4s1.9-5.4 2.8-11.8c-3.3-0.6-7.2-1.8-11.6-3.5v3.6c0.1 2.3-0.4 4-1.4 5.1-1 1.1-2.4 1.8-4.1 2.3-1.8 0.5-4.8 0.9-9.1 1.5l-9.8 1.3c-2.1 0.3-3.5 0.1-4.1-0.4-0.6-0.7-0.9-1.3-1.1-2.1l-1.5-9.4 19.5-3.1 0.3 1.7 11.2-1.7-1.6-8.7-5.5-35.2-1-7.9-7.3 1.4-23.5 3.6-0.8-5-0.9-7.1-11.6 1.8 1.4 7 0.7 5.1-19.8 3.1-8.6 1 1.6 7.9 5.4 34.2z m56.6-21.1l1.6 10.1-19.5 3.1-1.6-10.2 19.5-3z m-3.2-19.8l1.6 10.3-19.5 3-1.6-10.3 19.5-3z m-25.6 34.7l-17.1 2.6-1.6-10.2 17-2.6 1.7 10.2z m-4.8-30l1.7 10.4-17.1 2.6-1.6-10.3 17-2.7zM616.3 76.1l-51.8-9-10.9-2.3-1.7 10.9-9.5 53.4-2.2 11.7 11.7 2.1 2-11.8 1.9-10.9c1.9 2.7 3.1 4.6 3.7 5.6 0.5 1.1 1.2 2.2 1.7 3.3 4-3.8 6.5-6.4 7.6-7.7 1.1-1.3 2-2.4 2.7-3.5l0.8 2.6c0.2 0.5 0.3 1.7 0.5 3.9l2.4-1.6c1.5-0.9 4-2 7.7-3.3-1.4-4.6-2.9-9-4.6-13.2l1.5-2.9c0.5-1 1.5-3.3 3-6.8 2.3 3.9 3.7 6.5 4.2 7.6 0.4 1 1.4 3.5 2.6 7.1l-2 3.5c-1.4 2.5-3.3 4.9-5.4 7.3-2.1 2.3-5 4.6-8.5 7 2.7 2.2 4.5 3.7 5.3 4.7 0.8 0.9 1.7 2 2.6 3.1 2-1.4 3.7-2.8 4.9-4.1 1.3-1.3 4-4.3 8-9.1l1.4 5.3c0.2 0.5 0.5 2.1 1 4.8 3.6-2.5 6.9-4.6 9.8-6.2l-1-3.2c-0.1-0.3-1.7-4.5-4.7-12.4l2.3-5.4c0.8-2 1.8-4.7 3.1-8.1l1.8-5.2c0.1-0.5 0.4-1.5 0.9-2.6-3.6-0.9-7.2-2-10.9-3.5l-0.5 2.8c-0.3 1.5-1.1 4.4-2.5 8.7-1.2-2.4-2.2-4.7-3.3-6.6l-2.2 1.4c-1.3 0.8-3.5 1.6-6.5 2.3l1.8-4.5c0-0.1 0.3-0.8 0.7-2.2 0.5-1.3 0.9-2.5 1.3-3.4-4.3-1.1-7.8-2.4-10.6-3.9l-0.8 3.7c-0.3 1.5-0.7 2.9-1.1 4.3-0.4 1.2-0.9 2.7-1.6 4.1-1.3-2.8-2.5-5.3-3.4-7.6-2.7 1.5-4.5 2.4-5.4 2.6-0.9 0.3-1.8 0.6-2.8 0.8l2.2-12.3 50.8 8.8-9.3 52.5c-0.2 1.1-0.5 1.8-1 2.3-0.5 0.6-1.9 0.6-4.1 0.1-1.9-0.4-3.9-0.9-5.9-1.6l0.9 3.1c0.8 3 1.1 5.2 1 6.6 0 1.5-0.2 2.6-0.2 3.5 5.8 0.7 10.1 0.7 12.8 0.3 2.7-0.5 4.5-1.4 5.2-2.9 0.7-1.6 1.2-3.3 1.6-5.1l10-56.6 2.2-10.8-11.2-1.5zM562.5 95c0.4 0.9 2 4.4 4.5 10.4-1.8 3.5-3.5 6.1-5.1 7.9-1.6 1.8-3.6 3.7-6 5.6l4.9-27.3 1.7 3.4zM731.6 161.2c1.8 4.6 4.5 9.1 7.7 13.4 4.5-3 7.2-4.8 8.3-5.4 1.1-0.6 2.3-1.1 3.5-1.5-2.6-2.5-4.3-4.4-5.2-5.5-0.7-1.1-1.7-2.6-2.6-4.3-1-1.8-2-4.3-3.2-7.7-1.2-3.4-1.5-7.1-0.9-11 0.5-4 1.1-6.6 1.6-8.2 0.5-1.4 0.9-2.6 1.5-3.5 0.5-1 1-2 1.8-3-4-1.9-7.5-4-10.6-6.3-1.9 5-3.1 8.5-3.7 10.6-0.6 2.2-1 5.1-1.5 8.5-0.4 3.6-0.5 7.2 0 11 0.3 4.1 1.5 8.3 3.3 12.9zM676.6 139.4c5-1 10.6-2.4 16.8-4.3 6.2-1.9 11.3-4 15.3-6.3 4-2.2 8.9-5 14.7-8.3-2.8-3-5.3-6.3-7.6-10.1l-2.2 1.9c-3.5 3-7.5 5.6-12.1 7.8-4.7 2.1-9.5 3.9-14.6 5.2-5.2 1.3-9.7 1.8-13.6 1.3l1.2 2.8c0.5 1.7 1.3 5.1 2.1 10zM673.8 174.3c2.3 1 8.2 3.4 18 7.7 9.8 4.2 17.2 7.5 22.4 9.9 0.2 3 0.3 5 0.2 6.1-0.1 1.1-0.1 2.3-0.3 3.7l3.4-0.8c0.2-0.1 3.4-0.5 9.9-1.4-0.9-8.5-2.3-19.5-4.2-33l-2.4 0.3c-1.4 0.2-4.5 0.1-9.3-0.5l1.2 5.8c0.3 1.5 0.7 4.6 1.2 9.5-10.1-5-20.4-9.9-30.7-15.1 5-1.5 9.2-2.9 12.7-4.2 3.5-1.4 6.9-2.8 10.4-4.4l7.3-3.5c0.9-0.4 2.2-1 4-1.9-2.6-3.7-5-7.7-7.1-11.9l-1.8 1.7c-0.9 0.7-2.9 2.3-6.3 4.5-3.3 2.3-6.6 4.1-9.9 5.7-3.3 1.5-6.5 2.8-9.5 3.9-3.1 1.1-5.6 1.8-7.4 2.1-1.8 0.3-4.6 0.5-8.3 0.7l0.1 3.1c0.1 2-0.3 5.2-1.3 9.6 2.8 0.7 5.4 1.6 7.7 2.4zM821.3 234l-18.7-20-5.9-6.8-5.8 5.8-11.5 10.7-6.7 5.6 6.4 6.4 18.8 19.9 6.6 7.4 6.2-6.2 11.5-10.7 6.3-5.2-7.2-6.9z m-17 14l-16.5-17.5 9-8.3 16.5 17.4-9 8.4z M829.4 233.1l7.5 8.4 7.9-7.3-8.1-7.9-26.3-28-6.8-7.6-7.8 7.2 7.3 7.3z M855 233.2l-40.8 37.7c-1.3 1.2-2.2 1.7-2.9 1.8-0.7 0-1.7-0.6-3-1.9-0.5-0.4-1.3-1.3-2.3-2.4-1.1-1.2-2.1-2.4-3-3.4l-1.4 3.3c-0.8 1.8-1.6 3.3-2.6 4.5-0.9 1.2-1.8 2.3-2.6 3.3 5.4 5 9.2 7.9 11.7 8.8 2.4 0.9 4.1 1.2 5.2 0.8 1-0.3 2.6-1.4 4.5-3.3l45.4-41.8 7.2-6.1-7.2-7.3-36.2-38.5-7.9-8.7-8 7.3 8.4 8.4 35.5 37.5zM120.2 359.2c4.7 2.2 8.9 2.7 12.7 1.6 3.8-1.2 8-4.3 12.7-9.8 0.5-0.5 1.2-1.3 2.2-2.4 6.4-7.7 11.2-10.7 14.2-9.3 1.7 0.8 2.8 2.2 3.3 4.2 0.4 2 0 4.1-1.1 6.4-1.5 3.1-4.1 5.6-7.6 7.4-3.6 1.8-7.7 2.6-12.5 2.6l-0.5 6.4 19.4 4 2.4-4.9-2.4-2.5c2.2-1.2 4.2-2.6 5.8-4.3 1.6-1.7 3-3.7 4.1-5.8 2.6-5.3 3-10.5 1.3-15.7-1.8-5.2-5.3-9-10.6-11.5-2.7-1.3-5.4-1.9-8.1-2-2.7-0.1-5.3 0.5-7.6 1.6-1.1 0.6-2.7 1.7-4.5 3.5-1.8 1.8-4.2 4.2-7.2 7.3-0.4 0.5-0.9 1.1-1.7 2-5.8 6.5-10.3 9-13.3 7.5-2-1-3.4-2.7-4-5.3-0.6-2.4-0.3-5 1-7.6 1.8-3.8 5-6.6 9.4-8.6 4.5-2 9.8-2.9 16.1-2.7l0.6-7.1-24.5-4.2-2.3 4.7 3.2 2.6c-2.4 1.6-4.7 3.3-6.5 5.4-1.9 2.1-3.5 4.3-4.7 6.9-3 5.9-3.4 11.5-1.4 17 1.9 5.3 6 9.5 12.1 12.6zM96.8 396.5c1.6-0.4 4.8 0 9.5 1.5l34.2 10.9-0.2 0.9c-1.2 3.5-3 6.2-5.8 7.9-2.7 1.7-6.7 2.9-12.1 3.6l0.6 6 20.8-0.3 14.7-45-16.7-12.2-4 4.5c4.1 3.6 6.6 6.9 7.7 9.8 1.2 3 1.2 6.2-0.1 9.8l-0.2 0.9-34.2-10.9c-4.8-1.6-7.7-2.9-8.7-4.3-1-1.4-1.1-3.2-0.4-5.8l-7.5-2.4-8.8 27.2 7.6 2.3c0.8-2.4 2-4 3.6-4.4zM89.1 469l0.4-0.1 49.7-6.9 2.5-12.9-41.4-24.4c-0.3-0.1-0.6-0.3-1.1-0.6-5.4-3.1-8.1-6.8-7.9-10.9l-7.8-1.4-4.5 23.5 7.6 1.5c0.5-2.4 1.2-3.9 2-4.7 0.9-0.7 2.2-1 3.7-0.6 0.2 0 0.5 0.1 0.8 0.2 0.3 0.1 0.6 0.2 1 0.3l8.2 4-3.3 17.3-9.3 1.3c-0.4 0.1-0.8 0.1-1.3 0.1-0.5-0.1-1-0.1-1.6-0.2-1.3-0.2-2.2-0.8-2.6-1.7-0.4-0.9-0.4-2.4 0-4.4l0.1-0.7-7.6-1.4-5.3 27.4 7.8 1.4c1.4-3.3 4.6-5.3 9.9-6.1z m20.5-28.6l17 9.5-19.1 1.9 2.1-11.4zM81.1 510c1.4-0.9 4.6-1.2 9.7-1l35.8 1.6v0.9c-0.1 3.7-1.3 6.7-3.5 9.2-2.1 2.3-5.6 4.5-10.7 6.5l2.2 5.6 20-5.6 2.1-47.3-19.3-7.4-2.7 5.3c4.8 2.5 8.1 5 10.1 7.5 1.8 2.6 2.7 5.7 2.5 9.4l-0.1 0.9-35.8-1.7c-5.1-0.2-8.3-0.8-9.5-1.9-1.4-0.9-2-2.8-1.9-5.5l-7.9-0.3-1.4 28.4 7.9 0.4c0.3-2.4 1.2-4 2.5-5zM103.2 590.2c-5.9-2.4-10.6-5.4-14.2-9.3-3.6-3.8-5.7-7.8-6.3-12.1-0.3-2.6 0-4.3 0.9-5.3s3-1.8 6.4-2.2l14.9-1.8 0.3 2.8c0.3 2.2-0.3 4.1-1.9 5.5-1.6 1.4-4.2 2.6-7.9 3.5l0.7 6 28.9-3.4-0.7-6c-4.1 0.3-6.9 0-8.3-0.9-1.3-0.8-2.2-2.7-2.6-5.6l-0.4-2.8 9.2-1c3.4-0.5 5.7-0.3 6.8 0.5 1 0.8 1.8 2.4 2.1 4.9 0.5 4.3-0.2 8.4-2.2 12.3-2 3.9-5.3 7.7-9.8 11.2l3.8 4.9 18.3-9.9-5.8-47.1-7.8 0.9c0.2 2.5-0.2 4.3-1.4 5.4-1.3 1.1-4.3 1.8-9.6 2.4L92.2 546c-5.2 0.6-8.5 0.6-10-0.1-1.4-0.8-2.3-2.4-2.6-5l-7.9 0.9 5.9 48.3 22.9 6 2.7-5.9zM126.5 677.5c1.5 0.3 3 1.6 4.5 3.9l6.9-2.7-9.6-24.8-7 2.7c0.8 2.4 1 4.3 0.3 5.7-0.5 1.4-1.9 2.5-4.1 3.3-3.1 1.3-6 1.3-8.6-0.1-2.7-1.2-4.6-3.5-5.9-6.8-1.6-4.1-0.9-8.1 2-11.7 3-3.7 8.1-6.9 15.3-9.6 7.5-2.9 13.6-3.9 18.4-3.3 4.9 0.8 8 3.2 9.7 7.3 1.3 3.3 1.2 6.8-0.2 10.2-1.4 3.5-4.4 7.6-8.8 12.2l5 5.2 18.4-12.7-1.9-5.1-2.9-0.2c0.3-2.5 0.3-4.8 0.1-6.9-0.3-2-0.8-4.1-1.5-6.1-3.1-7.9-8.5-13.3-16.3-16.2-7.8-2.9-16.1-2.6-25.1 0.8-9.7 3.8-16.5 9-20.7 15.6-4.1 6.7-4.7 13.7-1.8 21.1 1.2 3.1 2.8 5.8 4.6 7.9 1.9 2.1 4.2 4.1 7.1 5.7l-4.1 4.1 3.1 7.9 15.9-6.1c3.4-1.3 5.8-1.7 7.2-1.3zM183.4 696.3l-15.9-28.8-6.9 3.8c1.2 2.5 1.5 4.4 0.8 5.8-0.8 1.5-3.3 3.5-7.8 6l-21.8 11.7c-4.5 2.4-7.5 3.5-9.2 3.4-1.6-0.2-3.1-1.5-4.6-3.9l-6.9 3.8 13.9 25.2 7-3.7c-1.3-2.5-1.5-4.4-0.8-5.9s3.4-3.4 7.9-5.8l7.1-3.9 2.7 5-15.6 29.2 8.9 16.1 6.8-3.7c-0.9-1.9-1.2-3.7-1.1-5.4 0-1.6 0.6-3.5 1.7-5.7l8.5-17.8c3.5 3.3 6.9 5.2 10.4 5.8 3.5 0.5 7.1-0.2 11-2.2 5.2-2.8 8-6.6 8.6-11.5 0.7-4.6-0.8-10.5-4.7-17.5z m-6.8 9.5c-0.5 2.8-2.1 4.8-4.7 6.3-3 1.6-5.8 1.6-8.6 0.1-2.7-1.6-5.5-4.8-8-9.5-0.4-0.7-0.8-1.3-1-1.7-0.2-0.4-0.4-0.8-0.5-1.2l10.4-5.5c3-1.6 5.1-2.2 6.4-2 1.3 0.3 2.6 1.7 3.9 4.1 1.9 3.4 2.5 6.6 2.1 9.4zM168 772.7c0.5-1.6 2.9-3.9 6.9-6.8l20.1-14.3c4-2.9 6.9-4.5 8.6-4.4 1.7 0 3.4 1.1 5.2 3.3l6.4-4.7-17.2-23.5-6.4 4.6c1.6 2.4 2 4.3 1.5 5.8-0.5 1.6-2.8 3.8-6.9 6.8l-20.1 14.4c-4 2.8-7 4.4-8.6 4.3-1.7 0-3.4-1.1-5.1-3.3l-6.5 4.6 17.2 23.5 6.4-4.5c-1.6-2.3-2.1-4.2-1.5-5.8zM236.8 771.1L219 749.4l-6.2 4.9c1.6 2 2.2 3.7 1.7 5.2-0.5 1.6-2.7 3.9-6.9 7.2l-19 15.3c-4.1 3.2-7 4.9-8.5 5-1.6 0.2-3.2-0.7-4.9-2.7l-6.2 4.9 17.8 21.9c6.9 8.3 14.1 13 22.1 13.9 7.9 1 15.9-1.7 23.9-8.2 8.1-6.5 12.5-13.6 13.2-21.4 0.5-7.8-2.5-15.9-9.2-24.3z m-3.2 18.7c-1.4 5.1-5 10.1-10.9 14.8-5.8 4.6-11.5 7.1-16.8 7.3-5.4 0.2-9.7-1.9-13.2-6.1-1.5-1.9-2.3-3.5-2.1-4.7 0.2-1.2 1.6-2.9 4.4-5.1l25.2-20.1c2.8-2.2 4.8-3.3 6-3.2 1.2 0.1 2.6 1.1 4.2 3 3.4 4.3 4.5 9 3.2 14.1zM307.3 862l8.3-23.2-3.7-2.7-3.2 2.5c-1.1-2.6-2.3-4.8-3.7-6.7-1.4-1.9-3.1-3.5-4.8-5-6.9-5.1-14.4-7-22.7-5.5-8.3 1.5-15.3 6.1-21.2 13.8-6.2 8.1-9 16.3-8.3 24.5 0.7 8.2 4.7 15.1 12.1 20.7 5.1 3.9 10.6 5.9 16.4 6.2 5.9 0.3 12-1.5 18.6-4.9l-3.6-6.9c-4.4 2.1-8.8 3.1-13.2 2.9-4.4 0-8-1.1-10.8-3.3-4.1-3.1-6.1-7.3-5.8-12.5 0.3-5.3 2.7-10.9 7.4-16.9 4.5-6 9.4-10 14.4-11.7 4.9-1.8 9.3-1.3 13.2 1.6 3 2.3 4.7 5.7 5.6 10.1 0.8 4.6 0.5 9.6-1 15.2l6 1.8zM366.7 873.4c-2.6-8-8-14-16.5-17.9-8.4-4-16.5-4.4-24.4-1.4-7.8 3.1-13.9 9.1-18.2 18.1-4.3 9-5.2 17.5-2.6 25.4 2.6 8 8 13.9 16.4 17.9 8.4 3.9 16.5 4.4 24.4 1.3 7.9-3.1 14-9.1 18.3-18 4.3-9 5.2-17.5 2.6-25.4z m-17.1 18.5c-3.4 7.2-7.3 12.1-11.6 15.1-4.3 2.8-8.7 3.3-12.9 1.2-4.4-2-6.8-5.6-7.3-10.7s1-11.2 4.4-18.5c3.5-7.2 7.4-12.2 11.7-15.1 4.3-2.8 8.7-3.3 13-1.3 4.3 2.1 6.6 5.6 7.1 10.8 0.5 5.2-1 11.3-4.4 18.5zM429.2 903c1.7-5.5 1-10.3-1.9-14.1-3-3.9-8.3-6.9-15.9-9.2l-31.8-9.4-2.2 7.4c2.6 0.9 4.2 2.2 4.7 3.7s0 4.7-1.4 9.6l-7.1 23.5c-1.5 4.8-2.8 7.7-4.1 8.7-1.2 0.9-3.3 1.2-6 0.5l-2.3 7.6 27.9 8.3 2.2-7.6c-2.6-0.8-4.2-2.1-4.7-3.6-0.5-1.6 0-4.8 1.4-9.6l2.4-7.7 5.5 1.7 9.7 31.6 17.8 5.2 2.3-7.3c-1.9-0.9-3.5-1.8-4.6-3-1.2-1.3-2.2-3-2.9-5.4l-6.6-18.6c4.9-0.1 8.6-1.1 11.6-3.1 2.7-1.9 4.7-5 6-9.2z m-14.9-4.1c-1 3.2-2.9 5.2-6 6-3.1 0.9-7.2 0.5-12.5-1.2-0.9-0.3-1.5-0.4-2-0.5-0.4-0.1-0.8-0.3-1.1-0.4l3.4-11.2c0.9-3.2 2-5.2 3.2-5.8 1.2-0.7 3.1-0.6 5.6 0.1 3.8 1.1 6.6 2.8 8.2 5.1 1.7 2.4 2.1 5 1.2 7.9zM471.7 891.8l-30.4-3.8-1 7.7c2.5 0.4 4.2 1.3 4.9 2.7 0.7 1.4 0.7 4.7 0.1 9.9l-3.1 24.2c-0.7 5.2-1.5 8.2-2.6 9.4-1.1 1.2-2.8 1.6-5.4 1.4l-1 7.8 28 3.5 0.9-7.7c-2.6-0.5-4.2-1.3-4.9-2.8-0.7-1.4-0.8-4.6-0.1-9.7l0.9-6.5 9.9 1.3c7 0.9 12.6 0.1 16.5-2.6 3.9-2.5 6.2-6.9 7.1-13 0.8-6.2-0.4-11.2-3.8-14.9-3.4-3.8-8.7-6-16-6.9z m4.7 19.2c-0.4 3.6-1.9 6.3-4.4 7.9-2.4 1.6-5.9 2.1-10.3 1.6-0.6-0.1-1.2-0.2-1.6-0.3-0.4-0.1-0.7-0.1-1.2-0.2l1.8-13.6c0.4-3.3 1.1-5.4 2-6.3 0.8-0.9 2.3-1.3 4.5-1 3.3 0.4 5.8 1.7 7.3 3.9 1.7 2 2.3 4.7 1.9 8zM556.7 925.4c-0.3-9.9-3.6-17.9-9.6-23.7-6-5.9-13.7-8.7-23-8.4-9.2 0.5-16.7 3.7-22.2 10-5.6 6.4-8.1 14.4-7.8 24.3s3.5 17.9 9.6 23.8c6 5.9 13.5 8.7 23 8.3 9.2-0.3 16.6-3.6 22.2-10 5.5-6.3 8.1-14.4 7.8-24.3z m-19.5 19.2c-2.4 4.5-6.1 6.9-10.9 7-4.8 0.2-8.6-1.9-11.5-6.2-2.8-4.3-4.3-10.4-4.6-18.3-0.3-7.9 0.8-14.2 3.3-18.7s6.1-6.8 10.9-7c4.8-0.1 8.5 1.9 11.4 6.2 2.8 4.4 4.5 10.5 4.7 18.4 0.4 7.9-0.7 14-3.3 18.6zM622.3 936.9c-1.6-0.6-3.3-1.7-4.9-3.5l-14.2-13.8c4.3-2.1 7.3-4.7 9-7.7 1.7-3.1 2.2-6.7 1.6-11.1-1-5.7-3.7-9.6-8-11.9-4.4-2.2-10.5-2.6-18.4-1.3l-32.7 5.3 1.3 7.8c2.7-0.4 4.7 0 5.8 1.2 1.2 1.2 2.2 4.2 3 9.2l4 24.2c0.8 5 0.9 8.3 0.1 9.6-0.7 1.5-2.4 2.5-5.1 3l1.3 7.7 28.6-4.6-1.3-7.7c-2.8 0.4-4.6-0.1-5.8-1.2-1.2-1.2-2.1-4.3-2.9-9.3l-1.3-7.9 5.7-0.9 22.7 24.3 18.3-3.1-1.2-7.5c-2.2 0.1-4-0.1-5.6-0.8z m-26.5-25.3c-2.4 2.1-6.2 3.5-11.7 4.4-0.9 0.1-1.6 0.3-2 0.4-0.5 0-0.9 0.1-1.3 0.1l-2-11.6c-0.5-3.3-0.4-5.5 0.3-6.7 0.8-1 2.5-1.9 5.2-2.2 3.9-0.6 7.1-0.3 9.5 1 2.5 1.4 4 3.6 4.5 6.6 0.8 3.2-0.1 6-2.5 8zM681.3 908.2l-0.3-0.3-32.3-38.2-12.3 4.7 1 47.7v1.2c0.1 6.2-1.6 10.4-5.2 12.5l2.9 7.3 22.5-8.6-2.8-7.1c-2.2 0.7-3.9 1-5.1 0.8-1.2-0.4-2-1.3-2.6-2.8-0.1-0.2-0.2-0.5-0.3-0.8-0.1-0.4-0.1-0.7-0.2-1l-0.9-9.1 16.6-6.3 6 7.1c0.3 0.3 0.5 0.7 0.7 1 0.3 0.5 0.4 0.9 0.7 1.4 0.4 1.2 0.4 2.2-0.2 3.1-0.5 0.8-1.8 1.6-3.6 2.3l-0.7 0.3 2.8 7.2 26.2-10-2.8-7.4c-3.2 0.8-6.7-0.9-10.1-5z m-35.4-2.1l-0.9-19.3 11.8 15.1-10.9 4.2zM722.1 896.2c-1.5-0.8-3.5-3.4-5.8-7.8L699.6 857l0.9-0.4c3.3-1.8 6.6-2.3 9.7-1.7 3.2 0.6 6.9 2.4 11.2 5.8l3.8-4.7-15.2-14.1-42.2 22 3.3 20.3 6-0.4c-0.3-5.4 0.2-9.6 1.5-12.5 1.2-2.9 3.5-5.2 6.9-7l0.8-0.4 16.7 31.5c2.4 4.4 3.5 7.4 3.3 9s-1.5 3.1-3.8 4.4l3.7 6.9 25.5-13.3-3.7-7c-2.5 1.4-4.5 1.5-5.9 0.8zM767.3 868.2c-1.7-0.5-3.9-2.9-6.7-7l-14-20.2c-2.8-4.1-4.2-7-4.2-8.7 0.1-1.6 1.2-3.3 3.5-5l-4.5-6.4-24.2 16.5 4.5 6.4c2.4-1.4 4.4-1.9 5.9-1.4 1.6 0.6 3.8 2.9 6.7 7l14 20.2c2.9 4.1 4.3 7 4.3 8.7-0.1 1.6-1.2 3.3-3.5 5l4.4 6.4 24.3-16.5-4.5-6.5c-2.4 1.6-4.5 2-6 1.5zM811.5 808.1c-5.9-7.9-13.1-12.8-21.4-14.2-8.3-1.5-16.2 0.5-23.7 6-7.5 5.6-11.7 12.5-12.6 20.8-0.9 8.3 1.6 16.3 7.6 24.3s13.2 12.7 21.5 14.2 16.2-0.5 23.7-6c7.4-5.5 11.6-12.4 12.6-20.8 0.9-8.2-1.6-16.4-7.7-24.3z m-9.8 38.6c-3.9 2.8-8.2 3.2-13 1.2-4.8-2-9.6-6.1-14.4-12.5-4.8-6.4-7.5-12.1-8-17.2s1.2-9.1 5-12c3.8-2.8 8.1-3.2 12.9-1.2 4.8 2 9.6 6.2 14.5 12.5 4.7 6.4 7.4 12.1 7.9 17.2 0.5 5.2-1.2 9.1-4.9 12zM914.6 695.8c-3.1-7.9-9.1-13.9-18.2-18.2-9.2-4.2-17.7-5.1-25.7-2.5-8.1 2.6-14 8.1-18 16.4-4 8.3-4.4 16.4-1.3 24.2 3.1 7.7 9.2 13.8 18.3 18 9 4.2 17.6 5.1 25.6 2.5 8.1-2.5 14.2-8 18.1-16.3 3.9-8.4 4.4-16.4 1.2-24.1z m-8.6 20.5c-2.1 4.3-5.7 6.7-10.8 7.2-5.2 0.5-11.4-0.9-18.7-4.3-7.3-3.4-12.4-7.3-15.3-11.5-3-4.3-3.3-8.5-1.3-12.8 2-4.2 5.6-6.6 10.7-7.1 5.3-0.5 11.5 0.9 18.8 4.3 7.3 3.4 12.3 7.2 15.2 11.4 3 4.3 3.4 8.6 1.4 12.8zM926.4 657.2c-1.6 0.5-4.7-0.1-9.5-1.8l-10.2-3.5 0.9-2.5c0.9-2.5 2.4-4.1 4.5-4.9 2.2-0.7 5-0.7 8.7 0.1l1.8-5.1-28.3-9.6-1.8 5.1c3.6 1.4 6 3 6.9 4.5 0.8 1.5 0.7 3.9-0.3 7.1l-0.9 2.5-8.4-2.9c-3.3-1.1-5.2-2.2-5.8-3.5-0.5-1.2-0.4-3.3 0.5-5.9 1.5-4.2 3.9-7.6 7.2-10.3 3.4-2.7 7.7-4.7 12.9-6l-1-5.8-20.2 1.9-15.8 45.4 7.4 2.5c1.1-2.5 2.5-4 4.1-4.5 1.5-0.6 4.6 0.1 9.4 1.8l23.5 7.9c4.8 1.7 7.7 3.2 8.6 4.5 0.9 1.4 0.9 3.3 0.2 6l7.5 2.6 9.6-27.6-7.5-2.6c-1 2.6-2.3 4.1-4 4.6zM957.1 551.7c-2.6-5.1-7.1-9.6-13.4-13.6l-4.4 6.5c4 2.8 7.1 6.2 9.1 10 2.2 3.9 3 7.5 2.5 11-0.7 5.2-3.4 8.8-8.1 11.2-4.8 2.3-10.9 3-18.6 1.9-7.5-1-13.3-3.2-17.4-6.6-4.1-3.4-5.8-7.5-5.1-12.2 0.5-3.6 2.4-6.9 6-9.8 3.6-3 8.2-5.2 13.8-6.6l-1.3-6.3-24.5 4.3-0.6 4.5 3.8 1.6c-1.8 2.2-3.1 4.4-4.1 6.5-1 2.1-1.7 4.3-2 6.5-1.2 8.5 1 15.9 6.4 22.3 5.4 6.3 13 10.2 22.6 11.4 10.2 1.4 18.6-0.3 25.6-4.9 6.9-4.7 11-11.6 12.2-20.6 1.2-6.2 0.2-11.9-2.5-17.1zM947.4 473.6c-1.4 1-4.5 1.6-9.7 1.8l-24.6 1c-5.2 0.3-8.5-0.1-9.9-1-1.3-0.9-2.1-2.6-2.3-5.3l-7.9 0.3 1.2 28.6 7.6-0.4c0-2.6 0.6-4.4 2-5.4 1.3-1.1 4.5-1.6 9.7-1.8l6.5-0.3 0.9 21.7-6.4 0.3c-5.1 0.1-8.3-0.2-9.8-1-1.5-0.9-2.3-2.7-2.5-5.3l-7.6 0.3 1.2 28.5 7.9-0.3c0-2.6 0.6-4.4 2-5.4s4.5-1.6 9.7-1.8l24.7-1c5-0.1 8.3 0.1 9.7 1 1.4 0.9 2.2 2.6 2.4 5.3l7.9-0.3-1.2-28.4-7.7 0.3c0.1 2.7-0.6 4.5-1.8 5.4-1.3 0.9-4.5 1.6-9.7 1.8l-10.8 0.4-0.9-21.7 10.8-0.4c5.1-0.2 8.4 0.1 9.8 1 1.5 0.9 2.2 2.7 2.4 5.3l7.6-0.3-1.2-28.5-7.9 0.3c-0.2 2.5-0.9 4.3-2.1 5.3zM941.9 434.6c-1.2 1.2-4.2 2.3-9.1 3.1l-24.4 4.3c-4.9 0.9-8.2 1-9.7 0.3-1.5-0.8-2.6-2.4-3.3-5.2l-7.8 1.4s0.8 3.4 2.4 13 2.8 15.6 2.8 15.6l7.8-1.4c-0.3-2.8 0-4.7 1.2-5.9 1.2-1.2 4.2-2.3 9.3-3.2l24.3-4.3c4.9-0.9 8.2-1 9.7-0.2 1.5 0.7 2.6 2.4 3.2 5.1l7.8-1.4-5.2-28.6-7.8 1.4c0.3 2.9 0 4.8-1.2 6zM882.4 381.1c-1.6-0.5-2.8-2-3.6-4.6l-7.6 2.2 5.8 20.4 7.4-2.1c-0.6-2.6-0.4-4.5 0.7-5.8 1-1.1 4-2.4 8.9-3.8l16.6-4.7-29.9 29.1 6.6 23.4 7.8-2.1c-0.7-2.6-0.5-4.5 0.5-5.8 1.1-1.3 4.1-2.6 9-3.9l23.7-6.6c5-1.4 8.1-1.8 9.7-1.3 1.6 0.5 2.8 2.1 3.6 4.5l7.6-2-5.9-20.7-7.4 2.1c0.6 2.6 0.4 4.6-0.6 5.7-1.1 1.3-4.1 2.6-9 3.9l-28.7 8.1 40.2-39.4-2.9-10-42.8 11.9c-4.9 1.6-8.2 2.1-9.7 1.5zM863.9 363.8l48.2-3.5c0.3 0 0.7-0.1 1.2-0.1 6.3-0.5 10.6 1.1 12.8 4.3l7.3-3.2-9.9-21.8-7.1 3.2c0.9 2.2 1.4 3.9 1.1 5-0.3 1.2-1.1 2-2.6 2.7-0.2 0.1-0.5 0.2-0.9 0.3-0.3 0.1-0.7 0.2-0.9 0.3l-9.2 1.4-7.3-16.1 6.9-6.3c0.3-0.2 0.6-0.5 1-0.7 0.4-0.3 0.9-0.5 1.4-0.7 1.2-0.5 2.2-0.6 3.2 0 0.8 0.5 1.6 1.8 2.5 3.5l0.2 0.6 7.2-3.1-11.6-25.4-7.3 3.2c1 3.2-0.4 6.7-4.3 10.4l-0.3 0.1-36.8 34 5.2 11.9z m26.6-21.7l4.8 10.6-19.4 2M830.5 748.1c-0.5-1.6 0.1-3.5 1.8-5.6l-6.1-5-13.8 16.3 5.9 4.9c1.8-1.9 3.5-2.8 5.2-2.6 1.6 0.2 4.3 2 8.2 5.2l13.2 10.9-41.1-8.1-15.8 18.6 6 5.1c1.8-2 3.5-2.9 5.1-2.8 1.7 0.1 4.5 1.9 8.3 5.1l18.9 15.6c3.9 3.3 6.1 5.7 6.5 7.3 0.5 1.5-0.1 3.4-1.8 5.5l6.1 5.1 13.9-16.4-6-4.9c-1.8 1.9-3.6 2.8-5.2 2.7-1.7-0.2-4.4-1.9-8.3-5.1l-22.8-19 55.4 10.7 6.7-8-34-28.3c-3.7-3.3-5.9-5.7-6.3-7.2zM320.9 587.9c18.7 6.1 38.5 11.1 59.1 14.9-4.3-27.3-6.7-56.1-6.7-85.8 0.1-140.7 52.6-260.5 126-305.7-57.9 63.3-95.4 164.7-95.5 279 0 41.4 4.9 81.2 14 118.1 27.5 3.1 56.1 4.2 85.5 3 154.3-6 283.2-71.8 328.4-158.2-27.4-153-161-269.2-322-269.3h-0.3C400 214 317.1 355.3 317 525.2c0 21.5 1.4 42.4 3.9 62.7zM403.2 679.4c-5.2-15.7-9.6-32.2-13.1-49.4-21.5-4.8-41.8-10.8-60.5-17.8 2.8 16.9 6.4 33.3 10.9 49.2 19.7 7.1 40.7 13.2 62.7 18zM416.9 715.3c-21.6-2.8-42.4-6.7-62.1-11.5 16.1 40.8 37.7 76.3 63.3 104.4-35.3-21.8-65.7-60.8-87.8-111-48.6-14.7-89.6-35.5-118.9-60.6 48.2 120.5 166 205.6 303.8 205.7 7.6 0 15.2-0.3 22.7-0.8-49.5-14.2-92.3-60.6-121-126.2z M537.3 642.3c-37.2 1.5-73.2-0.4-106.8-5.1 5.4 17.5 11.7 34.3 18.9 50.2 24.2 3.1 49.3 4.8 75 4.9 118 0.1 222.7-34.5 288-87.8-46.7 67.6-170.2 116.1-315.4 116-10.4 0-20.7-0.3-30.9-0.8 32.4 55.9 76.6 96.4 127 113.3 142.6-34.7 248.6-162.7 249.6-315.7-45.2 67.9-164.1 119.5-305.4 125zM190.2 553c25 39.1 68 72.8 122.9 97.3-4.8-16-8.8-32.9-12.1-50.3-34.8-16.8-62.3-37.7-80-61.6 21.8 16.7 47.8 31.1 76.9 42.9-3.7-25.3-5.6-51.7-5.6-79 0.1-130.5 45.2-243 110.4-294.7C277.5 253.5 188.1 373.7 188 514.9c0 12.9 0.8 25.6 2.2 38.1z M167 515c0 192.3 155.9 348.2 348.3 348.2 192.3 0 348.2-155.9 348.2-348.2 0-192.4-155.9-348.3-348.2-348.3-192.4 0-348.3 156-348.3 348.3z m348.3-340.2c187.9 0 340.2 152.3 340.2 340.2 0 187.9-152.3 340.2-340.2 340.2-187.9 0-340.2-152.3-340.2-340.2 0-187.9 152.3-340.2 340.2-340.2z";*/ -fx-shape: "M890.76 623.29c-2 6.51-3.27 13.14-5.63 19.59-35.77 97.63-107.49 175.65-201.95 219.7C630.8 887 575.23 899.39 518 899.39c-52.2 0-102.23-11.87-148.7-31.51-24.5 4.26-48.84 7.94-72.52 9.95-13.34 1.13-24.97 1.8-35.96 2.25 75.15 52.43 164.79 81.55 257.19 81.55 64.17 0 129.43-13.7 191.48-42.64 152.06-70.9 245.13-215.38 258.67-370.84-7.63 8.57-15.03 17.15-23.44 25.72-16.65 16.94-35.05 33.29-53.96 49.42z M1012.01 264.62c-21.89-46.94-71.87-76.62-139.28-89.83 12.48 13.42 24.72 28.02 36.84 44.2 17.23 23.01 30.18 44.14 41.49 65.21 1.87 3.49 3.92 7.02 5.68 10.52 7.92 20.48 5.44 47.02-6.6 77.12-9.44 23.6-24.75 49.25-45.42 75.79-3.07 3.94-5.86 7.83-9.16 11.8-7.04 8.46-14.73 16.83-22.58 25.18-67.75 72.09-164.54 139.45-276.75 191.77-111.82 52.15-225.4 82.97-324.02 88.67-10.97 0.63-21.89 1.19-32.46 1.19-4.83 0-9.29-0.33-13.97-0.47-0.44-0.01-0.8-0.09-1.24-0.11-32.83-1.07-61.8-5.43-85.74-12.87-0.5-0.16-0.89-0.37-1.38-0.53-0.03-0.01-0.04-0.02-0.07-0.03-31.33-9.98-53.77-25.05-64.74-44.32-1.84-4.18-3.41-8.49-5.13-12.73-9.72-23.88-18.18-48.41-24.06-73.78-4.18-18.02-7.14-36.65-9.16-55.62-33.24 60.14-42.6 117.5-20.71 164.44 26.62 57.09 94.17 89.3 184.9 96.61 13.3 1.07 27.06 1.64 41.3 1.64 17.18 0 35.2-1.06 53.57-2.62 99.04-8.41 213.76-39.22 329.21-93.06 117.2-54.65 215.79-123.97 286.1-195.56 23.56-23.99 44.05-48.2 60.81-72.24 50.88-73.02 68.78-144.15 42.57-200.37z M67.66 514.54c0.14 32.84 3.51 65.9 11.11 98.67 0.09 0.4 0.25 0.79 0.34 1.19 4.43 18.91 10.57 37.63 17.55 56.21 0.25 0.69 0.18 1.28 0.46 1.98 0.18 0.6 2.05 6.08 2.22 6.71 0.13 0.23 0.94 0.61 1.17 0.86 5.07 5.53 32.28 16.2 52.62 22.67l13.75 4.37c5.38 1.23 11.94 1.76 17.87 2.69 0.02 0 0.04 0.01 0.06 0.01-6.74-11.16-13.55-22.3-19.13-34.27-21.03-45.1-32.74-92.86-35.53-141.12-1.88-32.47 0.6-65.1 7.05-97.37 3.93-19.66 8.94-39.21 15.98-58.41 3.32-9.08 7.27-17.8 11.21-26.53 3.68 4.86 7.78 9.66 12.85 14.19 24.08 21.52 57.43 30.67 99.21 27.42 45.3-3.62 59.03 6.03 62.09 9.07 1.98 1.95 2.3 3.75 2.46 3.75 0 0 0.03 0 0.03-0.03l-0.84 4 0.46 4.08c1.11 10.18 12.81 61.89 136.87 80.73 0.38 0.03 0.99 0.03 1.8 0.03 9.09 0 44.39-1.72 64.8-27.45 9.34-11.78 18.64-32.69 9.83-65.56l-2.38-5.87c-11.93-21.5-30.92-72.75-13.55-94.02 37.17-45.48 30.39-116.66 29.55-123.95-0.13-1.55-2.92-28.48-20.06-54.51 57.04 4.22 111.61 20.64 160.45 47.6 28.58 15.78 55.01 34.93 78.83 57.33 35.09 33 64.84 72.04 85.8 117 5.47 11.73 9.53 23.82 13.72 35.87 0.11 0.32 0.19 0.64 0.3 0.96l0.03-0.06c6.38-10.56 11.56-20.74 15.36-30.21 7.53-18.81 17.08-45.55 16.17-52.79-0.04-0.3 0.18-1.07 0.1-1.3l-1.1-2-1.59-1.54c-0.04-0.09-0.12-0.13-0.16-0.21-10.66-18.87-22.17-36.99-34.9-53.98-11.23-15-23.3-29.12-35.93-42.58-0.31-0.37-0.47-0.93-0.79-1.28l-3.01-2.41c-8.91-9.25-17.86-18.46-27.57-26.72-26.13-22.22-54.76-40.89-84.89-56.51-14.65-7.6-29.7-14.36-45.07-20.28-30.74-11.83-62.76-20.25-95.49-25.16a462.045 462.045 0 0 0-49.55-4.71c-5.97-0.24-11.87-1.1-17.87-1.1h-0.02c-64.17 0-129.43 13.7-191.48 42.64l-0.01 0.01c-0.01 0.01-0.02 0.01-0.03 0.01-131.67 61.37-218.68 178.06-248.77 309.07-2.64 11.51-4.42 23.2-6.31 34.87l0.02 0.14c-3.58 22.07-6.2 44.31-6.14 66.88-0.01 0.31 0.05 0.61 0.05 0.92z m287.45-355.49c33.42-15.58 68.25-25.7 103.89-31.38 12.41 0.92 22.91 4.35 31.38 10.28 22.23 15.55 25.5 45.02 25.58 45.71 1.7 15.73 1.75 61.79-18.11 86.07-40.87 50.09-3.24 129.93 6.66 148.82 1.22 5.52 2.13 13.19-0.99 17.17-4.51 5.77-18.21 7.98-21.25 8.18-63.26-9.72-85.69-28.54-89.59-34.06 0.46-11.85-3.09-27.5-14.74-40.72-19.4-21.95-54.98-31.02-105.65-26.99-26.61 2.25-46.97-2.53-60.09-14.03-11.97-10.44-15.82-24.7-17-31.46 39.29-59.11 93.86-106.79 159.91-137.59z"; -jfx-size: 20px; -fx-background-color: -fx-text-color; } -.lfx-decorator-button { +.jfx-decorator-button { -fx-fill: -fx-text-color; -fx-text-fill: -fx-text-color; -fx-prompt-text-fill: -fx-text-color;