Let user load customized CSS #6036
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <?import javafx.scene.control.*?> | ||
| <?import javafx.scene.layout.*?> | ||
|
|
||
| <?import javafx.geometry.Insets?> | ||
| <DialogPane xmlns="http://javafx.com/javafx" | ||
| xmlns:fx="http://javafx.com/fxml" | ||
| fx:controller="org.jabref.gui.preferences.ExportThemeDialog" | ||
| prefHeight="300.0" prefWidth="500.0"> | ||
|
|
||
| <content> | ||
| <BorderPane> | ||
| <center> | ||
| <TableView fx:id="table"> | ||
| <columns> | ||
| <TableColumn fx:id="columnName" text="%Theme name"/> | ||
| <TableColumn fx:id="columnPath" text="%Path to theme"/> | ||
| </columns> | ||
| <padding> | ||
| <Insets bottom="30.0"/> | ||
| </padding> | ||
| </TableView> | ||
| </center> | ||
| </BorderPane> | ||
| </content> | ||
| <ButtonType fx:constant="CLOSE"/> | ||
| </DialogPane> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package org.jabref.gui.preferences; | ||
|
|
||
| import javafx.collections.FXCollections; | ||
| import javafx.collections.ObservableList; | ||
| import javafx.fxml.FXML; | ||
| import javafx.scene.control.TableColumn; | ||
| import javafx.scene.control.TablePosition; | ||
| import javafx.scene.control.TableRow; | ||
| import javafx.scene.control.TableView; | ||
| import javafx.scene.control.cell.PropertyValueFactory; | ||
| import javafx.scene.input.KeyCode; | ||
|
|
||
| import org.jabref.JabRefException; | ||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.util.BaseDialog; | ||
| import org.jabref.gui.util.FileDialogConfiguration; | ||
| import org.jabref.gui.util.ThemeLoader; | ||
| import org.jabref.logic.l10n.Localization; | ||
| import org.jabref.logic.util.StandardFileType; | ||
| import org.jabref.preferences.JabRefPreferences; | ||
|
|
||
| import com.airhacks.afterburner.views.ViewLoader; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class ExportThemeDialog extends BaseDialog<Void> { | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(ExportThemeDialog.class); | ||
|
|
||
| @FXML | ||
| private TableView<Theme> table; | ||
| @FXML | ||
| private TableColumn<Theme, String> columnName; | ||
| @FXML | ||
| private TableColumn<Theme, String> columnPath; | ||
|
|
||
| private JabRefPreferences preferences; | ||
| private DialogService dialogService; | ||
|
|
||
| public ExportThemeDialog(DialogService dialogService, JabRefPreferences preferences) { | ||
| this.dialogService = dialogService; | ||
| this.preferences = preferences; | ||
|
|
||
| ViewLoader | ||
| .view(this) | ||
| .load() | ||
| .setAsDialogPane(this); | ||
|
|
||
| this.setTitle(Localization.lang("Export Theme")); | ||
| } | ||
|
|
||
| @FXML | ||
| public void initialize() { | ||
| columnName.setCellValueFactory(new PropertyValueFactory<>("name")); | ||
| columnPath.setCellValueFactory(new PropertyValueFactory<>("path")); | ||
|
|
||
| ObservableList<Theme> data = | ||
| FXCollections.observableArrayList(new Theme("Light theme", ThemeLoader.MAIN_CSS), new Theme("Dark theme", ThemeLoader.DARK_CSS)); | ||
|
|
||
| if (!(ThemeLoader.getCustomCss().isBlank())) { | ||
| data.add(new Theme("Custom theme", ThemeLoader.getCustomCss())); | ||
| } | ||
|
|
||
| table.setItems(data); | ||
|
|
||
| table.setOnKeyPressed(event -> { | ||
| TablePosition tablePosition; | ||
| if (event.getCode().equals(KeyCode.ENTER)) { | ||
| tablePosition = table.getFocusModel().getFocusedCell(); | ||
| final int row = tablePosition.getRow(); | ||
| ObservableList<Theme> list = table.getItems(); | ||
| Theme theme = list.get(row); | ||
| exportCSSFile(theme.getPath()); | ||
| } | ||
| }); | ||
|
|
||
| table.setRowFactory(tv -> { | ||
| TableRow<Theme> row = new TableRow<>(); | ||
| row.setOnMouseClicked(event -> handleSelectedRowEvent(row)); | ||
| return row; | ||
| }); | ||
| } | ||
|
|
||
| private void handleSelectedRowEvent(TableRow<Theme> row) { | ||
| if (!row.isEmpty()) { | ||
| exportCSSFile(row.getItem().getPath()); | ||
| } | ||
| } | ||
|
|
||
| private void exportCSSFile(String theme) { | ||
| FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder() | ||
| .addExtensionFilter(StandardFileType.CSS) | ||
| .withDefaultExtension(StandardFileType.CSS) | ||
| .withInitialDirectory(preferences.setLastPreferencesExportPath()) | ||
| .build(); | ||
|
|
||
| dialogService.showFileSaveDialog(fileDialogConfiguration) | ||
| .ifPresent(exportFile -> { | ||
| try { | ||
| preferences.exportTheme(exportFile.getFileName(), theme); | ||
| } catch (JabRefException ex) { | ||
| LOGGER.warn(ex.getMessage(), ex); | ||
| dialogService.showErrorDialogAndWait(Localization.lang("Export theme"), ex); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
Comment on lines
+1
to
+107
There was a problem hiding this comment. This class can be divided according to the mvvm-pattern. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package org.jabref.gui.preferences; | ||
|
|
||
| import javafx.beans.property.SimpleStringProperty; | ||
|
|
||
| public class Theme { | ||
| private SimpleStringProperty name; | ||
| private SimpleStringProperty path; | ||
|
|
||
| public Theme(String name, String path) { | ||
| this.name = new SimpleStringProperty(name); | ||
| this.path = new SimpleStringProperty(path); | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name.get(); | ||
| } | ||
|
|
||
| public String getPath() { | ||
| return path.get(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These new imports don't seem to be necessary.