diff --git a/README.adoc b/README.adoc index 7d7d78b..5aedb69 100644 --- a/README.adoc +++ b/README.adoc @@ -18,8 +18,6 @@ stylesheet that closely resembles the original while being custom tailored for J It's worth mentioning that Twitter Bootstrap delivers more than just a standardized look for common widgets. It also provides new widgets, behavior and a grid system. Some of these features may be ported at a later stage to BootstrapFX. -There is an link:https://demos.jpro.one/bootstrapfx.html[online-version] available at link:https://www.jpro.one/[jpro.one]. - == Installing You can get the latest version of **BootstrapFX** directly from link:https://bintray.com[Bintray's JCenter] repository or Maven Central. @@ -33,7 +31,7 @@ repositories { } dependencies { - compile '{project-group}:{project-name}-core:{project-version}' + implementation '{project-group}:{project-name}-core:{project-version}' } ---- @@ -51,7 +49,7 @@ dependencies { ---- Once the `bootstrapfx-core` dependency is in your classpath you just need to apply the `boostrapfx.css` stylesheet to -an scene, for example +a scene, for example [source,java] ---- @@ -90,16 +88,12 @@ public class Sampler extends Application { <2> Apply CSS class to widgets <3> Apply BootstrapFX stylesheet to scene -=== Java 9+ - -BootstrapFX can be used in a modular fashion when running in Java9+. It's module name is `{project-group}.core`. - == Building You must meet the following requirements: - * JDK8u60 as a minimum - * Gradle 6+ + * JDK11 as a minimum + * Gradle 6.3 You may used the included gradle wrapper script if you don't have `gradle` installed. @@ -117,7 +111,7 @@ You may used the included gradle wrapper script if you don't have `gradle` insta . Follow the instructions found at http://sdkman.io/ to install SDKMAN. . You need a POSIX environment if running Windows. We recommend using Babun Shell (http://babun.github.io/) - . Once SDKMAN is installed invoke `sdk install gradle 5.2`. + . Once SDKMAN is installed invoke `sdk install gradle 6.3`. . Test your setup by invoking `gradle --version`. .Gum @@ -129,20 +123,16 @@ to use the gradle wrapper if available or your global gradle command. This is an === Next Steps - . Make a full build by invoking the following command +Make a full build by invoking the following command [source] ---- $ gm build ---- - . Run the sampler application by invoking the following command + +Run the sampler application by invoking the following command [source] ---- $ gm :sampler:run ----- - . Run the sampler application with link:https://www.jpro.one/[JPro] by invoking the following command -[source] ----- -$ gm :sampler-jpro:jproRun ---- == Supported CSS Classes @@ -232,6 +222,10 @@ image::images/splitmenu-buttons.png[] == Changelog +.0.3.0 + + * The build was updated to use a different SASS plugin. + .0.2.4 * The `bootstrapfx.css` file has been moved to `org/kordamp/bootstrapfx/bootstrapfx.css`. diff --git a/build.gradle b/build.gradle index 980cfd9..d7a0f5e 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,12 @@ * THE SOFTWARE. */ +plugins { + id 'com.google.osdetector' +} + +ext.platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os + config { info { description = 'BootstrapFX: CSS and widgets' @@ -43,9 +49,14 @@ config { docs { javadoc { + autoLinks { + enabled = false + } options { addBooleanOption('javafx', true) - links('http://docs.oracle.com/javase/8/javafx/api/') + } + aggregate { + enabled = false } } } @@ -53,11 +64,25 @@ config { allprojects { apply plugin: 'idea' +} - license { - mapping { - fxml = 'XML_STYLE' +idea { + project { + jdkName sourceCompatibility + languageLevel sourceCompatibility + + ipr { + withXml { provider -> + def node = provider.asNode() + node.component.find { it.'@name' == 'VcsDirectoryMappings' }?.mapping[0].'@vcs' = 'Git' + } } + } +} + +allprojects { + license { + exclude '**/*.fxml' exclude '**/*.scss' } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e651320..9c590e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,13 +22,18 @@ # THE SOFTWARE. # -version = 0.3.0 +version = 0.4.0-SNAPSHOT group = org.kordamp.bootstrapfx -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 +javafxVersion = 11 kordampPluginVersion = 0.41.0 kordampBuildVersion = 2.0.0 +osPluginVersion = 1.6.2 +freefairPluginVersion = 5.3.0 +modularityPluginVersion = 1.7.0 +java9cPluginVersion = 0.2.3 org.gradle.daemon = true org.gradle.caching = true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be52383..a4b4429 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 0335575..3fb8cb5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,15 +22,27 @@ * THE SOFTWARE. */ +pluginManagement { + repositories { + jcenter() + gradlePluginPortal() + mavenLocal() + } + plugins { + id 'org.javamodularity.moduleplugin' version modularityPluginVersion + id 'io.freefair.jsass-java' version freefairPluginVersion + id 'com.google.osdetector' version osPluginVersion + id 'org.jonnyzzz.java9c' version java9cPluginVersion + } +} + buildscript { repositories { gradlePluginPortal() jcenter() - maven { url 'https://sandec.bintray.com/repo' } mavenLocal() } dependencies { - classpath "com.sandec.jpro:jpro-plugin-gradle:2018.1.9" classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion" } } @@ -42,28 +54,28 @@ enforce { rule(enforcer.rules.EnforceBytecodeVersion) { r -> r.enabled = false } - rule(enforcer.rules.ForceDependencies) { r -> - r.dependencies.addAll 'com.typesafe.play:twirl-api_2.12:1.3.15', - 'commons-codec:commons-codec:1.10', - 'org.apache.commons:commons-lang3:3.6', - 'org.scala-lang:scala-library:2.12.6', - 'org.scala-lang:scala-reflect:2.12.6', - 'org.scala-lang.modules:scala-parser-combinators_2.12:1.1.1', - 'com.fasterxml.jackson.core:jackson-core:2.8.11', - 'com.fasterxml.jackson.core:jackson-annotations:2.8.11', - 'com.fasterxml.jackson.core:jackson-databind:2.8.11.1', - 'junit:junit:4.12', - 'com.google.code.findbugs:jsr305:3.0.2', - 'org.seleniumhq.selenium:selenium-api:3.5.3', - 'org.seleniumhq.selenium:selenium-support:3.5.3', - 'org.seleniumhq.selenium:selenium-remote-driver:3.5.3', - 'com.google.guava:guava:23.0', - 'com.typesafe.akka:akka-actor_2.12:2.5.17', - 'com.typesafe.akka:akka-stream_2.12:2.5.17', - 'com.typesafe:config:1.3.3', - 'org.slf4j:slf4j-api:1.7.25', - 'org.slf4j:jul-to-slf4j:1.7.25', - 'org.bouncycastle:bcprov-jdk15on:1.60', - 'org.jruby:jruby-complete:9.2.0.0' - } + // rule(enforcer.rules.ForceDependencies) { r -> + // r.dependencies.addAll 'com.typesafe.play:twirl-api_2.12:1.3.15', + // 'commons-codec:commons-codec:1.10', + // 'org.apache.commons:commons-lang3:3.6', + // 'org.scala-lang:scala-library:2.12.6', + // 'org.scala-lang:scala-reflect:2.12.6', + // 'org.scala-lang.modules:scala-parser-combinators_2.12:1.1.1', + // 'com.fasterxml.jackson.core:jackson-core:2.8.11', + // 'com.fasterxml.jackson.core:jackson-annotations:2.8.11', + // 'com.fasterxml.jackson.core:jackson-databind:2.8.11.1', + // 'junit:junit:4.12', + // 'com.google.code.findbugs:jsr305:3.0.2', + // 'org.seleniumhq.selenium:selenium-api:3.5.3', + // 'org.seleniumhq.selenium:selenium-support:3.5.3', + // 'org.seleniumhq.selenium:selenium-remote-driver:3.5.3', + // 'com.google.guava:guava:23.0', + // 'com.typesafe.akka:akka-actor_2.12:2.5.17', + // 'com.typesafe.akka:akka-stream_2.12:2.5.17', + // 'com.typesafe:config:1.3.3', + // 'org.slf4j:slf4j-api:1.7.25', + // 'org.slf4j:jul-to-slf4j:1.7.25', + // 'org.bouncycastle:bcprov-jdk15on:1.60', + // 'org.jruby:jruby-complete:9.2.0.0' + // } } diff --git a/subprojects/bootstrapfx-core/bootstrapfx-core.gradle b/subprojects/bootstrapfx-core/bootstrapfx-core.gradle index fa90772..b7a8b58 100644 --- a/subprojects/bootstrapfx-core/bootstrapfx-core.gradle +++ b/subprojects/bootstrapfx-core/bootstrapfx-core.gradle @@ -24,7 +24,9 @@ plugins { id 'java-library' - id 'io.freefair.jsass-java' version '5.3.0' + id 'org.jonnyzzz.java9c' + id 'org.javamodularity.moduleplugin' + id 'io.freefair.jsass-java' } config { @@ -38,8 +40,8 @@ processResources { exclude('**/*.scss') } -jar { - manifest { - attributes('Automatic-Module-Name': 'org.kordamp.bootstrapfx.core') - } -} +dependencies { + compileOnly "org.openjfx:javafx-base:${javafxVersion}:${platform}" + compileOnly "org.openjfx:javafx-graphics:${javafxVersion}:${platform}" + compileOnly "org.openjfx:javafx-controls:${javafxVersion}:${platform}" +} \ No newline at end of file diff --git a/subprojects/sampler-jpro/src/main/java/org/kordamp/bootstrapfx/SamplerJPro.java b/subprojects/bootstrapfx-core/src/main/java/module-info.java similarity index 50% rename from subprojects/sampler-jpro/src/main/java/org/kordamp/bootstrapfx/SamplerJPro.java rename to subprojects/bootstrapfx-core/src/main/java/module-info.java index f3505d4..866624a 100644 --- a/subprojects/sampler-jpro/src/main/java/org/kordamp/bootstrapfx/SamplerJPro.java +++ b/subprojects/bootstrapfx-core/src/main/java/module-info.java @@ -21,37 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kordamp.bootstrapfx; - -import javafx.application.Application; -import javafx.scene.Scene; -import javafx.scene.layout.StackPane; -import javafx.stage.Stage; /** - * @author Florian Kirmaier + * @author Andres Almiray */ -public class SamplerJPro extends Application { - @Override - public void start(Stage primaryStage) throws Exception { - - StackPane innerPane = new StackPane(new DemoTabPane()); - innerPane.setMaxWidth(1000); - innerPane.setMaxHeight(600); - innerPane.setStyle("-fx-background-color: #ddd; -fx-background-radius: 10;"); - StackPane outerPane = new StackPane(innerPane); - outerPane.setStyle("-fx-background-image: url('/org/kordamp/bootstrapfx/ambient-background.jpg');" + - "-fx-background-size: cover;"); - - Scene scene = new Scene(outerPane); - scene.getStylesheets().addAll( - "org/kordamp/bootstrapfx/bootstrapfx.css", - "org/kordamp/bootstrapfx/sampler.css", - "org/kordamp/bootstrapfx/xml-highlighting.css"); - - primaryStage.setTitle("BootstrapFX Sampler"); - primaryStage.setScene(scene); - primaryStage.show(); - } +module org.kordamp.bootstrapfx.core { + exports org.kordamp.bootstrapfx; + exports org.kordamp.bootstrapfx.scene.layout; + requires transitive javafx.base; + requires transitive javafx.graphics; + requires javafx.controls; } diff --git a/subprojects/sampler-jpro/sampler-jpro.gradle b/subprojects/bootstrapfx-core/src/main/java/org/kordamp/bootstrapfx/Marker.java similarity index 77% rename from subprojects/sampler-jpro/sampler-jpro.gradle rename to subprojects/bootstrapfx-core/src/main/java/org/kordamp/bootstrapfx/Marker.java index 4116cdb..62ecf12 100644 --- a/subprojects/sampler-jpro/sampler-jpro.gradle +++ b/subprojects/bootstrapfx-core/src/main/java/org/kordamp/bootstrapfx/Marker.java @@ -21,25 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +package org.kordamp.bootstrapfx; -plugins { - id 'java-library' - id 'application' - id 'com.sandec.jpro' -} - -config { - artifacts { - source { enabled = false } +/** + * @author Andres Almiray + */ +public final class Marker { + private Marker() { + // noop } - publishing { enabled = false } - bintray { enabled = false } -} - -application { - mainClass = 'org.kordamp.bootstrapfx.SamplerJPro' -} - -dependencies { - api project(':sampler') -} +} \ No newline at end of file diff --git a/subprojects/bootstrapfx-core/src/main/java/org/kordamp/bootstrapfx/scene/layout/Panel.java b/subprojects/bootstrapfx-core/src/main/java/org/kordamp/bootstrapfx/scene/layout/Panel.java index 5c3aff8..76336c8 100644 --- a/subprojects/bootstrapfx-core/src/main/java/org/kordamp/bootstrapfx/scene/layout/Panel.java +++ b/subprojects/bootstrapfx-core/src/main/java/org/kordamp/bootstrapfx/scene/layout/Panel.java @@ -33,6 +33,9 @@ import javafx.scene.layout.GridPane; import javafx.scene.layout.Priority; +/** + * @author Andres Almiray + */ @DefaultProperty("body") public class Panel extends BorderPane { private ObjectProperty heading; diff --git a/subprojects/sampler-jpro/src/main/resources/org/kordamp/bootstrapfx/ambient-background.jpg b/subprojects/sampler-jpro/src/main/resources/org/kordamp/bootstrapfx/ambient-background.jpg deleted file mode 100644 index 6f4879a..0000000 Binary files a/subprojects/sampler-jpro/src/main/resources/org/kordamp/bootstrapfx/ambient-background.jpg and /dev/null differ diff --git a/subprojects/sampler/sampler.gradle b/subprojects/sampler/sampler.gradle index ebe1475..ad10154 100644 --- a/subprojects/sampler/sampler.gradle +++ b/subprojects/sampler/sampler.gradle @@ -24,6 +24,8 @@ plugins { id 'java-library' + id 'org.jonnyzzz.java9c' + id 'org.javamodularity.moduleplugin' id 'application' } @@ -36,11 +38,16 @@ config { } application { - mainClass = 'org.kordamp.bootstrapfx.Sampler' + mainClassName = 'org.kordamp.bootstrapfx.sampler/org.kordamp.bootstrapfx.sampler.Sampler' } dependencies { api project(':bootstrapfx-core') api 'org.fxmisc.richtext:richtextfx:0.10.5' - api 'org.apache.commons:commons-io:1.3.2' + api 'commons-io:commons-io:2.8.0' + + api "org.openjfx:javafx-base:${javafxVersion}:${platform}" + api "org.openjfx:javafx-graphics:${javafxVersion}:${platform}" + api "org.openjfx:javafx-controls:${javafxVersion}:${platform}" + api "org.openjfx:javafx-fxml:${javafxVersion}:${platform}" } diff --git a/subprojects/sampler/src/main/java/module-info.java b/subprojects/sampler/src/main/java/module-info.java new file mode 100644 index 0000000..be3daba --- /dev/null +++ b/subprojects/sampler/src/main/java/module-info.java @@ -0,0 +1,34 @@ +/* + * SPDX-License-Identifier: MIT + * + * Copyright (c) 2015-2020 Andres Almiray. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +module org.kordamp.bootstrapfx.sampler { + exports org.kordamp.bootstrapfx.sampler; + requires org.kordamp.bootstrapfx.core; + requires javafx.base; + requires javafx.graphics; + requires javafx.controls; + requires javafx.fxml; + requires org.fxmisc.richtext; + requires org.apache.commons.io; +} \ No newline at end of file diff --git a/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/DemoTabPane.java b/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/DemoTabPane.java similarity index 98% rename from subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/DemoTabPane.java rename to subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/DemoTabPane.java index 9dbbd2f..bfc9098 100644 --- a/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/DemoTabPane.java +++ b/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/DemoTabPane.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kordamp.bootstrapfx; +package org.kordamp.bootstrapfx.sampler; import javafx.fxml.FXMLLoader; import javafx.geometry.Side; @@ -34,7 +34,6 @@ import java.net.URL; public class DemoTabPane extends StackPane { - public DemoTabPane() throws Exception { URL location = getClass().getResource("sampler.fxml"); FXMLLoader fxmlLoader = new FXMLLoader(location); diff --git a/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/Sampler.java b/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/Sampler.java similarity index 75% rename from subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/Sampler.java rename to subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/Sampler.java index 8a8cb90..097ca59 100644 --- a/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/Sampler.java +++ b/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/Sampler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kordamp.bootstrapfx; +package org.kordamp.bootstrapfx.sampler; import javafx.application.Application; import javafx.scene.Scene; @@ -29,20 +29,17 @@ public class Sampler extends Application { @Override - public void start(Stage primaryStage) throws Exception { - + public void start(Stage stage) throws Exception { Scene scene = new Scene(new DemoTabPane()); - scene.getStylesheets().addAll( - "org/kordamp/bootstrapfx/bootstrapfx.css", - "org/kordamp/bootstrapfx/sampler.css", - "org/kordamp/bootstrapfx/xml-highlighting.css"); - primaryStage.setTitle("BootstrapFX Sampler"); - primaryStage.setScene(scene); - //primaryStage.sizeToScene(); - primaryStage.setWidth(1024); - primaryStage.show(); + scene.getStylesheets().addAll( + "org/kordamp/bootstrapfx/bootstrapfx.css", + "org/kordamp/bootstrapfx/sampler/sampler.css", + "org/kordamp/bootstrapfx/sampler/xml-highlighting.css"); + stage.setTitle("BootstrapFX Sampler"); + stage.setScene(scene); + stage.setWidth(1024); + stage.show(); } - } diff --git a/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/XMLEditor.java b/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/XMLEditor.java similarity index 99% rename from subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/XMLEditor.java rename to subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/XMLEditor.java index 622f4be..19a55c1 100644 --- a/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/XMLEditor.java +++ b/subprojects/sampler/src/main/java/org/kordamp/bootstrapfx/sampler/XMLEditor.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.kordamp.bootstrapfx; +package org.kordamp.bootstrapfx.sampler; import org.fxmisc.richtext.CodeArea; import org.fxmisc.richtext.LineNumberFactory; diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler.fxml deleted file mode 100644 index 2764446..0000000 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler.fxml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/alerts.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/alerts.fxml similarity index 59% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/alerts.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/alerts.fxml index 3ab8be4..aae3884 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/alerts.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/alerts.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/button_groups.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/button_groups.fxml similarity index 55% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/button_groups.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/button_groups.fxml index a6149bd..0e07327 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/button_groups.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/button_groups.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/buttons.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/buttons.fxml similarity index 73% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/buttons.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/buttons.fxml index 4fd7991..a890cb3 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/buttons.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/buttons.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/labels.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/labels.fxml similarity index 81% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/labels.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/labels.fxml index 5acb59a..81edcca 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/labels.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/labels.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/panels.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/panels.fxml similarity index 64% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/panels.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/panels.fxml index eb033c2..f0e0d17 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/panels.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/panels.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/paragraph.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/paragraph.fxml similarity index 58% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/paragraph.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/paragraph.fxml index 8a5cc6f..d8ada94 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/paragraph.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/paragraph.fxml @@ -1,34 +1,8 @@ - - - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/progressbars.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/progressbars.fxml similarity index 55% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/progressbars.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/progressbars.fxml index 9b12b49..e5b3009 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/progressbars.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/progressbars.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler.css b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/sampler.css similarity index 100% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler.css rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/sampler.css diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/sampler.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/sampler.fxml new file mode 100644 index 0000000..3dc8182 --- /dev/null +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/sampler.fxml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/split_menu_buttons.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/split_menu_buttons.fxml similarity index 76% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/split_menu_buttons.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/split_menu_buttons.fxml index d3e7d5f..f4762be 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/split_menu_buttons.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/split_menu_buttons.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/text.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/text.fxml similarity index 76% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/text.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/text.fxml index 934360e..c5895f2 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/text.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/text.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/text2.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/text2.fxml similarity index 55% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/text2.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/text2.fxml index be874b3..73219db 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/text2.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/text2.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/tooltips.fxml b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/tooltips.fxml similarity index 63% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/tooltips.fxml rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/tooltips.fxml index b1a6dee..f54b7dd 100644 --- a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/tooltips.fxml +++ b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/tooltips.fxml @@ -1,29 +1,5 @@ - diff --git a/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/xml-highlighting.css b/subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/xml-highlighting.css similarity index 100% rename from subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/xml-highlighting.css rename to subprojects/sampler/src/main/resources/org/kordamp/bootstrapfx/sampler/xml-highlighting.css