clean up
Some checks failed
Build / Compile and Test (push) Failing after 0s

This commit is contained in:
Jan-Peter Klein 2024-09-13 11:49:05 +02:00
parent 4c4816bdab
commit 1292936904
No known key found for this signature in database
GPG Key ID: 90EDA3A7C822FD0E
7 changed files with 16 additions and 56 deletions

View File

@ -2,8 +2,6 @@ package org.cryptomator.ui.removecert;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.ui.common.FxController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javafx.fxml.FXML;
@ -12,8 +10,6 @@ import javafx.stage.Stage;
@RemoveCertScoped
public class RemoveCertController implements FxController {
private static final Logger LOG = LoggerFactory.getLogger(org.cryptomator.ui.removecert.RemoveCertController.class);
private final Stage window;
private final Settings settings;

View File

@ -100,6 +100,7 @@
.label-extra-large {
-fx-font-family: 'Open Sans SemiBold';
-fx-fill: TEXT_FILL;
-fx-font-size: 1.5em;
}
@ -266,26 +267,6 @@
-fx-background-insets: 0, 0 1 0 0;
}
/*******************************************************************************
* *
* Alert-Dialogs *
* *
******************************************************************************/
.dialog-pane {
-fx-padding: 12px;
}
.dialog-pane .header-panel {
-fx-font-family: 'Open Sans SemiBold';
-fx-font-size: 1.2em;
}
.dialog-pane .content {
-fx-font-family: 'Open Sans';
-fx-padding: 12 0 12 0;
}
/*******************************************************************************
* *
* Vault List *

View File

@ -265,26 +265,6 @@
-fx-background-insets: 0, 0 1 0 0;
}
/*******************************************************************************
* *
* Alert-Dialogs *
* *
******************************************************************************/
.dialog-pane {
-fx-padding: 12px;
}
.dialog-pane .header-panel {
-fx-font-family: 'Open Sans SemiBold';
-fx-font-size: 1.2em;
}
.dialog-pane .content {
-fx-font-family: 'Open Sans';
-fx-padding: 12 0 12 0;
}
/*******************************************************************************
* *
* Vault List *

View File

@ -3,18 +3,18 @@
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
<?import org.cryptomator.ui.controls.FormattedLabel?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Hyperlink?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Circle?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.text.Text?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.Region?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.preferences.SupporterCertificateController"
@ -25,24 +25,24 @@
<children>
<StackPane VBox.vgrow="NEVER" prefHeight="60" alignment="TOP_CENTER">
<VBox alignment="TOP_CENTER" visible="${controller.licenseHolder.validLicense}">
<Text styleClass="label-extra-large" text="Thank you for supporting Cryptomators open-source development!" wrappingWidth="400" textAlignment="CENTER"/>
<Text styleClass="label-extra-large" text="%preferences.contribute.thankYou" wrappingWidth="400" textAlignment="CENTER"/>
<ImageView fitHeight="180">
<Image url="@../img/supporter_cert_stemp.png"/>
<Image url="@../img/supporter_cert_stamp.png"/>
</ImageView>
<FormattedLabel format="%preferences.contribute.registeredFor" arg1="${controller.licenseHolder.licenseSubject}" wrapText="true"/>
<Region minHeight="12"/>
<HBox alignment="BOTTOM_CENTER" spacing="6">
<Button fx:id="trashButton" onAction="#didClickRemoveCert">
<Button onAction="#didClickRemoveCert">
<graphic>
<FontAwesome5IconView glyph="TRASH"/>
</graphic>
</Button>
<Button text="Donate" minWidth="100" onAction="#showDonate">
<Button text="%preferences.contribute.donate" minWidth="100" onAction="#showDonate">
<graphic>
<FontAwesome5IconView glyph="DONATE"/>
</graphic>
</Button>
<Button text="Sponsors" minWidth="100" onAction="#showSponsors">
<Button text="%preferences.contribute.sponsors" minWidth="100" onAction="#showSponsors">
<graphic>
<FontAwesome5IconView glyph="SPONSORS"/>
</graphic>
@ -50,14 +50,14 @@
</HBox>
</VBox>
<VBox spacing="12" visible="${!controller.licenseHolder.validLicense}">
<HBox spacing="12" alignment="CENTER_LEFT" >
<StackPane alignment="CENTER" HBox.hgrow="NEVER">
<HBox spacing="12" alignment="CENTER_LEFT">
<StackPane HBox.hgrow="NEVER">
<Circle styleClass="glyph-icon-primary" radius="24"/>
<FontAwesome5IconView styleClass="glyph-icon-white" glyph="HAND_HOLDING_HEART" glyphSize="24"/>
</StackPane>
<VBox HBox.hgrow="ALWAYS" spacing="6">
<Label text="%preferences.contribute.noCertificate" wrapText="true" VBox.vgrow="ALWAYS"/>
<Hyperlink text="%preferences.contribute.getCertificate" onAction="#getSupporterCertificate" contentDisplay="LEFT">
<Hyperlink text="%preferences.contribute.getCertificate" onAction="#getSupporterCertificate">
<graphic>
<FontAwesome5IconView glyph="LINK"/>
</graphic>

View File

@ -336,6 +336,9 @@ preferences.contribute.registeredFor=Supporter certificate registered for %s
preferences.contribute.noCertificate=Support Cryptomator and receive a supporter certificate. It's like a license key but for awesome people using free software. ;-)
preferences.contribute.getCertificate=Don't have one already? Learn how you can obtain it.
preferences.contribute.promptText=Paste supporter certificate code here
preferences.contribute.thankYou=Thank you for supporting Cryptomators open-source development!
preferences.contribute.donate=Donate
preferences.contribute.sponsors=Sponsors
### Remove License Key Dialog
removeCert.title=Remove Cert

View File

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

View File

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB