Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import javafx.scene.control.ComboBox;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
import javafx.scene.control.ListView;
import javafx.scene.layout.Pane;
import javafx.scene.layout.VBox;
import org.slf4j.Logger;
Expand Down Expand Up @@ -73,13 +74,12 @@ public class CrashRecoveryDialogController extends AbstractDialogController {
@FXML
protected Hyperlink issuesLink;
@FXML
protected VBox pluginListContainer;
@FXML
protected Pane incompleteSyncPane;

@FXML
protected ListView<RecoveredPluginView> pluginListContainer;

CrashRecoveryDialogController() {
super(600, 550);
super(600, 650);
this.setOverlayClose(false);
}

Expand Down Expand Up @@ -135,7 +135,7 @@ public void initialize() {
for (Plugin plugin : incompleteSyncPlugins) {
log.info("Last scan for plugin {} is incomplete", plugin.getName());
RecoveredPluginView pluginView = new RecoveredPluginView(plugin, pluginService, this.getApplicationDefaults());
pluginListContainer.getChildren().add(pluginView);
pluginListContainer.getItems().add(pluginView);

this.getTelemetryService().event("/Error/PluginScanIncomplete", p -> {
p.put("nativeDiscoveryLoader", this.getPreferences().get(
Expand All @@ -154,7 +154,7 @@ protected DialogLayout getLayout() {

DialogLayout layout = new DialogLayout();

Label title = new Label("Ooh, something wrong happens :(");
Label title = new Label("Ooh, something wrong happened :(");
title.getStyleClass().add("heading-3");
layout.setHeading(title);
layout.setBody(lazyViewRegistry.get(LazyViewRegistry.CRASH_RECOVERY_VIEW));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
import com.owlplug.plugin.services.PluginService;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.control.ToggleButton;
import javafx.scene.image.ImageView;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.scene.layout.Priority;
import org.controlsfx.control.ToggleSwitch;

public class RecoveredPluginView extends HBox {

Expand All @@ -42,8 +42,7 @@ public RecoveredPluginView(Plugin plugin, PluginService pluginService, Applicati
super();

this.setAlignment(Pos.BASELINE_LEFT);
this.getStyleClass().add("recovered-plugin-view");


Label label = new Label(plugin.getName());
ImageView imageView = new ImageView();
imageView.setImage(applicationDefaults.getPluginFormatIcon(plugin.getFormat()));
Expand All @@ -54,17 +53,17 @@ public RecoveredPluginView(Plugin plugin, PluginService pluginService, Applicati
Pane transparentPane = new Pane();
HBox.setHgrow(transparentPane, Priority.ALWAYS);
this.getChildren().add(transparentPane);
ToggleButton toggleButton = new ToggleButton();
toggleButton.setText("Native Discovery");
toggleButton.setSelected(plugin.getFootprint().isNativeDiscoveryEnabled());

toggleButton.selectedProperty().addListener((observable, oldValue, newValue) -> {

ToggleSwitch toggleSwitch = new ToggleSwitch("Native Discovery");
toggleSwitch.setScaleX(0.8);
toggleSwitch.setScaleY(0.8);
toggleSwitch.setSelected(plugin.getFootprint().isNativeDiscoveryEnabled());
toggleSwitch.selectedProperty().addListener((observable, oldValue, newValue) -> {
plugin.getFootprint().setNativeDiscoveryEnabled(newValue);
pluginService.save(plugin.getFootprint());
});

this.getChildren().add(toggleButton);
this.getChildren().add(toggleSwitch);

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,40 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>

<VBox prefWidth="500.0" spacing="20.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.owlplug.core.controllers.dialogs.CrashRecoveryDialogController">
<VBox prefWidth="500.0" spacing="20.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.owlplug.core.controllers.dialogs.CrashRecoveryDialogController">
<HBox alignment="CENTER_LEFT" spacing="10.0">
<ImageView fitHeight="150.0" fitWidth="80.0" pickOnBounds="true" preserveRatio="true">
<Image url="@../../media/owlplug-owl-crash.png"/>
<Image url="@../../media/owlplug-owl-crash.png" />
</ImageView>
<VBox>
<Label text="It's look like OwlPlug has not been terminated properly." wrapText="true"/>
<Label text="If a crash occurs during plugin sync, it's likely caused by a plugin that fails to load properly. Similar to other DAWs, a corrupted plugin can potentially crash the host application."
wrapText="true"/>
<Label text="It's look like OwlPlug has not been terminated properly." wrapText="true" />
<Label text="If a crash occurs during plugin sync, it's likely caused by a plugin that fails to load properly. Similar to other DAWs, a corrupted plugin can potentially crash the host application." wrapText="true" />
</VBox>
</HBox>
<VBox fx:id="incompleteSyncPane" spacing="5.0">
<Label text="Following plugins have not been analyzed completely. For each plugin, you can turn off &quot;Native Discovery&quot; to skip plugin loading during scanning: "/>
<VBox fx:id="pluginListContainer"/>
<VBox VBox.vgrow="ALWAYS">
<children>
<Label text="Following plugins have not been analyzed completely." wrapText="true" />
<Label layoutX="10.0" layoutY="10.0" text="For each plugin, you can turn off &quot;Native Discovery&quot; to skip plugin loading during scanning: " wrapText="true" />
</children>
</VBox>
<ListView fx:id="pluginListContainer" VBox.vgrow="SOMETIMES" />
<VBox fx:id="incompleteSyncPane" spacing="5.0" VBox.vgrow="ALWAYS" />
<VBox spacing="5.0" VBox.vgrow="SOMETIMES">
<VBox.margin>
<Insets bottom="10.0" top="10.0"/>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
<Label text="You can try to change the scanner implementation or disable native discovery globally in Options:"
wrapText="true"/>
<Label text="You can try to change the scanner implementation or disable native discovery globally in Options:" wrapText="true" />
<HBox spacing="5.0">
<CheckBox fx:id="nativeDiscoveryCheckbox" text="Global Native plugin discovery using"/>
<ComboBox fx:id="pluginNativeComboBox" prefHeight="25.0" HBox.hgrow="SOMETIMES"/>
<CheckBox fx:id="nativeDiscoveryCheckbox" text="Global Native plugin discovery using" />
<ComboBox fx:id="pluginNativeComboBox" prefHeight="25.0" HBox.hgrow="SOMETIMES" />
</HBox>
</VBox>
<HBox VBox.vgrow="SOMETIMES">
<TextFlow>
<Label text="For more information about scanning plugins, check the " wrapText="true"/>
<Hyperlink fx:id="troubleshootingLink" text="OwlPlug documentation"/>
<Label text="If the problem persist and seems related to OwlPlug," wrapText="true"/>
<Hyperlink fx:id="issuesLink" text="report the issue."/>
<Label text="For more information about scanning plugins, check the " wrapText="true" />
<Hyperlink fx:id="troubleshootingLink" text="OwlPlug documentation" />
<Label text="If the problem persist and seems related to OwlPlug," wrapText="true" />
<Hyperlink fx:id="issuesLink" text="report the issue." />
</TextFlow>
</HBox>
<HBox alignment="TOP_RIGHT" prefWidth="200.0" spacing="10.0" VBox.vgrow="NEVER">
Expand All @@ -49,6 +50,6 @@
</ImageView>
</graphic>
</Button>
<Button fx:id="closeButton" text="Close this popup"/>
<Button fx:id="closeButton" text="Close this popup" />
</HBox>
</VBox>
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>

<VBox prefWidth="400.0" spacing="10.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.owlplug.core.controllers.dialogs.ListDirectoryDialogController">
<Label text="Add extra directories to the list. Update items by double-clicking on it and hit the &quot;Enter&quot; key to validate."
wrapText="true"/>
<VBox prefWidth="400.0" spacing="10.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.owlplug.core.controllers.dialogs.ListDirectoryDialogController">
<Label text="Update items by double-clicking on it and hit the &quot;Enter&quot; key to validate." wrapText="true" />
<HBox alignment="CENTER_RIGHT" prefHeight="50.0" spacing="10.0">
<Button fx:id="addDirectoryButton" text="+ Add a directory"/>
<Button fx:id="addDirectoryButton" text="+ Add a directory" />
</HBox>
<ListView fx:id="directoryListView" editable="true" prefHeight="200.0" prefWidth="200.0"/>
<ListView fx:id="directoryListView" editable="true" prefHeight="200.0" prefWidth="200.0" />
<HBox alignment="CENTER_RIGHT" prefHeight="50.0" spacing="10.0">
<Button fx:id="closeButton" text="Close"/>
<Button fx:id="closeButton" text="Close" />
</HBox>
</VBox>
5 changes: 0 additions & 5 deletions owlplug-client/src/main/resources/owlplug.css
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,6 @@ ProgressIndicator {
-fx-fill: disabled-color;
}

.recovered-plugin-view {
-fx-background-color: rgba(0, 0, 0, 0.2);
-fx-padding: 10, 0, 10, 0;
}

/****************************************************************
JavaFx Charts theme
****************************************************************/
Expand Down
4 changes: 1 addition & 3 deletions owlplug-controls/src/main/resources/css/owlplug-controls.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,14 @@

.dialog-layout>.dialog-layout-body {
-fx-alignment: center-left;
-fx-padding: 0 24 24 24;
-fx-padding: 0 24 0 24;
-fx-pref-width: 400;
}

.dialog-layout>.dialog-layout-body .label {
-fx-font-size: 16.0;
-fx-wrap-text: true;
}


.chip-view {
-fx-background-color: TRANSPARENT;
}
Expand Down