mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-20 14:16:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes:

Browse Source 
* implement reveal conflictResolved
* removed showVault context menu entry
* cleanup
This commit is contained in:
Armin Schrenk
2025-02-19 11:27:39 +01:00
parent c39710ede0
commit 034278c0a0
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/fxml/eventview_cell.fxml
+3 -4
View File
@@ -35,14 +35,13 @@
<fx:define>
<ContextMenu fx:id="basicEventActions">
<items>
<MenuItem styleClass="add-vault-menu-item" text="Dismiss" onAction="#remove" />
<MenuItem styleClass="add-vault-menu-item" text="Dismiss" onAction="#dismissEvent" />
</items>
</ContextMenu>
<ContextMenu fx:id="conflictResoledEventActions">
<items>
<MenuItem styleClass="add-vault-menu-item" text="Dismiss" onAction="#remove" />
<MenuItem styleClass="add-vault-menu-item" text="showVault" onAction="#openVaultStoragePath"/>
<MenuItem styleClass="add-vault-menu-item" text="showFile" onAction="#showResolvedConflict"/>
<MenuItem styleClass="add-vault-menu-item" text="Dismiss" onAction="#dismissEvent" />
<MenuItem styleClass="add-vault-menu-item" text="Show" onAction="#showResolvedConflict" visible="${controller.revealServicePresent}"/>
</items>
</ContextMenu>
</fx:define>