mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-26 18:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/self-update-poc' into feature/app-update

Browse Source 
# Conflicts:
#	src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
#	src/main/resources/fxml/preferences_updates.fxml
This commit is contained in:
Sebastian Stenzel
2025-08-09 09:26:38 +02:00
parent 79bb4a5215 8f4392711e
commit d5245009f4
12 changed files with 269 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/fxml/preferences_updates.fxml
+5 -6
View File
@@ -53,16 +53,15 @@
</graphic>
</Label>
<Hyperlink text="${linkLabel.value}" onAction="#visitDownloadsPage" textAlignment="CENTER" wrapText="true" styleClass="hyperlink-underline" visible="${controller.updateAvailable}" managed="${controller.updateAvailable}"/>
<Button onAction="#updateFlatpakNow"
visible="${controller.appUpdateAvailable}">
<Button onAction="#doUpdate"> <!-- TODO: visible="${controller.updateAvailable}" -->
<graphic>
<VBox spacing="5" alignment="CENTER">
<Label fx:id="flatpakButtonLabel"/>
<Label text="${controller.updateButtonTitle}"/>
<ProgressBar maxWidth="200"
maxHeight="12"
visible="${controller.updatingFlatpak}"
managed="${controller.updatingFlatpak}"
progress="${controller.flatpakProgress}"/>
visible="${controller.updatePreparationTask.running}"
managed="${controller.updatePreparationTask.running}"
progress="${controller.updatePreparationTask.progress}"/>
</VBox>
</graphic>
</Button>