Merge branch 'release/1.0.2'

Release: com.io7m.jwheatsheaf 1.0.2 Change: Ensure CSS stylesheets are passed to any dialogs opened by the chooser (Ticket: #4)
io7m-com · Mar 28, 2020 · 8a524f2 · 8a524f2
2 parents 6ad2f58 + 0cd7110
commit 8a524f2
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 9 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -6,9 +6,18 @@
         <c:change date="2020-03-28T00:00:00+00:00" summary="Initial public release"/>
       </c:changes>
     </c:release>
-    <c:release date="2020-03-28T12:09:49+00:00" ticket-system="com.github.io7m.jwheatsheaf" version="1.0.1">
+    <c:release date="2020-03-28T00:00:00+00:00" ticket-system="com.github.io7m.jwheatsheaf" version="1.0.1">
       <c:changes>
-        <c:change date="2020-03-28T12:09:49+00:00" summary="Add missing package exports to module descriptors"/>
+        <c:change date="2020-03-28T00:00:00+00:00" summary="Add missing package exports to module descriptors"/>
+      </c:changes>
+    </c:release>
+    <c:release date="2020-03-28T12:51:49+00:00" ticket-system="com.github.io7m.jwheatsheaf" version="1.0.2">
+      <c:changes>
+        <c:change date="2020-03-28T12:51:49+00:00" summary="Ensure CSS stylesheets are passed to any dialogs opened by the chooser">
+          <c:tickets>
+            <c:ticket id="4"/>
+          </c:tickets>
+        </c:change>
       </c:changes>
     </c:release>
   </c:releases>

diff --git a/com.io7m.jwheatsheaf.api/pom.xml b/com.io7m.jwheatsheaf.api/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.api</artifactId>

diff --git a/com.io7m.jwheatsheaf.documentation/pom.xml b/com.io7m.jwheatsheaf.documentation/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.documentation</artifactId>

diff --git a/com.io7m.jwheatsheaf.examples/pom.xml b/com.io7m.jwheatsheaf.examples/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.examples</artifactId>

diff --git a/com.io7m.jwheatsheaf.oxygen/pom.xml b/com.io7m.jwheatsheaf.oxygen/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.oxygen</artifactId>

diff --git a/com.io7m.jwheatsheaf.tests/pom.xml b/com.io7m.jwheatsheaf.tests/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.tests</artifactId>

diff --git a/com.io7m.jwheatsheaf.ui/pom.xml b/com.io7m.jwheatsheaf.ui/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.ui</artifactId>

diff --git a/...o7m.jwheatsheaf.ui/src/main/java/com/io7m/jwheatsheaf/ui/JWFileChooserViewController.java b/...o7m.jwheatsheaf.ui/src/main/java/com/io7m/jwheatsheaf/ui/JWFileChooserViewController.java
@@ -449,6 +449,13 @@ private void onSelectDirectButton()
     dialog.setTitle(this.choosers.strings().enterPathTitle());
     dialog.setHeaderText(null);
     dialog.setContentText(this.choosers.strings().enterPath());
+
+    this.configuration.cssStylesheet().ifPresent(css -> {
+      dialog.getDialogPane()
+        .getStylesheets()
+        .add(css.toExternalForm());
+    });
+
     final var nameOpt = dialog.showAndWait();
     if (nameOpt.isPresent()) {
       final var name = nameOpt.get();
@@ -477,6 +484,13 @@ private void onCreateDirectoryButton()
     dialog.setTitle(this.choosers.strings().createDirectoryTitle());
     dialog.setHeaderText(null);
     dialog.setContentText(this.choosers.strings().enterDirectoryName());
+
+    this.configuration.cssStylesheet().ifPresent(css -> {
+      dialog.getDialogPane()
+        .getStylesheets()
+        .add(css.toExternalForm());
+    });
+
     final var nameOpt = dialog.showAndWait();
     if (nameOpt.isPresent()) {
       final var name = nameOpt.get();

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
   <groupId>com.io7m.jwheatsheaf</groupId>
   <artifactId>com.io7m.jwheatsheaf</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>pom</packaging>
 
   <name>com.io7m.jwheatsheaf</name>