Skip to content

Commit 8960ee0

Browse files
authored
Misc. improvements. (#528)
* Tweaked UI LandF * Fixed bug on save lab default table * UPdated default project
1 parent f74c435 commit 8960ee0

File tree

10 files changed

+13
-8
lines changed

10 files changed

+13
-8
lines changed

common.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'java'
66
apply plugin: 'maven'
77

88
String mavenGroupId = 'org.cirdles'
9-
String mavenVersion = '1.6.2'
9+
String mavenVersion = '1.6.3'
1010

1111
sourceCompatibility = '1.8'
1212
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

squidApp/build.gradle

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ dependencies {
2525
compile 'com.github.cirdles:topsoil:eb2d729290'
2626
}
2727

28+
configurations.all {
29+
// Check for updates every build when 0 or not when 2628000
30+
resolutionStrategy.cacheChangingModulesFor 2628000, 'seconds'
31+
}
32+
2833
task fatAppJar(type: Jar) {
2934
manifest {
3035
attributes 'Main-Class': mainClass

squidApp/src/main/java/org/cirdles/squid/gui/dateInterpretations/countCorrections/CountCorrectionsController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private void showUnknownsWithOvercountCorrections() {
172172

173173
TextFlow textFlowI = new TextFlow();
174174

175-
Text textSampleName = new Text(String.format("%1$-" + 28 + "s", spot.getFractionID()));
175+
Text textSampleName = new Text(String.format("%1$-" + 40 + "s", spot.getFractionID()));
176176
textSampleName.setFont(Font.font("Monospaced", FontWeight.BOLD, fontSize));
177177
textFlowI.getChildren().add(textSampleName);
178178

squidApp/src/main/java/org/cirdles/squid/gui/dateInterpretations/plots/plotControllers/RefMatConcordiaToolBoxNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private Path separator() {
142142
}
143143

144144
private void formatNode(Control control, int width) {
145-
control.setStyle(control.getStyle() + "-font-family: San Serif;-fx-font-size: 12px;-fx-font-weight: bold;");
145+
control.setStyle(control.getStyle() + "-font-family: 'Monospaced', 'SansSerif';-fx-font-size: 12px;-fx-font-weight: bold;");
146146
control.setPrefWidth(width);
147147
control.setMinWidth(USE_PREF_SIZE);
148148
control.setPrefHeight(23);

squidApp/src/main/java/org/cirdles/squid/gui/dateInterpretations/plots/plotControllers/RefMatWeightedMeanToolBoxNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private Path separator() {
176176
}
177177

178178
private void formatNode(Control control, int width) {
179-
control.setStyle(control.getStyle() + "-font-family: San Serif;-fx-font-size: 12px;-fx-font-weight: bold;");
179+
control.setStyle(control.getStyle() + "-font-family: 'Monospaced', 'SansSerif';-fx-font-size: 12px;-fx-font-weight: bold;");
180180
control.setPrefWidth(width);
181181
control.setMinWidth(USE_PREF_SIZE);
182182
control.setPrefHeight(23);

squidApp/src/main/java/org/cirdles/squid/gui/dateInterpretations/plots/plotControllers/SamplesConcordiaToolBoxNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private Path separator() {
143143
}
144144

145145
private void formatNode(Control control, int width) {
146-
control.setStyle(control.getStyle() + "-font-family: San Serif;-fx-font-size: 12px;-fx-font-weight: bold;");
146+
control.setStyle(control.getStyle() + "-font-family: 'Monospaced', 'SansSerif';-fx-font-size: 12px;-fx-font-weight: bold;");
147147
control.setPrefWidth(width);
148148
control.setMinWidth(USE_PREF_SIZE);
149149
control.setPrefHeight(23);

squidApp/src/main/java/org/cirdles/squid/gui/dateInterpretations/plots/plotControllers/ToolBoxNodeInterface.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public interface ToolBoxNodeInterface {
3030

3131
public default void formatNode(Control control, int width) {
32-
control.setStyle(control.getStyle() + "-font-family: San Serif;-fx-font-size: 12px;-fx-font-weight: bold;");
32+
control.setStyle(control.getStyle() + "-font-family: 'Monospaced', 'SansSerif';-fx-font-size: 12px;-fx-font-weight: bold;");
3333
control.setPrefWidth(width);
3434
control.setMinWidth(USE_PREF_SIZE);
3535
control.setPrefHeight(23);

squidApp/src/main/java/org/cirdles/squid/gui/dateInterpretations/plots/topsoil/TopsoilPlotAnyTwo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public void changed(ObservableValue observable, Uncertainty oldValue, Uncertaint
165165
}
166166

167167
private void formatNode(Control control, int width) {
168-
control.setStyle(control.getStyle() + "-font-family: San Serif;-fx-font-size: 12px;-fx-font-weight: bold;");
168+
control.setStyle(control.getStyle() + "-font-family: 'Monospaced', 'SansSerif';-fx-font-size: 12px;-fx-font-weight: bold;");
169169
control.setPrefWidth(width);
170170
control.setMinWidth(USE_PREF_SIZE);
171171
control.setPrefHeight(25);

squidApp/src/main/java/org/cirdles/squid/gui/squidReportTable/SquidReportSettingsController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@ private SquidReportTableInterface createCopyOfUpdatedSquidReportTable() {
11301130
categoryListView.getItems().forEach(cat -> cats.add(cat.clone()));
11311131
table.setReportCategories(cats);
11321132
table.setIsDefault(false);
1133-
table.setIsLabDataDefault(false);
1133+
//table.setIsLabDataDefault(false);
11341134

11351135
return table;
11361136
}
Binary file not shown.

0 commit comments

Comments
 (0)