Fix file browser dragboard mime type for macos

app/src/main/java/io/xpipe/app/browser/BrowserClipboard.java

@@ -11,6 +11,7 @@ import io.xpipe.core.util.FailableRunnable;
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.DataFormat;
 import javafx.scene.input.Dragboard;
 import lombok.SneakyThrows;
 import lombok.Value;
@@ -29,6 +30,7 @@ public class BrowserClipboard {
 
     public static final Property<Instance> currentCopyClipboard = new SimpleObjectProperty<>();
     public static Instance currentDragClipboard;
+    private static final DataFormat DATA_FORMAT = new DataFormat("application/xpipe-file-list");
 
     static {
         Toolkit.getDefaultToolkit()
@@ -72,7 +74,7 @@ public class BrowserClipboard {
         var content = new ClipboardContent();
         var id = UUID.randomUUID();
         currentDragClipboard = new Instance(id, base, new ArrayList<>(selected), mode);
-        content.putString(currentDragClipboard.toClipboardString());
+        content.put(DATA_FORMAT, currentDragClipboard.toClipboardString());
         return content;
     }
 
@@ -92,16 +94,12 @@ public class BrowserClipboard {
     }
 
     public static Instance retrieveDrag(Dragboard dragboard) {
-        if (dragboard.getString() == null) {
-            return null;
-        }
-
         if (currentDragClipboard == null) {
             return null;
         }
 
         try {
-            var s = dragboard.getString();
+            var s = dragboard.getContent(DATA_FORMAT);
             if (s != null && s.equals(currentDragClipboard.toClipboardString())) {
                 var current = currentDragClipboard;
                 currentDragClipboard = null;

dist/changelogs/9.2_incremental.md

@@ -1 +1,35 @@
+## Git handling improvements
+
+The git error actions have been reworked. In case any merge conflict or similar occurs, the possible actions are now handled better:
+- They are properly highlighted to distinguish them from the normal error dialog window
+- They now work for all git client localizations
+- They are less likely to cause git accidents. Any possible destructive action has to be confirmed now
+
+## Shortcut handling
+
+The file browser has been reworked to support many new keyboard shortcuts and the general using experience has been improved when using a keyboard:
+
+- Files that are right-clicked are now also included in the selection
+- The quick access menu will now shift focus properly
+- The file list can be navigated with the arrow keys. CTRL and SHIFT can be used to multiple select files
+- Any files you drag can now be explicitly moved by holding ALT
+- *CTRL+W* closes the current file browser tab
+- *CTRL+SHIFT+W* closes all file browser tabs
+- *CTRL+Q* closes the window
+- *CTRL+F* will now properly toggle the find text field
+- *CTRL+L* will now focus the path location text field
+- *ALT+HOME* will go to the file system overview page
+- *ALT+H* shows the browsing history
+- *ALT-UP* navigates to the parent directory
+- *ESCAPE* clears the selection
+- *SPACE* shows the context menu for the selection
+
+## Fixes
+
+- Fix closing application window while XPipe was saving not properly applying all changes
+- Fix race condition when loading file icons
+- Fix state corruption of local shell, leading to NullPointers once a shell connection had to be killed
+- Fix error handling in case powershell failed to start up
+- Fix a corrupted PATH leading to cmd or powershell not being able to be started
+- Fix headless system error message not being printed when application failed to start up
 - Fix offline licenses not properly applying

lang/app/strings/translations_da.properties

@@ -446,4 +446,6 @@ copyPassword=copyPassword
 #custom
 lockVaultOnHibernation=Lås Vault når computeren går i dvale
 #custom
-lockVaultOnHibernationDescription=Når denne funktion er aktiveret, låses Vaulten automatisk, når computeren sættes i dvale. Når du bruger computeren igen, skal du indtaste din vault-adgangsætning igen.
+lockVaultOnHibernationDescription=Når denne funktion er aktiveret, låses Vaulten automatisk, når computeren sættes i dvale. Når du bruger computeren igen, skal du indtaste din vault-adgangsætning igen.
+overview=Oversigt over
+history=Browsing-historik

lang/app/strings/translations_de.properties

@@ -446,3 +446,5 @@ replaceAll=Ersetze alles
 copyPassword=copyPassword
 lockVaultOnHibernation=Tresor im Ruhezustand des Computers sperren
 lockVaultOnHibernationDescription=Wenn diese Funktion aktiviert ist, wird der Tresor automatisch gesperrt, sobald dein Computer in den Ruhezustand versetzt wird. Nach dem Aufwachen musst du deine Tresor-Passphrase erneut eingeben.
+overview=Übersicht
+history=Browsing-Verlauf

lang/app/strings/translations_en.properties

@@ -449,3 +449,5 @@ replaceAll=Replace all
 copyPassword=copyPassword
 lockVaultOnHibernation=Lock vault on computer hibernation
 lockVaultOnHibernationDescription=When enabled, the vault will automatically be locked once your computer is put into hibernation/to sleep. Upon wake up, you will have to enter your vault passphrase again.
+overview=Overview
+history=Browsing history

lang/app/strings/translations_es.properties

@@ -433,3 +433,5 @@ replaceAll=Sustituir todo
 copyPassword=copiarContraseña
 lockVaultOnHibernation=Bloquear la bóveda al hibernar el ordenador
 lockVaultOnHibernationDescription=Si está activada, el almacén se bloqueará automáticamente cuando tu ordenador entre en hibernación/reposo. Al despertarte, tendrás que volver a introducir la contraseña de tu bóveda.
+overview=Visión general
+history=Historial de navegación

lang/app/strings/translations_fr.properties

@@ -433,3 +433,5 @@ replaceAll=Remplacer tout
 copyPassword=copierMotdepasse
 lockVaultOnHibernation=Verrouille le coffre-fort lors de l'hibernation de l'ordinateur
 lockVaultOnHibernationDescription=Lorsque cette option est activée, le coffre-fort sera automatiquement verrouillé une fois que ton ordinateur sera mis en hibernation/en veille. Au réveil, tu devras saisir à nouveau la phrase de passe de ton coffre-fort.
+overview=Vue d'ensemble
+history=Historique de navigation

lang/app/strings/translations_it.properties

@@ -433,3 +433,5 @@ replaceAll=Sostituisci tutto
 copyPassword=copiaPassword
 lockVaultOnHibernation=Blocca il caveau durante l'ibernazione del computer
 lockVaultOnHibernationDescription=Se abilitato, il vault si blocca automaticamente quando il computer viene messo in ibernazione o a riposo. Al risveglio, dovrai inserire nuovamente la passphrase del vault.
+overview=Panoramica
+history=Cronologia di navigazione

lang/app/strings/translations_ja.properties

@@ -433,3 +433,5 @@ replaceAll=すべて置き換える
 copyPassword=コピーパスワード
 lockVaultOnHibernation=コンピュータのハイバネーション時に保管庫をロックする
 lockVaultOnHibernationDescription=有効にすると、コンピュータが休止状態/スリープ状態になると、保管庫は自動的にロックされる。スリープ解除後、保管庫のパスフレーズを再度入力する必要がある。
+overview=概要
+history=閲覧履歴

lang/app/strings/translations_nl.properties

@@ -433,3 +433,5 @@ replaceAll=Alles vervangen
 copyPassword=kopieerwachtwoord
 lockVaultOnHibernation=Kluis op computer in slaapstand
 lockVaultOnHibernationDescription=Als deze optie is ingeschakeld, wordt de kluis automatisch vergrendeld zodra je computer in de slaapstand wordt gezet. Als je wakker wordt, moet je je wachtwoordzin voor de kluis opnieuw invoeren.
+overview=Overzicht
+history=Browsegeschiedenis

lang/app/strings/translations_pt.properties

@@ -433,3 +433,5 @@ replaceAll=Substitui tudo
 copyPassword=copia a palavra-passe
 lockVaultOnHibernation=Bloqueia o cofre na hibernação do computador
 lockVaultOnHibernationDescription=Quando ativado, a abóbada é automaticamente bloqueada quando o computador é colocado em hibernação/sono. Quando acordares, terás de introduzir novamente a frase-chave do cofre.
+overview=Resumo
+history=Histórico de navegação

lang/app/strings/translations_ru.properties

@@ -433,3 +433,5 @@ replaceAll=Заменить все
 copyPassword=copyPassword
 lockVaultOnHibernation=Блокировка хранилища при спящем режиме компьютера
 lockVaultOnHibernationDescription=Если эта функция включена, хранилище будет автоматически блокироваться, как только компьютер перейдет в спящий режим. После пробуждения тебе придется снова ввести кодовую фразу хранилища.
+overview=Обзор
+history=История просмотров

lang/app/strings/translations_tr.properties

@@ -434,3 +434,5 @@ replaceAll=Tümünü değiştirin
 copyPassword=copyPassword
 lockVaultOnHibernation=Bilgisayar hazırda bekletme modunda kasayı kilitleme
 lockVaultOnHibernationDescription=Etkinleştirildiğinde, bilgisayarınız hazırda bekletme/uyku moduna geçtiğinde kasa otomatik olarak kilitlenecektir. Uyandığınızda, kasa parolanızı tekrar girmeniz gerekecektir.
+overview=Genel Bakış
+history=Tarama geçmişi

lang/app/strings/translations_zh.properties

@@ -433,3 +433,5 @@ replaceAll=全部替换
 copyPassword=复制密码
 lockVaultOnHibernation=电脑休眠时锁定保险库
 lockVaultOnHibernationDescription=启用后，一旦电脑进入休眠/睡眠状态，保管库就会自动锁定。唤醒后，您必须再次输入保险库密码。
+overview=概述
+history=浏览历史

version

@@ -1 +1 @@
-9.2
+9.2-2