From 67b6aed97f4b1c56a599a3f96201af2f1513fdd0 Mon Sep 17 00:00:00 2001
From: dk3g19 <dk3g19@soton.ac.uk>
Date: Fri, 30 Apr 2021 15:36:10 +0100
Subject: [PATCH] Correct theming for second metric table, improve help guide
---
src/HelperWindow.java | 6 +++---
src/MainApp.java | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/HelperWindow.java b/src/HelperWindow.java
index 8981143..40b05ee 100644
--- a/src/HelperWindow.java
+++ b/src/HelperWindow.java
@@ -22,15 +22,15 @@ public class HelperWindow extends Stage {
Label importingHeader = new Label("\nHow to import\n");
- Label importing = new Label("\n 1. Click on the 'File' tab\n 2. Click on 'Import'\n" +
+ Label importing = new Label("\n 1. Click on the 'File' tab\n 2. Click on 'Import'\n\n" +
" 3. Importing from CSV files:\n a) Selecting a folder containing the three CSV files:\n" +
" i) Click on the 'Browse folder' button\n" +
" ii) In the file explorer, select the folder containing the three CSV files\n" +
" b) Selecting the three CSV files individually:\n" +
" i) For each of the three CSV files, click on the '...' button to open a file dialog and locate the file\n" +
" ii) Select the respective file and then click 'Open' on the file dialog\n" +
- " c) If you wish to save to an SQLite .db file for future use, click on the checkbox and then click on 'Browse...' to save the file into a folder\n" +
- " 4. Loading an SQLite .db file:\n a) Click on the '...' button to locate the .db file containing the Campaign date\n" +
+ " c) If you wish to save to an SQLite .db file for future use, click on the checkbox and then click on 'Browse...' to save the file into a folder\n\n" +
+ " 4. Loading an SQLite .db file:\n a) Click on the '...' button to locate the .db file containing the Campaign date\n\n" +
" 5. Click on the 'Import' button to load the data into the application\n");
Label globalHeader = new Label("\nHow to use the global controls\n");
diff --git a/src/MainApp.java b/src/MainApp.java
index fd507b6..dce6064 100644
--- a/src/MainApp.java
+++ b/src/MainApp.java
@@ -115,6 +115,30 @@ public class MainApp extends Application {
mainUI.metricTableView.CPCTitle.setStyle(mainUI.metricTableView.border + border);
mainUI.metricTableView.CPMTitle.setStyle(mainUI.metricTableView.border + border);
mainUI.metricTableView.getTopTablegrid().setStyle(border);
+
+ mainUI.secondMetricTableView.impLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.bounceLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.bounceRateLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.clickLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.uniLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.convLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.totalCostLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.CTRLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.CPALabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.CPCLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.CPMLabel.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.impTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.bounceTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.bounceRateTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.clickTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.uniTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.convTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.totalTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.CTRTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.CPATitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.CPCTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.CPMTitle.setStyle(mainUI.secondMetricTableView.border + border);
+ mainUI.secondMetricTableView.getTopTablegrid().setStyle(border);
}
public void removeThemes(String theme1, String theme2) {
--
GitLab