Skip to content

Commit 55f89d8

Browse files
caitlinlilleykoppor
authored andcommitted
Added library and entry selection boxes to the UI on "Aux file import" screen
1 parent e23031f commit 55f89d8

File tree

3 files changed

+40
-1
lines changed

3 files changed

+40
-1
lines changed

src/main/java/org/jabref/gui/auximport/FromAuxDialog.fxml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<?import javafx.scene.control.Button?>
44
<?import javafx.scene.control.ButtonType?>
5+
<?import javafx.scene.control.ComboBox?>
56
<?import javafx.scene.control.DialogPane?>
67
<?import javafx.scene.control.Label?>
78
<?import javafx.scene.control.ListView?>
@@ -12,7 +13,6 @@
1213
<?import javafx.scene.layout.VBox?>
1314
<?import javafx.scene.text.Font?>
1415
<?import org.jabref.gui.icon.JabRefIconView?>
15-
1616
<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="650.0" prefWidth="500.0"
1717
xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.gui.auximport.FromAuxDialog">
1818
<content>
@@ -43,6 +43,17 @@
4343
<TextArea fx:id="statusInfos" editable="false" prefHeight="300.0" wrapText="true"/>
4444
<Label text="%Unknown BibTeX entries:"/>
4545
<ListView fx:id="notFoundList" prefHeight="200"/>
46+
<VBox spacing="10">
47+
<HBox spacing="4">
48+
<Button onAction="#selectAllNewEntries" text="%Select all new entries"/>
49+
<Button onAction="#selectAllEntries" text="%Select all entries"/>
50+
<Button onAction="#unselectAll" text="%Unselect all"/>
51+
</HBox>
52+
<HBox spacing="4" alignment="CENTER_LEFT">
53+
<Label text="%Select library"/>
54+
<ComboBox fx:id="libraryListView" layoutX="16.0" layoutY="52.0"/>
55+
</HBox>
56+
</VBox>
4657
</VBox>
4758
</VBox>
4859
</content>

src/main/java/org/jabref/gui/auximport/FromAuxDialog.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
import javafx.fxml.FXML;
66
import javafx.scene.control.Button;
77
import javafx.scene.control.ButtonType;
8+
import javafx.scene.control.ComboBox;
89
import javafx.scene.control.ListView;
910
import javafx.scene.control.TextArea;
1011
import javafx.scene.control.TextField;
1112

1213
import org.jabref.gui.DialogService;
1314
import org.jabref.gui.JabRefFrame;
1415
import org.jabref.gui.LibraryTab;
16+
import org.jabref.gui.importer.ImportEntriesViewModel;
1517
import org.jabref.gui.theme.ThemeManager;
1618
import org.jabref.gui.util.BaseDialog;
1719
import org.jabref.gui.util.FileDialogConfiguration;
@@ -22,16 +24,22 @@
2224
import org.jabref.logic.util.StandardFileType;
2325
import org.jabref.model.database.BibDatabase;
2426
import org.jabref.model.database.BibDatabaseContext;
27+
import org.jabref.model.entry.BibEntry;
2528
import org.jabref.preferences.PreferencesService;
2629

2730
import com.airhacks.afterburner.views.ViewLoader;
2831
import jakarta.inject.Inject;
32+
import org.controlsfx.control.CheckListView;
2933

3034
/**
3135
* A wizard dialog for generating a new sub database from existing TeX AUX file
3236
*/
3337
public class FromAuxDialog extends BaseDialog<Void> {
3438

39+
public CheckListView<BibEntry> entriesListView;
40+
41+
private ImportEntriesViewModel viewModel;
42+
public ComboBox<String> libraryListView;
3543
private final LibraryTab libraryTab;
3644
@FXML private ButtonType generateButtonType;
3745
private final Button generateButton;
@@ -99,4 +107,23 @@ private void browseButtonClicked() {
99107
.withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory()).build();
100108
dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> auxFileField.setText(file.toAbsolutePath().toString()));
101109
}
110+
111+
public void unselectAll() {
112+
entriesListView.getCheckModel().clearChecks();
113+
}
114+
115+
public void selectAllNewEntries() {
116+
unselectAll();
117+
for (BibEntry entry : entriesListView.getItems()) {
118+
if (!viewModel.hasDuplicate(entry)) {
119+
entriesListView.getCheckModel().check(entry);
120+
}
121+
}
122+
}
123+
124+
public void selectAllEntries() {
125+
unselectAll();
126+
entriesListView.getCheckModel().checkAll();
127+
}
128+
102129
}

src/main/resources/build.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ springerNatureAPIKey=${springerNatureAPIKey}
66
astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey}
77
ieeeAPIKey=${ieeeAPIKey}
88
biodiversityHeritageApiKey=${biodiversityHeritageApiKey}
9+
Select\ library=Create property

0 commit comments

Comments
 (0)