Convert New entry dialog to javafx #4312

Siedlerchr · 2018-09-02T17:00:55Z

Followup from #4266

bibtex +custom

biblatex + custom

Change in CHANGELOG.md described
Tests created for changes
Manually tested changed features in running JabRef
Screenshots added in PR description (for bigger UI changes)
Ensured that the git commit message is a good one
Check documentation status (Issue created for outdated help page at help.jabref.org?)

…wEntryDialog * 'master' of https://github.com/1160300608/jabref: fix pdfImport old dialog problem fix order and empty else statement delete useless class file convert the NewEntryType Dialog to javafx # Conflicts: # src/main/java/org/jabref/gui/EntryTypeDialog.java # src/main/java/org/jabref/gui/actions/NewEntryAction.java

add title pane add bindings Create view model todo Co-authored-by: 1160300608 <18846010223@163.com>

…fetchr bind combobox directly to fetcher improve binding pass preferences to constructor delete obsolete gui test class and old dialog

tobiasdiez

Thanks a lot for investing the time to get the PR in. Sadly, there are still a lot of (small) code issues that need to be fixed.

tobiasdiez · 2018-09-03T17:41:33Z

src/main/java/org/jabref/gui/BasePanel.java

@@ -772,10 +772,13 @@ public BibEntry newEntry(EntryType type) {
        EntryType actualType = type;
        if (actualType == null) {
            // Find out what type is wanted.
-            final EntryTypeDialog etd = new EntryTypeDialog(frame);
+            //final EntryTypeDialog etd = new EntryTypeDialog(frame);


Remove the old commented code

Rename etv.

tobiasdiez · 2018-09-03T17:44:32Z

src/main/java/org/jabref/gui/BasePanel.java

+            //etd.setVisible(true);
+            //actualType = etd.getChoice();
+            etv.showAndWait();
+            actualType = etv.getChoice();


It is more in line with the JavaFX way, if EntryTypeView derives from Dialog<EntryType> and then you can get the choice as the return value of showAndWait().

tobiasdiez · 2018-09-03T17:45:38Z

src/main/java/org/jabref/gui/EntryTypeView.java

+
+    @FXML private ButtonType generateButton;
+    @FXML private TextField idTextField;
+    @FXML private ComboBox<IdBasedFetcher> comboBox;


better name

tobiasdiez · 2018-09-03T17:45:44Z

src/main/java/org/jabref/gui/EntryTypeView.java

+    @FXML private TitledPane bibTexTitlePane;
+    @FXML private TitledPane ieeeTranTitlePane;
+    @FXML private TitledPane customTitlePane;
+    @FXML private VBox vBox;


tobiasdiez · 2018-09-03T17:46:41Z

src/main/java/org/jabref/gui/EntryTypeView.java

+    private final JabRefPreferences prefs;
+
+    private EntryType type;
+    private Task<Optional<BibEntry>> fetcherWorker = new FetcherWorker();


move worker to the view model

tobiasdiez · 2018-09-03T18:09:47Z

src/main/java/org/jabref/gui/BasePanel.java

@@ -772,10 +772,13 @@ public BibEntry newEntry(EntryType type) {
        EntryType actualType = type;
        if (actualType == null) {
            // Find out what type is wanted.
-            final EntryTypeDialog etd = new EntryTypeDialog(frame);
+            //final EntryTypeDialog etd = new EntryTypeDialog(frame);


Is this method even used with null argument? At least the code below suggests that the JabRefFrame uses the NewEntryAction and does not calls this method.

I just found out that this method and the insertEntry method are doing roughly the same, I think it makes sense to combine their functionaltiy

tobiasdiez · 2018-09-03T18:10:10Z

src/main/java/org/jabref/gui/actions/NewEntryFromPlainTextAction.java

@@ -31,13 +37,15 @@ public void execute() {
            return;
        }

-        EntryTypeDialog typeChoiceDialog = new EntryTypeDialog(jabRefFrame);
-        typeChoiceDialog.setVisible(true);
+        //EntryTypeDialog typeChoiceDialog = new EntryTypeDialog(jabRefFrame);


remove old code

tobiasdiez · 2018-09-03T18:10:43Z

src/main/java/org/jabref/pdfimport/PdfImporter.java

@@ -224,8 +224,10 @@ private void doContentImport(String fileName, List<BibEntry> res) {

    private Optional<BibEntry> createNewEntry() {
        // Find out what type is desired
-        EntryTypeDialog etd = new EntryTypeDialog(frame);
-        etd.setVisible(true);
+        //EntryTypeDialog etd = new EntryTypeDialog(frame);


tobiasdiez · 2018-09-03T18:11:34Z

src/main/java/org/jabref/pdfimport/PdfImporter.java

+        //EntryTypeDialog etd = new EntryTypeDialog(frame);
+        EntryTypeView etd = new EntryTypeView(frame.getCurrentBasePanel(), frame.getDialogService(), Globals.prefs);
+        //etd.setVisible(true);
+        etd.showAndWait();


The code below looks like yet another place with code duplication (which is however slightly different to the one above, eg. timestamp generation).

tobiasdiez · 2018-09-03T18:12:39Z

src/main/java/org/jabref/preferences/JabRefPreferences.java

-                getBoolean(ENFORCE_LEGAL_BIBTEX_KEY),
-                getKeyPattern(),
-                getKeywordDelimiter());
+                                               get(KEY_PATTERN_REGEX),


the code formatting was ok before...this indention looks ugly to be honest.

TODO: merge insertentry and newEntry in basePanel

fix event handler

* upstream/master: Fix that sometimes a white background appeared in the groups panel (#4316) Minimal code improvements Fix drag and drop in entry editor (#4311)

Siedlerchr · 2018-09-06T18:19:48Z

Adressed all comments, The Duplicate check is actually different handled and is slightly coupled to the import inspection dialog. This is stuff for a new PR.

* upstream/master: Wrap preferences in scrollPane as well (#4325)

Siedlerchr · 2018-09-08T10:30:20Z

I would like to merge this now, if no further comments are added.,

1160300608 and others added 6 commits August 15, 2018 10:25

convert the NewEntryType Dialog to javafx

082e2e0

delete useless class file

78db8ec

fix order and empty else statement

b419328

fix pdfImport old dialog problem

0d39e1e

rework fxml code

e65cc2c

add title pane add bindings Create view model todo Co-authored-by: 1160300608 <18846010223@163.com>

Siedlerchr changed the title ~~Convert New entry dialog to javafx~~ [WIP] Convert New entry dialog to javafx Sep 2, 2018

Siedlerchr added 2 commits September 3, 2018 12:49

use managed properties, pass dialog service as argument

8661be7

fix checkstyle

7529535

Siedlerchr mentioned this pull request Sep 3, 2018

Convert/rework rest of the Swing Dialogs to javafx #3861

Closed

36 tasks

Siedlerchr added 2 commits September 3, 2018 17:32

add new prefereces method for getting and setting last used id based …

d6e8e5e

…fetchr bind combobox directly to fetcher improve binding pass preferences to constructor delete obsolete gui test class and old dialog

improve layout, move id grid pane to bottom, remove third col

4ee64ae

Siedlerchr changed the title ~~[WIP] Convert New entry dialog to javafx~~ Convert New entry dialog to javafx Sep 3, 2018

Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Sep 3, 2018

tobiasdiez requested changes Sep 3, 2018

View reviewed changes

Siedlerchr added 2 commits September 3, 2018 22:33

refactor and extract data to ViewModel

5cb013c

TODO: merge insertentry and newEntry in basePanel

fix checkstyle

5909669

Siedlerchr mentioned this pull request Sep 4, 2018

Convert Part of the Issue#3861: Library-> New Entry Dialog to Javafx #4266

Closed

6 tasks

Siedlerchr and others added 8 commits September 4, 2018 16:05

fix result converter

f5d7597

remove newEntry method, replcae with insertEntry

df5f75a

fix event handler

refactor task and add value property to select last used fetcher

0435d8f

Merge remote-tracking branch 'upstream/master' into newEntryDialog

ef38692

* upstream/master: Fix that sometimes a white background appeared in the groups panel (#4316) Minimal code improvements Fix drag and drop in entry editor (#4311)

fix l10nn

fcea463

fix l10n

025b3a3

refactor code some more

f516392

Merge branch 'master' into newEntryDialog

24c47cf

Siedlerchr added 2 commits September 8, 2018 12:16

Merge remote-tracking branch 'upstream/master' into newEntryDialog

4027925

* upstream/master: Wrap preferences in scrollPane as well (#4325)

fix checkstyle

d31b8b6

Siedlerchr merged commit 4c7194a into master Sep 9, 2018

Siedlerchr deleted the newEntryDialog branch September 9, 2018 12:50

luizphilipe2 mentioned this pull request Jun 26, 2021

Convert AutoLinkFilesAction to JavafX luizphilipe2/jabref_experiment#32

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert New entry dialog to javafx #4312

Convert New entry dialog to javafx #4312

Siedlerchr commented Sep 2, 2018 •

edited

Loading

tobiasdiez left a comment

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

Siedlerchr Sep 3, 2018

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

tobiasdiez Sep 3, 2018

Siedlerchr commented Sep 6, 2018

Siedlerchr commented Sep 8, 2018

Convert New entry dialog to javafx #4312

Convert New entry dialog to javafx #4312

Conversation

Siedlerchr commented Sep 2, 2018 • edited Loading

tobiasdiez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Siedlerchr commented Sep 6, 2018

Siedlerchr commented Sep 8, 2018

Siedlerchr commented Sep 2, 2018 •

edited

Loading