Skip to content

Marviq/javafx #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michael-tikhonenko wants to merge 59 commits into
base: marviq_dev
Choose a base branch
from
Open

Marviq/javafx #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
9ed74f6
JavaFX migration in progress
michael-tikhonenko Aug 4, 2021
05eed55
Dashboard screen and settings main menu basically implemented
michael-tikhonenko Aug 17, 2021
d7ec84e
JavaFX migration in progress
michael-tikhonenko Aug 4, 2021
1caaf12
Settings navigation implemented (work in progress)
michael-tikhonenko Aug 17, 2021
30d062b
Dashboard and Settings are basically here, continue with Settings det…
michael-tikhonenko Aug 23, 2021
570138e
Filter settings UI draftly implemented
michael-tikhonenko Aug 23, 2021
4817a11
Time settings UI basically implemented
michael-tikhonenko Aug 23, 2021
0bf52b4
Settings screen now can have multiple sections
michael-tikhonenko Aug 25, 2021
36883eb
All settings screens implemented
michael-tikhonenko Aug 25, 2021
87917bd
Settings parameter added
michael-tikhonenko Aug 27, 2021
cfa1de5
Implementing general settings (work in progress)
michael-tikhonenko Aug 30, 2021
590deaa
General settings almost implemented
michael-tikhonenko Aug 31, 2021
ec79d2c
General and time settings now readable in UI
michael-tikhonenko Aug 31, 2021
eb7e9cc
Minor changes in setings scenes
michael-tikhonenko Sep 1, 2021
d7c9c81
Startup settings should use tables
michael-tikhonenko Sep 7, 2021
7c434bd
All settings are mostly implemented
michael-tikhonenko Sep 10, 2021
00d60c8
Dashboard functionality implemented
michael-tikhonenko Sep 14, 2021
c8fc6bc
Protocol alert dialog ported to JavaFX
michael-tikhonenko Sep 14, 2021
ad80dc1
Image carousel view implemented. An original code is borrowed from Or…
michael-tikhonenko Sep 16, 2021
6979397
State settings enabled only for StateGraph, StateModel and QLearning
michael-tikhonenko Sep 19, 2021
c4397ef
Oracle code changes commented (IVS-128)
michael-tikhonenko Sep 20, 2021
a35f2dc
Settings specific to web protocols added to JavaFX UI
michael-tikhonenko Sep 20, 2021
7d671f8
IVS-127: Bootstrap like tag management
michael-tikhonenko Sep 22, 2021
0092ce3
Whitebox settings section created
michael-tikhonenko Sep 23, 2021
792c714
Auto testing could be run from new UI
michael-tikhonenko Sep 30, 2021
26a13db
All Swift UI removed, debug statements added
michael-tikhonenko Oct 12, 2021
6a8d29a
All Swing UI removed, debug in progress
michael-tikhonenko Oct 12, 2021
0bf3e9c
Debug version with inactivated GUI
michael-tikhonenko Oct 12, 2021
d2e7924
Lifecycle debugged with some TODOs
michael-tikhonenko Oct 13, 2021
6d6cf75
More debug outputs removed
michael-tikhonenko Oct 14, 2021
15d7ec8
UI related code (error messaging, URL opening) moved from protocols
michael-tikhonenko Oct 15, 2021
1f9050d
An extra launcher added to the dashboard
michael-tikhonenko Oct 18, 2021
9fbdd08
Dashboard and Sonarqube settings UI extended
michael-tikhonenko Oct 22, 2021
298d833
Sonarqube GIT section fixed
michael-tikhonenko Oct 22, 2021
933d123
Whitebox test UI added (not connected yet)
michael-tikhonenko Oct 25, 2021
63815c5
Settings save & discard behaviour improved (IVS-142)
michael-tikhonenko Oct 27, 2021
447aae5
Ready for demo
michael-tikhonenko Oct 27, 2021
f2306a3
Minor changes in a default config
michael-tikhonenko Oct 27, 2021
613e003
Minor improvement: an initial dialog now has "Welcome to TESTAR!" text
michael-tikhonenko Oct 28, 2021
cda39c6
Configuration fixed for demo
michael-tikhonenko Oct 28, 2021
0f96d74
Minor changes
michael-tikhonenko Oct 28, 2021
5b8dceb
Added defaults to webdriver_statemodel protocol
michael-tikhonenko Oct 28, 2021
997b543
Missing resources added
michael-tikhonenko Oct 28, 2021
8853111
DataStoreType issue fixed
michael-tikhonenko Oct 28, 2021
32964c0
"Whitebox test" changed with "Static analysis", spinners replaced wit…
michael-tikhonenko Nov 5, 2021
dfef044
UI refactored, bindings look fully functional
michael-tikhonenko Nov 18, 2021
0623c68
Default project changed for webdriver_generic
ardolynk-reborn Dec 7, 2021
05339c9
Application lifecycle fixed
ardolynk-reborn Dec 20, 2021
9ed86f5
Making JavaFX UI resizable (work in progress)
ardolynk-reborn Dec 7, 2021
33b1e34
Making JavaFX UI resizable (near complete)
ardolynk-reborn Dec 12, 2021
aa1e619
IVS-150: display shelf code modified to create looped carousel with a…
ardolynk-reborn Jan 5, 2022
3c459b1
Minor change: perspective image modification commented
ardolynk-reborn Jan 5, 2022
f7c743e
Debug output and some comments removed
ardolynk-reborn Jan 10, 2022
9e721a1
Added GIT clone operation to the static analysis
ardolynk-reborn Jan 10, 2022
bd838ce
Waste code removed
ardolynk-reborn Jan 11, 2022
8890f2b
Alert message error fixed
ardolynk-reborn Jan 20, 2022
a0787f6
IVS-188 JavaFX error messaging
ardolynk-reborn Mar 17, 2022
eff753f
IVS-190 Settings controllers crash for some protocols
ardolynk-reborn Mar 18, 2022
fe9d66f
IVS-189 Improve autoresizing
ardolynk-reborn Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions testar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ dependencies {
implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.1'
implementation group: 'com.orientechnologies', name: 'orientdb-graphdb', version: '3.0.34'
implementation 'com.jfoenix:jfoenix:8.0.10'
implementation 'org.jsoup:jsoup:1.13.1'
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.10.0.202012080955-r'
}

Expand Down
22 changes: 22 additions & 0 deletions testar/resources/jfx/Untitled.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Line?>
<?import javafx.scene.text.Font?>


<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-background-color: #4d8acb;" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Line endX="502.29290771484375" endY="-1.5355340242385864" startX="-100.0" stroke="WHITE" />
<Label id="procStage" alignment="CENTER" contentDisplay="CENTER" prefHeight="29.0" prefWidth="603.0" text="Project languages" textAlignment="CENTER" textFill="WHITE">
<font>
<Font name="System Bold" size="18.0" />
</font>
<VBox.margin>
<Insets top="24.0" />
</VBox.margin>
</Label>
</children>
</VBox>
121 changes: 121 additions & 0 deletions testar/resources/jfx/dashboard.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXButton?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox alignment="CENTER" style="-fx-background-color: #4d8acb #4d8acb;" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Label id="titleLabel" maxWidth="1.7976931348623157E308" prefHeight="64.0" text="Dashboard" textFill="WHITE" VBox.vgrow="NEVER">
<font>
<Font name="Arial Black" size="18.0" />
</font>
<opaqueInsets>
<Insets />
</opaqueInsets>
<VBox.margin>
<Insets left="32.0" />
</VBox.margin>
</Label>
<HBox VBox.vgrow="ALWAYS" />
<HBox alignment="CENTER" style="-fx-spacing: 24;" VBox.vgrow="NEVER">
<children>
<JFXButton id="btnSpyMode" contentDisplay="TOP" graphicTextGap="24.0" prefHeight="128.0" prefWidth="128.0" style="-fx-border-color: #ffffff; -fx-border-radius: 12; -fx-background-radius: 12;" text="SPY Mode" textAlignment="CENTER" textFill="WHITE" wrapText="true">
<graphic>
<ImageView fitHeight="38.0" fitWidth="55.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@icons/spy.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
<JFXButton id="btnAutoTest" contentDisplay="TOP" graphicTextGap="24.0" prefHeight="128.0" prefWidth="128.0" style="-fx-border-color: #ffffff; -fx-border-radius: 12; -fx-background-radius-fx-background-radius: 12;" text="Start automated test" textAlignment="CENTER" textFill="WHITE" wrapText="true">
<graphic>
<ImageView fitHeight="38.0" fitWidth="55.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@icons/auto.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
<JFXButton id="btnRecTest" contentDisplay="TOP" graphicTextGap="24.0" prefHeight="128.0" prefWidth="128.0" style="-fx-border-color: #ffffff; -fx-border-radius: 12; -fx-background-radius: 12;" text="Record test" textAlignment="CENTER" textFill="WHITE" wrapText="true">
<graphic>
<ImageView fitHeight="38.0" fitWidth="55.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@icons/rec.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
</children>
</HBox>
<HBox alignment="CENTER" style="-fx-spacing: 24;" VBox.vgrow="NEVER">
<children>
<JFXButton id="btnWhiteboxTest" contentDisplay="TOP" graphicTextGap="24.0" prefHeight="128.0" prefWidth="128.0" style="-fx-border-color: #ffffff; -fx-border-radius: 12; -fx-background-radius: 12;" text="Static analysis" textAlignment="CENTER" textFill="WHITE" wrapText="true">
<graphic>
<ImageView id="btnWhiteboxTest" fitHeight="38.0" fitWidth="55.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@icons/source.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
<JFXButton id="btnReplayTest" contentDisplay="TOP" graphicTextGap="24.0" prefHeight="128.0" prefWidth="128.0" style="-fx-border-color: #ffffff; -fx-border-radius: 12; -fx-background-radius: 12;" text="Replay test" textAlignment="CENTER" textFill="WHITE" wrapText="true">
<graphic>
<ImageView fitHeight="38.0" fitWidth="55.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@icons/replay.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
<JFXButton id="btnViewReports" contentDisplay="TOP" graphicTextGap="24.0" prefHeight="128.0" prefWidth="128.0" style="-fx-border-color: #ffffff; -fx-border-radius: 12; -fx-background-radius: 12;" text="View reports" textAlignment="CENTER" textFill="WHITE" wrapText="true">
<graphic>
<ImageView fitHeight="38.0" fitWidth="55.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@icons/view.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
</children>
<VBox.margin>
<Insets top="16.0" />
</VBox.margin>
</HBox>
<HBox alignment="CENTER" minHeight="48.0" style="-fx-spacing: 40;" VBox.vgrow="ALWAYS">
<children>
<JFXButton id="btnDownloads" buttonType="RAISED" prefHeight="36.0" prefWidth="160.0" style="-fx-background-color: a8cbe8; -fx-background-radius: 18;" text="Visit downloads" textFill="WHITE">
<font>
<Font name="Arial Bold" size="13.0" />
</font>
</JFXButton>
<JFXButton id="btnUpdate" buttonType="RAISED" prefHeight="36.0" prefWidth="160.0" style="-fx-background-color: f7f7f7; -fx-background-radius: 18;" text="Update software">
<font>
<Font name="Arial Bold" size="13.0" />
</font>
</JFXButton>
<JFXButton id="btnManual" buttonType="RAISED" prefHeight="36.0" prefWidth="160.0" style="-fx-background-color: f7f7f7; -fx-background-radius: 18;" text="User manual">
<font>
<Font name="Arial Bold" size="13.0" />
</font>
</JFXButton>
</children>
</HBox>
<HBox alignment="CENTER" minHeight="23.0" prefHeight="23.0" prefWidth="736.0" VBox.vgrow="ALWAYS">
<children>
<Label text="Our partners" textFill="WHITE">
<font>
<Font name="Arial Bold" size="18.0" />
</font>
</Label>
</children>
</HBox>
<HBox id="carouselBox" alignment="CENTER" minHeight="60.0" prefHeight="120.0" VBox.vgrow="NEVER" />
</children>
</VBox>
23 changes: 23 additions & 0 deletions testar/resources/jfx/filter_button.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXButton?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>

<JFXButton id="btnBack" buttonType="RAISED" contentDisplay="RIGHT" prefHeight="36.0" style="-fx-background-color: f7f7f7 f7f7f7; -fx-background-radius: 18;" text="Some filter" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
<graphic>
<JFXButton contentDisplay="GRAPHIC_ONLY">
<graphic>
<ImageView id="btnClose" fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@icons/close.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
</graphic>
<padding>
<Insets left="8.0" />
</padding>
</JFXButton>
15 changes: 15 additions & 0 deletions testar/resources/jfx/flash_feedback.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.text.Font?>


<Label id="messageText" style="-fx-background-color: #000000;" text="Message text" textFill="WHITE" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
<font>
<Font name="System Bold" size="14.0" />
</font>
<padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0" />
</padding>
</Label>
Binary file added testar/resources/jfx/icons/add.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/attach.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/auto.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/back.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/close.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/close_white.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/filter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/general.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/home.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/info.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/misc.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/rec.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/replay.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added testar/resources/jfx/icons/settings.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading