Compare commits

...

2 Commits

Author SHA1 Message Date
49fe0f65bd
Update JavaFX version to 23
All checks were successful
Pull Request / build (pull_request) Successful in 3m26s
2024-09-25 23:42:14 +02:00
231b4eb0fe
Use different shortcut to copy headword
CTRL+C overwrites the 'Copy' shortcut for every other GUI element, so the user cannot copy the definition of the word.
2024-09-22 23:14:27 +02:00
6 changed files with 9 additions and 6 deletions

View File

@ -2,7 +2,7 @@
kotlin = "2.0.20"
detekt = "1.23.7"
jfx-plugin = "0.1.0"
javafx = "22.0.1"
javafx = "23"
kotest = "5.9.1"

View File

@ -0,0 +1,3 @@
package com.marvinelsen.willow.tatoeba
data class TatoebaSentence(val traditional: String)

View File

@ -5,7 +5,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.web.WebView?>
<?import javafx.geometry.Insets?>
<VBox xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
<VBox xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.marvinelsen.willow.ui.controllers.DetailsController"
stylesheets="/css/details.css">
<Label fx:id="labelHeadword" styleClass="headword" text="Label">

View File

@ -7,7 +7,7 @@
<?import javafx.scene.control.ProgressIndicator?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.layout.*?>
<BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
<BorderPane xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.marvinelsen.willow.ui.controllers.MainController"
stylesheets="/css/main.css">
<top>

View File

@ -3,7 +3,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.input.KeyCodeCombination?>
<?import javafx.scene.layout.BorderPane?>
<MenuBar xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
<MenuBar xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.marvinelsen.willow.ui.controllers.MenuController" BorderPane.alignment="CENTER"
useSystemMenuBar="true">
<Menu text="%menubar.file">
@ -23,7 +23,7 @@
<Menu text="%menubar.edit">
<MenuItem fx:id="menuItemCopyHeadword" text="%menubar.edit.copy.headword" onAction="#onMenuItemCopyHeadwordAction">
<accelerator>
<KeyCodeCombination alt="UP" code="C" control="UP" meta="UP" shift="UP"
<KeyCodeCombination alt="UP" code="H" control="UP" meta="UP" shift="UP"
shortcut="DOWN"/>
</accelerator>
</MenuItem>

View File

@ -5,7 +5,7 @@
<?import javafx.scene.layout.FlowPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<VBox xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
<VBox xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.marvinelsen.willow.ui.controllers.SearchController" spacing="8">
<TextField fx:id="textFieldSearch" promptText="%search.prompt" HBox.hgrow="ALWAYS"/>
<FlowPane hgap="8.0" vgap="8.0">