Skip to content

Commit 9c1b110

Browse files
authored
Merge pull request #28 from frosch95/total_number_of_lines
total number of lines
2 parents a79dde5 + 398219a commit 9c1b110

File tree

6 files changed

+14
-3
lines changed

6 files changed

+14
-3
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ even in a "normal" CSV editor. So I decided to write this simple JavaFX applicat
1515

1616
[Wiki & Documentation](https://github.com/frosch95/SmartCSV.fx/wiki)
1717

18-
binary distribution of the [latest release (1.0.1)](https://github.com/frosch95/SmartCSV.fx/releases/download/1.0.1/SmartCSV.fx-1.0.1.zip)
18+
binary distribution of the [latest release (1.1.0)](https://github.com/frosch95/SmartCSV.fx/releases/download/1.1.0/SmartCSV.fx-1.0.1.zip)
1919

2020
## Talks
2121
[Introduction](http://javafx.ninja/talks/introduction/)

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ test {
4848
}
4949

5050
group 'ninja.javafx'
51-
version '1.0.1'
51+
version '1.1.0'
5252
mainClassName = 'ninja.javafx.smartcsv.Main'

src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java

+5
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@ public class SmartCSVController extends FXMLController {
208208
@FXML
209209
private Label currentLineNumber;
210210

211+
@FXML
212+
private Label totalNumberOfLines;
213+
211214
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
212215
// members
213216
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -674,6 +677,8 @@ private void resetContent() {
674677
tableView.getItems().setAll(currentCsvFile.getContent().getRows());
675678
tableView.setEditable(true);
676679

680+
totalNumberOfLines.textProperty().setValue("" + currentCsvFile.getContent().getRows().size());
681+
677682
setBottomAnchor(tableView, 0.0);
678683
setTopAnchor(tableView, 0.0);
679684
setLeftAnchor(tableView, 0.0);

src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml

+5-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,9 @@
275275
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0" />
276276
<ColumnConstraints hgrow="NEVER" minWidth="10.0" />
277277
<ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
278-
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0" />
278+
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0" />
279+
<ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
280+
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0" />
279281
</columnConstraints>
280282
<rowConstraints>
281283
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -289,6 +291,8 @@
289291
<Label fx:id="configurationName" GridPane.columnIndex="5" GridPane.hgrow="ALWAYS" />
290292
<Label text="%lineNumber" GridPane.columnIndex="7" />
291293
<Label fx:id="currentLineNumber" text="" GridPane.columnIndex="8" />
294+
<Label text="%totalNumberOfLines" GridPane.columnIndex="9" />
295+
<Label fx:id="totalNumberOfLines" text="0" GridPane.columnIndex="10" />
292296
</children>
293297
<BorderPane.margin>
294298
<Insets bottom="4.0" left="8.0" right="8.0" top="4.0" />

src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.properties

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ dialog.validation.rules.header = Validation rules of column "{0}"
8787
context.menu.edit.column.rules = Edit rules
8888

8989
lineNumber = Selected line:
90+
totalNumberOfLines = Lines:
9091

9192
log.header.message = {0} has {1} errors
9293
log.message = row {0} column {1} : {2}

src/main/resources/ninja/javafx/smartcsv/fx/smartcsv_de.properties

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ dialog.validation.rules.header = Pr\u00fcfregeln f\u00fcr die Spalte "{0}"
9797
context.menu.edit.column.rules = Pr\u00fcfregeln bearbeiten
9898

9999
lineNumber = Ausgew\u00e4hlte Zeile:
100+
totalNumberOfLines = Zeilen:
100101

101102
log.header.message = {0} hat {1} Fehler
102103
log.message = Zeile {0} Spalte {1} : {2}

0 commit comments

Comments
 (0)