hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Update to fa5, change export icon

Browse Source
This commit is contained in:
Clément Fournier
2019-01-13 01:48:08 +01:00
parent 9111e257c4
commit c0e7d6b61b
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-ui/pom.xml
View File

@ -133,7 +133,7 @@
</dependency>
<dependency>
<groupId>org.kordamp.ikonli</groupId>
<artifactId>ikonli-fontawesome-pack</artifactId>
<artifactId>ikonli-fontawesome5-pack</artifactId>
<version>2.3.0</version>
</dependency>

3
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/XPathPanelController.java
View File

@ -17,6 +17,7 @@ import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.controlsfx.validation.ValidationSupport;
import org.controlsfx.validation.Validator;
import org.kordamp.ikonli.javafx.FontIcon;
import org.reactfx.EventStream;
import org.reactfx.EventStreams;
import org.reactfx.collection.LiveArrayList;
@ -189,8 +190,6 @@ public class XPathPanelController extends AbstractController {
})
.filter(t -> StringUtils.isAlpha(t._2))
.subscribe(s -> autoComplete(s._1, s._2, autoCompletePopup));
}

8
pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/auxclasspath-setup-popup.fxml
View File

@ -32,7 +32,7 @@
styleClass="icon-button"
textAlignment="CENTER">
<graphic>
<FontIcon iconLiteral="fa-plus"/>
<FontIcon iconLiteral="fas-plus"/>
</graphic>
<tooltip>
<Tooltip text="Add new jars"/>
@ -44,7 +44,7 @@
styleClass="icon-button"
textAlignment="CENTER">
<graphic>
<FontIcon iconLiteral="fa-minus"/>
<FontIcon iconLiteral="fas-minus"/>
</graphic>
<tooltip>
<Tooltip text="Remove item"/>
@ -52,12 +52,12 @@
</Button>
<Button fx:id="moveItemUpButton" minWidth="-Infinity" mnemonicParsing="false" styleClass="icon-button">
<graphic>
<FontIcon iconLiteral="fa-arrow-up"/>
<FontIcon iconLiteral="fas-arrow-up"/>
</graphic>
</Button>
<Button fx:id="moveItemDownButton" minWidth="-Infinity" mnemonicParsing="false" styleClass="icon-button">
<graphic>
<FontIcon iconLiteral="fa-arrow-down"/>
<FontIcon iconLiteral="fas-arrow-down"/>
</graphic>
<tooltip>
<Tooltip text="Move item down"/>

2
pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml
View File

@ -38,7 +38,7 @@
<MenuButton mnemonicParsing="false" styleClass="menu-button-no-arrow,icon-button"
fx:id="languageSelectionMenuButton">
<graphic>
<FontIcon iconLiteral="fa-cog" />
<FontIcon iconLiteral="fas-cog" />
</graphic>
<items>

8
pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/xpath.fxml
View File

@ -16,6 +16,7 @@
<?import javafx.scene.control.ToggleGroup?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.shape.SVGPath?>
<AnchorPane minHeight="0.0"
minWidth="0.0"
prefHeight="180.0"
@ -69,7 +70,7 @@
<toolbarItems>
<MenuButton mnemonicParsing="false" styleClass="menu-button-no-arrow,icon-button">
<graphic>
<FontIcon iconLiteral="fa-cog" />
<FontIcon iconLiteral="fas-cog" />
</graphic>
<tooltip>
<Tooltip>
@ -94,7 +95,10 @@
</MenuButton>
<Button fx:id="exportXpathToRuleButton" mnemonicParsing="false" styleClass="icon-button">
<graphic>
<FontIcon iconLiteral="fa-share" />
<!--Needs FA 5.1.0 -->
<!--<FontIcon iconLiteral="fas-file-export" />-->
<SVGPath scaleX="0.022" scaleY="0.022"
content="M384 121.9c0-6.3-2.5-12.4-7-16.9L279.1 7c-4.5-4.5-10.6-7-17-7H256v128h128v-6.1zM192 336v-32c0-8.84 7.16-16 16-16h176V160H248c-13.2 0-24-10.8-24-24V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V352H208c-8.84 0-16-7.16-16-16zm379.05-28.02l-95.7-96.43c-10.06-10.14-27.36-3.01-27.36 11.27V288H384v64h63.99v65.18c0 14.28 17.29 21.41 27.36 11.27l95.7-96.42c6.6-6.66 6.6-17.4 0-24.05z" />
</graphic>
<tooltip>
<Tooltip>