From 08752c957ad2de0a373eec26904a2af8528d54d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Ivan=C4=8Di=C4=8D?= <tomaz.ivancic@gmail.com>
Date: Fri, 23 Oct 2026 12:45:19 +0200
Subject: [PATCH 1/7] Add right-click selection mode in file lists

- Allow toggling file marks on right click without showing context menu immediately
- Support dragging with the right mouse button to mark/unmark multiple files with auto-scrolling
- Show context menu on right-click long press (~500ms) or via keyboard (Shift+F10 / Menu key)
- Add 'rightClickSelect' option in Settings -> Panels (with English and Czech translations)
- Add 'cmd.toggleRightClickSelect' command to the command palette
- Add unit tests for pointer context menu behavior
---
 src/components/FileGrid.svelte               |   8 +-
 src/components/FileList.svelte               |   8 +-
 src/components/dialogs/SettingsDialog.svelte |   1 +
 src/lib/commands.ts                          |   1 +
 src/lib/i18n/cs.ts                           |   2 +
 src/lib/i18n/en.ts                           |   2 +
 src/lib/pointer.test.ts                      |  31 ++++
 src/lib/pointer.ts                           | 153 ++++++++++++++++++-
 src/lib/state/settings.svelte.ts             |   3 +
 9 files changed, 199 insertions(+), 10 deletions(-)
 create mode 100644 src/lib/pointer.test.ts

diff --git a/src/components/FileGrid.svelte b/src/components/FileGrid.svelte
index af440a6..65f6c75 100644
--- a/src/components/FileGrid.svelte
+++ b/src/components/FileGrid.svelte
@@ -6,7 +6,7 @@
   import { drag } from '../lib/dnd.svelte';
   import { setMetrics } from '../lib/panelKeys.svelte';
   import { isWindows } from '../lib/platform';
-  import { backgroundPointerDown, itemPointerDown } from '../lib/pointer';
+  import { backgroundPointerDown, canOpenContextMenu, itemPointerDown } from '../lib/pointer';
   import type { SideName } from '../lib/state/app.svelte';
   import { settings } from '../lib/state/settings.svelte';
   import type { Tab } from '../lib/state/tab.svelte';
@@ -105,8 +105,10 @@
 
   function onContext(e: MouseEvent, entry: Entry | null) {
     e.preventDefault();
-    if (entry && !(entry.flags & F.UP)) void entryMenu(tab);
-    else void backgroundMenu(tab);
+    if (canOpenContextMenu(e, entry)) {
+      if (entry && !(entry.flags & F.UP)) void entryMenu(tab);
+      else void backgroundMenu(tab);
+    }
   }
 </script>
 
diff --git a/src/components/FileList.svelte b/src/components/FileList.svelte
index 7b79c67..1dcb14f 100644
--- a/src/components/FileList.svelte
+++ b/src/components/FileList.svelte
@@ -11,7 +11,7 @@
   import { localeTag, t } from '../lib/i18n/index.svelte';
   import { setMetrics } from '../lib/panelKeys.svelte';
   import { isWindows } from '../lib/platform';
-  import { backgroundPointerDown, itemPointerDown } from '../lib/pointer';
+  import { backgroundPointerDown, canOpenContextMenu, itemPointerDown } from '../lib/pointer';
   import type { SideName } from '../lib/state/app.svelte';
   import { settings } from '../lib/state/settings.svelte';
   import type { Tab } from '../lib/state/tab.svelte';
@@ -135,8 +135,10 @@
 
   function onContext(e: MouseEvent, entry: Entry | null) {
     e.preventDefault();
-    if (entry && !(entry.flags & F.UP)) void entryMenu(tab);
-    else void backgroundMenu(tab);
+    if (canOpenContextMenu(e, entry)) {
+      if (entry && !(entry.flags & F.UP)) void entryMenu(tab);
+      else void backgroundMenu(tab);
+    }
   }
 </script>
 
diff --git a/src/components/dialogs/SettingsDialog.svelte b/src/components/dialogs/SettingsDialog.svelte
index 69acdd0..32de5cf 100644
--- a/src/components/dialogs/SettingsDialog.svelte
+++ b/src/components/dialogs/SettingsDialog.svelte
@@ -155,6 +155,7 @@
         <label class="check"><input type="checkbox" bind:checked={settings.syncColumns} /> {t('settings.syncColumns')}</label>
         <label class="check"><input type="checkbox" bind:checked={settings.unmarkOnTabSwitch} /> {t('settings.unmarkOnTabSwitch')}</label>
         <label class="check"><input type="checkbox" bind:checked={settings.unmarkAfterDrop} /> {t('settings.unmarkAfterDrop')}</label>
+        <label class="check"><input type="checkbox" bind:checked={settings.rightClickSelect} /> {t('settings.rightClickSelect')}</label>
         <label class="row">
           <span>{t('settings.thumbSize')}</span>
           <select class="input" bind:value={settings.thumbSize}>
diff --git a/src/lib/commands.ts b/src/lib/commands.ts
index f818d0a..883b816 100644
--- a/src/lib/commands.ts
+++ b/src/lib/commands.ts
@@ -119,6 +119,7 @@ export const commands: Command[] = [
   { id: 'toggleGroups', label: 'cmd.toggleGroups', run: () => (settings.groupFiles = !settings.groupFiles), keys: ['Mod+Alt+G'], checked: () => settings.groupFiles },
   { id: 'toggleDriveBar', label: 'cmd.toggleDriveBar', run: () => (settings.driveBar = !settings.driveBar), checked: () => settings.driveBar },
   { id: 'toggleFunctionBar', label: 'cmd.toggleFunctionBar', run: () => (settings.functionBar = !settings.functionBar), checked: () => settings.functionBar },
+  { id: 'toggleRightClickSelect', label: 'cmd.toggleRightClickSelect', run: () => (settings.rightClickSelect = !settings.rightClickSelect), checked: () => settings.rightClickSelect },
   { id: 'refresh', label: 'cmd.refresh', run: () => app.panel.reload(), keys: ['Mod+R'] },
   { id: 'filter', label: 'cmd.filter', run: () => (app.panel.filterOpen = true), keys: ['Mod+S'] },
 
diff --git a/src/lib/i18n/cs.ts b/src/lib/i18n/cs.ts
index 6511240..e9bb584 100644
--- a/src/lib/i18n/cs.ts
+++ b/src/lib/i18n/cs.ts
@@ -361,6 +361,7 @@ export const cs: Record<Key, string> & Record<string, string> = {
   'cmd.focusOther': 'Přepnout panel',
   'cmd.showPackage': 'Zobrazit obsah balíčku',
   'cmd.toggleFunctionBar': 'Lišta funkčních kláves',
+  'cmd.toggleRightClickSelect': 'Přepnout výběr souborů pravým tlačítkem',
   'cmd.toggleToolbar': 'Panel nástrojů',
 
   'fkey.help': 'Nápověda',
@@ -769,6 +770,7 @@ export const cs: Record<Key, string> & Record<string, string> = {
   'settings.syncColumns': 'Stejné šířky sloupců v obou panelech',
   'settings.unmarkOnTabSwitch': 'Zrušit označení při přepnutí karty',
   'settings.unmarkAfterDrop': 'Zrušit označení po přetažení souborů',
+  'settings.rightClickSelect': 'Vybírat soubory pravým tlačítkem myši',
   'cmd.goToClipboard': 'Přejít na cestu ze schránky',
   'nav.clipboardEmpty': 'Ve schránce není cesta.',
   'open.manyTitle': 'Otevřít více souborů',
diff --git a/src/lib/i18n/en.ts b/src/lib/i18n/en.ts
index 2edb4ee..18a0295 100644
--- a/src/lib/i18n/en.ts
+++ b/src/lib/i18n/en.ts
@@ -358,6 +358,7 @@ export const en = {
   'cmd.focusOther': 'Switch Panel',
   'cmd.showPackage': 'Show Package Contents',
   'cmd.toggleFunctionBar': 'Function Key Bar',
+  'cmd.toggleRightClickSelect': 'Toggle Right-Click File Selection',
   'cmd.toggleToolbar': 'Toolbar',
 
   // Function key bar (short)
@@ -772,6 +773,7 @@ export const en = {
   'settings.syncColumns': 'Same column widths in both panels',
   'settings.unmarkOnTabSwitch': 'Clear marks when switching tabs',
   'settings.unmarkAfterDrop': 'Clear marks after dragging files',
+  'settings.rightClickSelect': 'Select files with right mouse button',
   'cmd.goToClipboard': 'Go to Path in Clipboard',
   'nav.clipboardEmpty': 'There is no path in the clipboard.',
   'open.manyTitle': 'Open Several Files',
diff --git a/src/lib/pointer.test.ts b/src/lib/pointer.test.ts
new file mode 100644
index 0000000..0ca4685
--- /dev/null
+++ b/src/lib/pointer.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest';
+import { canOpenContextMenu } from './pointer';
+import { settings } from './state/settings.svelte';
+import type { Entry } from './types';
+
+const sampleEntry: Entry = {
+  name: 'test.txt',
+  flags: 0,
+  size: 100,
+  mtime: Date.now(),
+  attrs: 0,
+  ext: 'txt',
+  isDir: false,
+  key: 'test.txt',
+};
+
+const dummyEvent = {} as MouseEvent;
+
+describe('pointer right-click selection', () => {
+  it('allows context menu when rightClickSelect is disabled', () => {
+    settings.rightClickSelect = false;
+    expect(canOpenContextMenu(dummyEvent, sampleEntry)).toBe(true);
+    expect(canOpenContextMenu(dummyEvent, null)).toBe(true);
+  });
+
+  it('allows background context menu even when rightClickSelect is enabled', () => {
+    settings.rightClickSelect = true;
+    expect(canOpenContextMenu(dummyEvent, null)).toBe(true);
+  });
+});
+
diff --git a/src/lib/pointer.ts b/src/lib/pointer.ts
index 7c5ff6b..30b9429 100644
--- a/src/lib/pointer.ts
+++ b/src/lib/pointer.ts
@@ -1,10 +1,13 @@
 // Mouse behaviour shared by all file views: click / Ctrl(Cmd)+click /
-// Shift+click selection, drag & drop start and double-click to open.
+// Shift+click selection, drag & drop start, double-click to open, and
+// right-click selection mode.
 
 import * as A from './actions';
+import { backgroundMenu, entryMenu } from './contextMenu';
 import { drag, dragOutside, endDrag, moveDrag, startDrag } from './dnd.svelte';
 import { isMac } from './platform';
 import { app, type SideName } from './state/app.svelte';
+import { settings } from './state/settings.svelte';
 import type { Tab } from './state/tab.svelte';
 import { F, type Entry } from './types';
 
@@ -14,16 +17,158 @@ import { F, type Entry } from './types';
 const DOUBLE_MS = 500;
 let lastDown: { tab: Tab; key: string; at: number; x: number; y: number } | null = null;
 
+let rightClickHandled = false;
+let rightSelectActive = false;
+
+export function canOpenContextMenu(e: MouseEvent, entry: Entry | null): boolean {
+  if (!settings.rightClickSelect) return true;
+  if (!entry) return true;
+  if (rightClickHandled || rightSelectActive) {
+    rightClickHandled = false;
+    return false;
+  }
+  return true;
+}
+
 export function itemPointerDown(e: PointerEvent, side: SideName, tab: Tab, entry: Entry, index: number) {
   app.activeSide = side;
   if (tab.renaming && tab.renaming !== entry.key) tab.renaming = null;
+
   if (e.button === 2) {
-    if (!tab.isMarked(entry.key)) {
-      tab.unmarkAll();
-      tab.setCursor(index);
+    if (!settings.rightClickSelect) {
+      if (!tab.isMarked(entry.key)) {
+        tab.unmarkAll();
+        tab.setCursor(index);
+      }
+      return;
     }
+
+    // Right-click selection mode
+    tab.setCursor(index);
+    const targetMark = !(entry.flags & F.UP) ? !tab.isMarked(entry.key) : false;
+    if (!(entry.flags & F.UP)) {
+      tab.setMarks([entry.key], targetMark);
+    }
+
+    rightClickHandled = false;
+    rightSelectActive = true;
+    let moved = false;
+    const sx = e.clientX;
+    const sy = e.clientY;
+    let lastX = sx;
+    let lastY = sy;
+    const visitedKeys = new Set<string>([entry.key]);
+
+    let scrollInterval: ReturnType<typeof setInterval> | null = null;
+    const stopAutoScroll = () => {
+      if (scrollInterval) {
+        clearInterval(scrollInterval);
+        scrollInterval = null;
+      }
+    };
+
+    const cleanup = () => {
+      if (longPressTimer) {
+        clearTimeout(longPressTimer);
+        longPressTimer = null;
+      }
+      stopAutoScroll();
+      window.removeEventListener('pointermove', onMove);
+      window.removeEventListener('pointerup', onUp);
+      window.removeEventListener('pointercancel', cleanup);
+      window.removeEventListener('blur', cleanup);
+      rightSelectActive = false;
+    };
+
+    let longPressTimer: ReturnType<typeof setTimeout> | null = setTimeout(() => {
+      longPressTimer = null;
+      cleanup();
+      rightClickHandled = true;
+      if (!(entry.flags & F.UP)) void entryMenu(tab);
+      else void backgroundMenu(tab);
+    }, 500);
+
+    const updateUnderPoint = (x: number, y: number) => {
+      const el = document.elementFromPoint(x, y) as HTMLElement | null;
+      const panel = el?.closest<HTMLElement>('[data-side]');
+      if (!panel || panel.dataset.side !== side) return;
+      const row = el?.closest<HTMLElement>('[data-key]');
+      if (!row?.dataset.key) return;
+      const key = row.dataset.key;
+      if (visitedKeys.has(key)) return;
+      visitedKeys.add(key);
+      const idx = tab.index.get(key);
+      if (idx !== undefined) {
+        const item = tab.visible[idx];
+        if (item && !(item.flags & F.UP)) {
+          tab.setMarks([key], targetMark);
+          tab.setCursor(idx);
+        }
+      }
+    };
+
+    const checkScroll = (x: number, y: number) => {
+      const el = document.elementFromPoint(x, y) as HTMLElement | null;
+      const vp = el?.closest<HTMLElement>('.viewport, .grid');
+      if (!vp) {
+        stopAutoScroll();
+        return;
+      }
+      const r = vp.getBoundingClientRect();
+      const MARGIN = 35;
+      const SPEED = 14;
+      let dx = 0;
+      let dy = 0;
+      if (tab.view === 'list') {
+        if (x < r.left + MARGIN) dx = -SPEED;
+        else if (x > r.right - MARGIN) dx = SPEED;
+      } else {
+        if (y < r.top + MARGIN) dy = -SPEED;
+        else if (y > r.bottom - MARGIN) dy = SPEED;
+      }
+      if (dx === 0 && dy === 0) {
+        stopAutoScroll();
+        return;
+      }
+      if (!scrollInterval) {
+        scrollInterval = setInterval(() => {
+          if (dx !== 0) vp.scrollLeft += dx;
+          if (dy !== 0) vp.scrollTop += dy;
+          updateUnderPoint(lastX, lastY);
+        }, 30);
+      }
+    };
+
+    const onMove = (ev: PointerEvent) => {
+      lastX = ev.clientX;
+      lastY = ev.clientY;
+      if (!moved && Math.hypot(ev.clientX - sx, ev.clientY - sy) > 5) {
+        moved = true;
+        if (longPressTimer) {
+          clearTimeout(longPressTimer);
+          longPressTimer = null;
+        }
+      }
+      if (moved) {
+        updateUnderPoint(ev.clientX, ev.clientY);
+        checkScroll(ev.clientX, ev.clientY);
+      }
+    };
+
+    const onUp = (ev: PointerEvent) => {
+      if (ev.button === 2) {
+        cleanup();
+        rightClickHandled = true;
+      }
+    };
+
+    window.addEventListener('pointermove', onMove);
+    window.addEventListener('pointerup', onUp);
+    window.addEventListener('pointercancel', cleanup);
+    window.addEventListener('blur', cleanup);
     return;
   }
+
   if (e.button !== 0) return;
   const mod = isMac ? e.metaKey : e.ctrlKey;
   if (e.shiftKey) {
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index 1644edc..cdf424f 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -62,6 +62,8 @@ export interface Settings {
   unmarkOnTabSwitch: boolean;
   /** Clear marks after dragging the files somewhere. */
   unmarkAfterDrop: boolean;
+  /** Select files with the right mouse button. */
+  rightClickSelect: boolean;
   showAttrs: boolean;
   hotlist: HotlistItem[];
   split: number;
@@ -110,6 +112,7 @@ export const defaultSettings = (): Settings => ({
   syncColumns: false,
   unmarkOnTabSwitch: false,
   unmarkAfterDrop: false,
+  rightClickSelect: true,
   showAttrs: false,
   hotlist: [],
   split: 0.5,

From 5fc455e5f3c7af14655aadd0d30cd9a2b3934829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Ivan=C4=8Di=C4=8D?= <tomaz.ivancic@gmail.com>
Date: Fri, 23 Oct 2026 14:06:36 +0200
Subject: [PATCH 2/7] Add portable mode support

When a 'data' folder or 'portable.dat' marker file exists next to the
executable, all application data (config, index, vault, cache, WebView2
state) is stored inside that folder instead of %APPDATA% / %LOCALAPPDATA%.

This allows running Dualion from a USB drive without leaving any traces
on the host machine.

To enable: create an empty 'data' folder or 'portable.dat' file next to
Dualion.exe.
---
 src-tauri/src/lib.rs | 43 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index c071d77..f92f9da 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -83,8 +83,33 @@ fn apply_effects(app: &tauri::App) -> &'static str {
     "none"
 }
 
+/// Detects if portable mode is active (a `data` folder or `portable.dat` file exists next to the executable).
+fn detect_portable_dir() -> Option<std::path::PathBuf> {
+    let exe = std::env::current_exe().ok()?;
+    let exe_dir = exe.parent()?;
+    let data_dir = exe_dir.join("data");
+    let marker = exe_dir.join("portable.dat");
+    if data_dir.is_dir() || marker.is_file() {
+        let _ = std::fs::create_dir_all(&data_dir);
+        Some(data_dir)
+    } else {
+        None
+    }
+}
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    let portable_dir = detect_portable_dir();
+    if let Some(ref p) = portable_dir {
+        // Redirect WebView2 data folder on Windows so no browser cache/state leaks to the host machine.
+        #[cfg(windows)]
+        {
+            let webview_dir = p.join("webview");
+            let _ = std::fs::create_dir_all(&webview_dir);
+            std::env::set_var("WEBVIEW2_USER_DATA_FOLDER", webview_dir);
+        }
+    }
+
     let app = tauri::Builder::default()
         .plugin(tauri_plugin_window_state::Builder::default().build())
         .plugin(tauri_plugin_dialog::init())
@@ -109,16 +134,26 @@ pub fn run() {
                 respond(responder, png.map(|p| (p.to_vec(), if p.starts_with(b"\x89PNG") { "image/png" } else { "image/svg+xml" })));
             });
         })
-        .setup(|app| {
+        .setup(move |app| {
             let handle = app.handle().clone();
-            let config_dir = app.path().app_config_dir()?;
-            let data_dir = app.path().app_data_dir()?;
+            let (config_dir, data_dir, cache_dir) = if let Some(ref p) = portable_dir {
+                let conf = p.join("config");
+                let data = p.join("data");
+                let cache = p.join("cache");
+                let _ = std::fs::create_dir_all(&conf);
+                let _ = std::fs::create_dir_all(&data);
+                let _ = std::fs::create_dir_all(&cache);
+                (conf, data, Some(cache))
+            } else {
+                (app.path().app_config_dir()?, app.path().app_data_dir()?, app.path().app_cache_dir().ok())
+            };
+
             platform::set_data_dir(data_dir.clone());
             let notify = handle.clone();
             network::set_notify(move || {
                 let _ = notify.emit("network-changed", ());
             });
-            if let Ok(cache) = app.path().app_cache_dir() {
+            if let Some(cache) = cache_dir {
                 thumbs::set_cache_dir(cache.join("thumbs"));
             }
             let remote = Arc::new(remote::Registry::default());

From 7a460f39566671799bbeec7091ccef8be9109dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Ivan=C4=8Di=C4=8D?= <tomaz.ivancic@gmail.com>
Date: Fri, 23 Oct 2026 14:51:17 +0200
Subject: [PATCH 3/7] Add favorite shortcuts to toolbar

- Toggle favorite shortcut icons with the star in the main toolbar
- Open saved locations in the active panel and reorder them by dragging
- Add folders to favorites by dropping them onto the toolbar
---
 src/components/FavoritesBar.svelte | 127 +++++++++++++++++++++++++++++
 src/components/Toolbar.svelte      |   9 +-
 src/lib/dnd.svelte.ts              |  18 +++-
 3 files changed, 150 insertions(+), 4 deletions(-)
 create mode 100644 src/components/FavoritesBar.svelte

diff --git a/src/components/FavoritesBar.svelte b/src/components/FavoritesBar.svelte
new file mode 100644
index 0000000..687b7e7
--- /dev/null
+++ b/src/components/FavoritesBar.svelte
@@ -0,0 +1,127 @@
+<script lang="ts">
+  import Folder from '@lucide/svelte/icons/folder';
+  import Plus from '@lucide/svelte/icons/plus';
+  import Search from '@lucide/svelte/icons/search';
+  import Star from '@lucide/svelte/icons/star';
+  import { run } from '../lib/commands';
+  import { drag } from '../lib/dnd.svelte';
+  import { t } from '../lib/i18n/index.svelte';
+  import { locKey, locPath, sameLoc } from '../lib/paths';
+  import { dpr, pathIconUrl } from '../lib/platform';
+  import { app } from '../lib/state/app.svelte';
+  import { settings, type HotlistItem } from '../lib/state/settings.svelte';
+
+  let pointer: { x: number; y: number; location: HotlistItem['location']; moved: boolean } | null = null;
+  let suppressClick = false;
+  let showFavorites = $state(false);
+
+  const iconPx = Math.round(18 * dpr());
+
+  function open(item: HotlistItem) {
+    if (suppressClick) return;
+    void app.panel.navigate(item.location);
+  }
+
+  function moveFavorite(location: HotlistItem['location'], to: number) {
+    const list = [...settings.hotlist];
+    const from = list.findIndex((item) => sameLoc(item.location, location));
+    if (from < 0 || from === to) return;
+    const [item] = list.splice(from, 1);
+    list.splice(to, 0, item);
+    settings.hotlist = list;
+  }
+
+  function pointerDown(e: PointerEvent, item: HotlistItem) {
+    if (e.button !== 0) return;
+    pointer = { x: e.clientX, y: e.clientY, location: item.location, moved: false };
+    window.addEventListener('pointermove', pointerMove);
+    window.addEventListener('pointerup', pointerUp);
+    window.addEventListener('pointercancel', pointerUp);
+  }
+
+  function pointerMove(e: PointerEvent) {
+    if (!pointer) return;
+    if (!pointer.moved && Math.hypot(e.clientX - pointer.x, e.clientY - pointer.y) > 6) {
+      pointer.moved = true;
+      suppressClick = true;
+    }
+    if (!pointer.moved) return;
+    const el = document.elementFromPoint(e.clientX, e.clientY) as HTMLElement | null;
+    const index = Number(el?.closest<HTMLElement>('[data-favorite-index]')?.dataset.favoriteIndex);
+    if (Number.isInteger(index)) moveFavorite(pointer.location, index);
+  }
+
+  function pointerUp() {
+    window.removeEventListener('pointermove', pointerMove);
+    window.removeEventListener('pointerup', pointerUp);
+    window.removeEventListener('pointercancel', pointerUp);
+    pointer = null;
+    setTimeout(() => (suppressClick = false), 0);
+  }
+</script>
+
+<nav class="favorites" data-favorites-drop aria-label={t('cmd.hotlist')} class:drop={drag.active}>
+  <button class="toggle icon-btn" class:on={showFavorites} title={t('cmd.hotlist')} aria-label={t('cmd.hotlist')} aria-pressed={showFavorites} onclick={() => (showFavorites = !showFavorites)}>
+    <Star size={17} strokeWidth={1.7} />
+  </button>
+  {#if showFavorites}
+    <div class="items">
+      {#each settings.hotlist as item, i (locKey(item.location))}
+        <button
+          class="favorite icon-btn"
+          data-favorite-index={i}
+          title={`${item.name}\n${locPath(item.location)}`}
+          aria-label={item.name}
+          onclick={() => open(item)}
+          onpointerdown={(e) => pointerDown(e, item)}
+        >
+          {#if item.location.kind === 'query' || item.location.kind === 'search'}
+            <Search size={17} strokeWidth={1.7} />
+          {:else if item.location.kind === 'local'}
+            <img src={pathIconUrl(item.location.path, iconPx)} alt="" width="18" height="18" draggable="false" />
+          {:else}
+            <Folder size={17} strokeWidth={1.7} />
+          {/if}
+        </button>
+      {/each}
+      <button class="add icon-btn" title={t('cmd.addHotlist')} aria-label={t('cmd.addHotlist')} onclick={() => run('addHotlist')}>
+        <Plus size={17} strokeWidth={1.7} />
+      </button>
+    </div>
+  {/if}
+</nav>
+
+<style>
+  .favorites {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 3px;
+    overflow: hidden;
+    padding: 0 4px;
+  }
+  .items {
+    min-width: 0;
+    display: flex;
+    align-items: center;
+    gap: 3px;
+    overflow-x: auto;
+    overflow-y: hidden;
+  }
+  .favorite {
+    flex: none;
+    width: 28px;
+    height: 28px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+    cursor: grab;
+  }
+  .favorite:active { cursor: grabbing; }
+  .favorite img { flex: none; object-fit: contain; }
+  .toggle, .add { flex: none; width: 28px; height: 28px; }
+  .favorites.drop { background: var(--bg-hover); border-radius: var(--r-s); }
+</style>
diff --git a/src/components/Toolbar.svelte b/src/components/Toolbar.svelte
index d2afd04..078038c 100644
--- a/src/components/Toolbar.svelte
+++ b/src/components/Toolbar.svelte
@@ -18,6 +18,7 @@
   import Server from '@lucide/svelte/icons/server';
   import Settings from '@lucide/svelte/icons/settings';
   import SquareTerminal from '@lucide/svelte/icons/square-terminal';
+  import FavoritesBar from './FavoritesBar.svelte';
   import { run, shortcutOf } from '../lib/commands';
   import { t } from '../lib/i18n/index.svelte';
   import { isMac, shortcutLabel } from '../lib/platform';
@@ -111,6 +112,8 @@
 
   </div>
 
+  <FavoritesBar />
+
   <div class="trail" data-tauri-drag-region>
     <JobsIndicator />
     <button class="icon-btn" title={tip('cmd.settings', 'settings')} onclick={() => run('settings')}>
@@ -134,6 +137,7 @@
     align-items: center;
     gap: 10px;
     min-width: 0;
+    flex: none;
   }
   .lead {
     display: none;
@@ -147,17 +151,16 @@
   }
   /* macOS: actions centred in the unified title bar, like Finder/Safari. */
   .toolbar.mac {
-    display: grid;
-    grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
+    display: flex;
     padding: 2px 10px 0 0;
   }
   .toolbar.mac .lead {
     display: block;
     align-self: stretch;
     min-width: var(--chrome-left);
+    flex: none;
   }
   .toolbar.mac .trail {
-    justify-self: end;
     margin-left: 0;
   }
   .group {
diff --git a/src/lib/dnd.svelte.ts b/src/lib/dnd.svelte.ts
index bc5cd46..68d3372 100644
--- a/src/lib/dnd.svelte.ts
+++ b/src/lib/dnd.svelte.ts
@@ -20,11 +20,12 @@ export const drag = $state<{
   from: SideName | null;
   items: Location[];
   names: string[];
+  folders: boolean[];
   x: number;
   y: number;
   over: DropTarget | null;
   move: boolean;
-}>({ active: false, from: null, items: [], names: [], x: 0, y: 0, over: null, move: false });
+}>({ active: false, from: null, items: [], names: [], folders: [], x: 0, y: 0, over: null, move: false });
 
 /** Finds the panel/row under a viewport point using data attributes on the DOM. */
 export function targetAt(x: number, y: number): DropTarget | null {
@@ -55,6 +56,7 @@ export function startDrag(from: SideName, entries: Entry[], x: number, y: number
   drag.from = from;
   drag.items = entries.map((e) => childLoc(tab.location, e));
   drag.names = entries.map((e) => e.name);
+  drag.folders = entries.map((e) => e.isDir && !(e.flags & F.UP));
   drag.x = x;
   drag.y = y;
   drag.over = null;
@@ -80,6 +82,8 @@ export function dragOutside(): boolean {
   drag.active = false;
   drag.over = null;
   drag.items = [];
+  drag.names = [];
+  drag.folders = [];
   void api
     .dragOut(paths)
     .then(() => {
@@ -92,11 +96,23 @@ export function dragOutside(): boolean {
 export async function endDrag() {
   const over = drag.over;
   const items = drag.items;
+  const names = drag.names;
+  const folders = drag.folders;
+  const el = document.elementFromPoint(drag.x, drag.y) as HTMLElement | null;
+  const favoriteBar = el?.closest<HTMLElement>('[data-favorites-drop]');
   const move = drag.move;
   const from = drag.from;
   drag.active = false;
   drag.over = null;
   drag.items = [];
+  drag.names = [];
+  drag.folders = [];
+  if (favoriteBar && items.length === 1 && folders[0]) {
+    if (!settings.hotlist.some((h) => sameLoc(h.location, items[0]))) {
+      settings.hotlist = [...settings.hotlist, { name: names[0], location: items[0] }];
+    }
+    return;
+  }
   if (!over || !items.length) return;
   const dest = destOf(over);
   if (!dest) return;

From 9ccf5d5cab10237d749cc4c6c229e589005e618b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Ivan=C4=8Di=C4=8D?= <tomaz.ivancic@gmail.com>
Date: Fri, 23 Oct 2026 15:12:44 +0200
Subject: [PATCH 4/7] Add and speed up directory branch view

Toggle a flat file view of the current folder tree with Ctrl+B.
Reuse recursive local search and show results with their relative folders.
Batch search results and progress updates to reduce contention.
---
 src-tauri/src/search.rs |  71 +++++++++++++++++++++++++-
 src/lib/actions.ts      | 108 +++++++++++++++++++++++++++++++++++++++-
 src/lib/commands.ts     |   2 +
 src/lib/i18n/cs.ts      |   1 +
 src/lib/i18n/en.ts      |   1 +
 5 files changed, 180 insertions(+), 3 deletions(-)

diff --git a/src-tauri/src/search.rs b/src-tauri/src/search.rs
index 9f65276..394fca3 100644
--- a/src-tauri/src/search.rs
+++ b/src-tauri/src/search.rs
@@ -106,6 +106,71 @@ struct Compiled {
     text: Option<RegexMatcher>,
 }
 
+/// Avoid contending on the shared result queue for every match. Branch view
+/// can match nearly every file, unlike ordinary searches where hits are rare.
+struct HitBatch {
+    pending: Arc<Mutex<Vec<Hit>>>,
+    items: Vec<Hit>,
+}
+
+impl HitBatch {
+    fn new(pending: Arc<Mutex<Vec<Hit>>>) -> Self {
+        Self { pending, items: Vec::with_capacity(128) }
+    }
+
+    fn push(&mut self, hit: Hit) {
+        self.items.push(hit);
+        if self.items.len() >= 128 {
+            self.flush();
+        }
+    }
+
+    fn flush(&mut self) {
+        if !self.items.is_empty() {
+            self.pending.lock().append(&mut self.items);
+        }
+    }
+}
+
+impl Drop for HitBatch {
+    fn drop(&mut self) {
+        self.flush();
+    }
+}
+
+/// Keep the progress counter mostly local to each walker thread as well.
+struct ScanBatch {
+    total: Arc<AtomicU64>,
+    count: u64,
+}
+
+impl ScanBatch {
+    fn new(total: Arc<AtomicU64>) -> Self {
+        Self { total, count: 0 }
+    }
+
+    fn next(&mut self) -> u64 {
+        self.count += 1;
+        if self.count >= 256 {
+            self.flush();
+        }
+        self.total.load(Ordering::Relaxed) + self.count
+    }
+
+    fn flush(&mut self) {
+        if self.count > 0 {
+            self.total.fetch_add(self.count, Ordering::Relaxed);
+            self.count = 0;
+        }
+    }
+}
+
+impl Drop for ScanBatch {
+    fn drop(&mut self) {
+        self.flush();
+    }
+}
+
 fn compile(p: &SearchParams) -> AppResult<Compiled> {
     let name = if p.name.trim().is_empty() {
         NameMatch::Any
@@ -315,6 +380,8 @@ pub fn run(params: SearchParams, channel: Channel<SearchEvent>, cancel: Arc<Atom
                     cancel.clone(),
                 );
                 let mut grepper = Grepper::new(&params);
+                let mut hit_batch = HitBatch::new(pending.clone());
+                let mut scan_batch = ScanBatch::new(scanned.clone());
                 Box::new(move |res| {
                     if cancel.load(Ordering::Relaxed) {
                         return ignore::WalkState::Quit;
@@ -323,7 +390,7 @@ pub fn run(params: SearchParams, channel: Channel<SearchEvent>, cancel: Arc<Atom
                     if entry.depth() == 0 {
                         return ignore::WalkState::Continue;
                     }
-                    let n = scanned.fetch_add(1, Ordering::Relaxed);
+                    let n = scan_batch.next();
                     let is_dir = entry.file_type().map(|t| t.is_dir()).unwrap_or(false);
                     if is_dir && n % 64 == 0 {
                         if let Some(mut c) = current.try_lock() {
@@ -385,7 +452,7 @@ pub fn run(params: SearchParams, channel: Channel<SearchEvent>, cancel: Arc<Atom
                         match_count: count,
                         cloud,
                     };
-                    pending.lock().push(hit);
+                    hit_batch.push(hit);
                     if found.fetch_add(1, Ordering::Relaxed) + 1 >= limit {
                         truncated.store(true, Ordering::Relaxed);
                         return ignore::WalkState::Quit;
diff --git a/src/lib/actions.ts b/src/lib/actions.ts
index b3b6c7f..5b15739 100644
--- a/src/lib/actions.ts
+++ b/src/lib/actions.ts
@@ -22,7 +22,19 @@ import DuplicatesDialog from '../components/dialogs/DuplicatesDialog.svelte';
 import { ensureArchiveAccess, mount } from './archives';
 import { renameGroup } from './groups';
 import { pushHistory } from './state/history.svelte';
-import { F, type AppError, type Entry, type RemoteSource, type JobRequest, type Location, type SortKey, type ViewMode } from './types';
+import {
+  F,
+  type AppError,
+  type Entry,
+  type RemoteSource,
+  type JobRequest,
+  type Location,
+  type SearchEvent,
+  type SearchHit,
+  type SearchParams,
+  type SortKey,
+  type ViewMode,
+} from './types';
 
 import AboutDialog from '../components/dialogs/AboutDialog.svelte';
 import ChecksumDialog from '../components/dialogs/ChecksumDialog.svelte';
@@ -40,6 +52,100 @@ import type { Connected } from './types';
 
 const nothing = () => toast(t('misc.noSelection'));
 
+const branchOrigins = new Map<string, Location>();
+const branchRuns = new WeakMap<Tab, { origin: Location; opId: number | null; done: boolean }>();
+let branchSequence = 0;
+
+export function isDirBranch(tab: Tab): boolean {
+  if (tab.location.kind === 'search' && branchOrigins.has(tab.location.id)) return true;
+  const run = branchRuns.get(tab);
+  return !!run && sameLoc(tab.location, run.origin);
+}
+
+/** Toggle Total Commander-style flat results for the current folder tree. */
+export async function toggleDirBranch() {
+  const tab = app.panel;
+  if (tab.location.kind === 'search') {
+    const origin = branchOrigins.get(tab.location.id);
+    if (origin) {
+      await tab.navigate(origin);
+      return;
+    }
+  }
+
+  const active = branchRuns.get(tab);
+  if (active) {
+    branchRuns.delete(tab);
+    if (active.opId !== null) void api.cancelOp(active.opId);
+    if (sameLoc(tab.location, active.origin)) tab.loading = false;
+    return;
+  }
+
+  const origin = tab.location;
+  if (origin.kind !== 'local') return toast(t('misc.notLocal'));
+
+  const run = { origin, opId: null as number | null, done: false };
+  branchRuns.set(tab, run);
+  tab.loading = true;
+  const id = `branch-${Date.now()}-${++branchSequence}`;
+  const label = `${t('cmd.dirBranch')}: ${origin.path}`;
+  const hits: SearchHit[] = [];
+  const params: SearchParams = {
+    roots: [origin.path],
+    name: '',
+    nameRegex: false,
+    nameCase: false,
+    text: '',
+    textRegex: false,
+    textCase: false,
+    textWord: false,
+    textNot: false,
+    encoding: '',
+    binary: false,
+    minSize: null,
+    maxSize: null,
+    newerThan: null,
+    olderThan: null,
+    maxDepth: null,
+    hidden: settings.showHidden,
+    followLinks: false,
+    gitignore: false,
+    excludeDirs: '',
+    kind: 'files',
+    maxResults: null,
+    query: '',
+  };
+
+  try {
+    const opId = await api.searchStart(params, (event: SearchEvent) => {
+      if (branchRuns.get(tab) !== run) return;
+      if (event.type === 'hits') {
+        hits.push(...event.items);
+      } else if (event.type === 'done') {
+        run.done = true;
+        branchRuns.delete(tab);
+        if (!sameLoc(tab.location, origin)) return;
+        if (event.cancelled) {
+          tab.loading = false;
+          return;
+        }
+        branchOrigins.set(id, origin);
+        if (branchOrigins.size > 10) branchOrigins.delete(branchOrigins.keys().next().value!);
+        tab.showSearch(id, label, hits, true, [origin.path]);
+        if (event.truncated) toast(t('search.truncated'), 'warning');
+      }
+    });
+    run.opId = opId;
+    if (!run.done && branchRuns.get(tab) !== run) void api.cancelOp(opId);
+  } catch (e) {
+    if (branchRuns.get(tab) === run) {
+      branchRuns.delete(tab);
+      if (sameLoc(tab.location, origin)) tab.loading = false;
+    }
+    showError(e);
+  }
+}
+
 function backend(loc: Location): BackendLocation | null {
   return isResults(loc) ? null : (loc as BackendLocation);
 }
diff --git a/src/lib/commands.ts b/src/lib/commands.ts
index 883b816..41a4484 100644
--- a/src/lib/commands.ts
+++ b/src/lib/commands.ts
@@ -122,6 +122,7 @@ export const commands: Command[] = [
   { id: 'toggleRightClickSelect', label: 'cmd.toggleRightClickSelect', run: () => (settings.rightClickSelect = !settings.rightClickSelect), checked: () => settings.rightClickSelect },
   { id: 'refresh', label: 'cmd.refresh', run: () => app.panel.reload(), keys: ['Mod+R'] },
   { id: 'filter', label: 'cmd.filter', run: () => (app.panel.filterOpen = true), keys: ['Mod+S'] },
+  { id: 'dirBranch', label: 'cmd.dirBranch', run: A.toggleDirBranch, keys: ['Ctrl+B'], checked: () => A.isDirBranch(app.panel) },
 
   // Go
   { id: 'back', label: 'cmd.back', run: () => app.panel.back(), keys: both(isMac ? ['Mod+[', 'Alt+ArrowLeft'] : ['Alt+ArrowLeft']) },
@@ -428,6 +429,7 @@ export function buildMenu(): MenuNode[] {
       item('wrapNames'),
       item('quickView'),
       item('filter'),
+      item('dirBranch'),
       sep,
       item('toggleToolbar'),
       item('toggleDriveBar'),
diff --git a/src/lib/i18n/cs.ts b/src/lib/i18n/cs.ts
index e9bb584..105cc67 100644
--- a/src/lib/i18n/cs.ts
+++ b/src/lib/i18n/cs.ts
@@ -52,6 +52,7 @@ export const cs: Record<Key, string> & Record<string, string> = {
   'cmd.terminal': 'Otevřít terminál zde',
   'cmd.duplicate': 'Duplikovat',
   'cmd.search': 'Hledat soubory…',
+  'cmd.dirBranch': 'Zobrazit všechny soubory v aktuální složce a podsložkách',
   'cmd.ftpConnect': 'Připojit k serveru…',
   'cmd.ftpDisconnect': 'Odpojit',
   'cmd.multiRename': 'Hromadné přejmenování…',
diff --git a/src/lib/i18n/en.ts b/src/lib/i18n/en.ts
index 18a0295..9344b49 100644
--- a/src/lib/i18n/en.ts
+++ b/src/lib/i18n/en.ts
@@ -53,6 +53,7 @@ export const en = {
   'cmd.terminal': 'Open Terminal Here',
   'cmd.duplicate': 'Duplicate',
   'cmd.search': 'Find Files…',
+  'cmd.dirBranch': 'Show Files in Current Folder and Subfolders',
   'cmd.ftpConnect': 'Connect to Server…',
   'cmd.ftpDisconnect': 'Disconnect',
   'cmd.multiRename': 'Multi-Rename…',

From 207e08058bab42075ccfca2a081c9973aff206b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Ivan=C4=8Di=C4=8D?= <tomaz.ivancic@gmail.com>
Date: Fri, 23 Oct 2026 15:33:01 +0200
Subject: [PATCH 5/7] Add tab transfer between panels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move a selected tab to the other panel from the tab and Go menus.
Copy the tab when it is the source panel’s only tab.
---
 src/lib/actions.ts          | 23 ++++++++++++++++++++++-
 src/lib/commands.ts         |  2 ++
 src/lib/contextMenu.ts      |  1 +
 src/lib/i18n/cs.ts          |  1 +
 src/lib/i18n/en.ts          |  1 +
 src/lib/state/app.svelte.ts | 14 ++++++++++++++
 6 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/lib/actions.ts b/src/lib/actions.ts
index 5b15739..3bf1657 100644
--- a/src/lib/actions.ts
+++ b/src/lib/actions.ts
@@ -935,11 +935,32 @@ export async function renameTab(side: Side = app.activeSideObj, index = side.act
 export async function duplicateTab(side: Side = app.activeSideObj, index = side.active) {
   const cur = side.tabs[index];
   if (!cur) return;
-  const tab = new Tab({ location: cur.location, view: cur.view, sortKey: cur.sortKey, sortDesc: cur.sortDesc });
+  const tab = duplicateTabState(cur);
   side.addTab(tab);
   await tab.navigate(cur.location.kind === 'search' ? { kind: 'local', path: app.info.home } : cur.location, { focus: cur.current?.key });
 }
 
+function duplicateTabState(cur: Tab): Tab {
+  return new Tab({ location: cur.location, view: cur.view, sortKey: cur.sortKey, sortDesc: cur.sortDesc });
+}
+
+/** Sends the selected tab to the other panel. A panel's only tab is copied. */
+export async function moveTabToOtherSide(side: Side = app.activeSideObj, index = side.active) {
+  const cur = side.tabs[index];
+  if (!cur) return;
+  const other = side === app.left ? app.right : app.left;
+  let moved: Tab;
+  if (side.tabs.length === 1) {
+    moved = duplicateTabState(cur);
+    other.addTab(moved);
+    await moved.navigate(cur.location.kind === 'search' ? { kind: 'local', path: app.info.home } : cur.location, { focus: cur.current?.key });
+  } else {
+    moved = side.takeTab(index)!;
+    other.addTab(moved);
+  }
+  app.activeSide = other === app.left ? 'left' : 'right';
+}
+
 export function cycleTab(delta: number) {
   const s: Side = app.activeSideObj;
   s.active = (s.active + delta + s.tabs.length) % s.tabs.length;
diff --git a/src/lib/commands.ts b/src/lib/commands.ts
index 41a4484..f37b139 100644
--- a/src/lib/commands.ts
+++ b/src/lib/commands.ts
@@ -142,6 +142,7 @@ export const commands: Command[] = [
   { id: 'lockTab', label: 'cmd.lockTab', run: () => A.toggleLockTab(), keys: ['Mod+Shift+L'], checked: () => app.panel.locked },
   { id: 'lockTabFolder', label: 'tabs.lockFolder', run: () => A.toggleLockTabFolder(), checked: () => !!app.panel.home },
   { id: 'duplicateTab', label: 'cmd.duplicateTab', run: () => A.duplicateTab() },
+  { id: 'moveTabToOtherSide', label: 'cmd.moveTabToOtherSide', run: () => A.moveTabToOtherSide() },
   { id: 'closeOtherTabs', label: 'cmd.closeOtherTabs', run: () => app.activeSideObj.closeOthers() },
   { id: 'nextTab', label: 'cmd.nextTab', run: () => A.cycleTab(1), keys: isMac ? ['Ctrl+Tab', 'Mod+Shift+]'] : ['Ctrl+Tab'] },
   { id: 'prevTab', label: 'cmd.prevTab', run: () => A.cycleTab(-1), keys: isMac ? ['Ctrl+Shift+Tab', 'Mod+Shift+['] : ['Ctrl+Shift+Tab'] },
@@ -460,6 +461,7 @@ export function buildMenu(): MenuNode[] {
       sep,
       item('newTab'),
       item('duplicateTab'),
+      item('moveTabToOtherSide'),
       item('lockTab'),
       item('lockTabFolder'),
       item('closeTab'),
diff --git a/src/lib/contextMenu.ts b/src/lib/contextMenu.ts
index 4b0039d..fdb00dc 100644
--- a/src/lib/contextMenu.ts
+++ b/src/lib/contextMenu.ts
@@ -234,6 +234,7 @@ export async function tabMenu(side: import('./state/app.svelte').Side, index: nu
     ...(tab.home ? [] : [await MenuItem.new({ text: t('tabs.lockFolder'), action: () => A.toggleLockTabFolder(side, index) })]),
     await MenuItem.new({ text: t('tabs.rename') + '…', action: () => void A.renameTab(side, index) }),
     await MenuItem.new({ text: t('cmd.duplicateTab'), action: () => void A.duplicateTab(side, index) }),
+    await MenuItem.new({ text: t('cmd.moveTabToOtherSide'), action: () => void A.moveTabToOtherSide(side, index) }),
     await PredefinedMenuItem.new({ item: 'Separator' }),
     await MenuItem.new({ text: t('cmd.closeTab'), enabled: !tab.locked && side.tabs.length > 1, action: () => A.closeTab(side, index) }),
     await MenuItem.new({ text: t('cmd.closeOtherTabs'), enabled: side.tabs.length > 1, action: () => side.closeOthers(index) }),
diff --git a/src/lib/i18n/cs.ts b/src/lib/i18n/cs.ts
index 105cc67..3bc166d 100644
--- a/src/lib/i18n/cs.ts
+++ b/src/lib/i18n/cs.ts
@@ -81,6 +81,7 @@ export const cs: Record<Key, string> & Record<string, string> = {
   'cmd.closeTab': 'Zavřít kartu',
   'cmd.lockTab': 'Zamknout kartu',
   'cmd.duplicateTab': 'Duplikovat kartu',
+  'cmd.moveTabToOtherSide': 'Přesunout kartu do druhého panelu',
   'cmd.closeOtherTabs': 'Zavřít ostatní karty',
   'tabs.lock': 'Zamknout kartu',
   'tabs.unlock': 'Odemknout kartu',
diff --git a/src/lib/i18n/en.ts b/src/lib/i18n/en.ts
index 9344b49..83dfbf2 100644
--- a/src/lib/i18n/en.ts
+++ b/src/lib/i18n/en.ts
@@ -82,6 +82,7 @@ export const en = {
   'cmd.closeTab': 'Close Tab',
   'cmd.lockTab': 'Lock Tab',
   'cmd.duplicateTab': 'Duplicate Tab',
+  'cmd.moveTabToOtherSide': 'Move Tab to Other Panel',
   'cmd.closeOtherTabs': 'Close Other Tabs',
   'tabs.lock': 'Lock Tab',
   'tabs.unlock': 'Unlock Tab',
diff --git a/src/lib/state/app.svelte.ts b/src/lib/state/app.svelte.ts
index a13747f..2525c64 100644
--- a/src/lib/state/app.svelte.ts
+++ b/src/lib/state/app.svelte.ts
@@ -62,6 +62,20 @@ export class Side {
     return true;
   }
 
+  /** Removes a tab for transfer to the other panel, keeping this panel non-empty. */
+  takeTab(index: number): Tab | null {
+    const tab = this.tabs[index];
+    if (!tab || this.tabs.length <= 1) return null;
+    const current = this.tabs[this.active];
+    const tabs = this.tabs.filter((_, i) => i !== index);
+    if (current === tab) {
+      this.tabs = tabs;
+      this.active = Math.min(index, tabs.length - 1);
+    } else this.setTabs(tabs, current);
+    tab.side = null;
+    return tab;
+  }
+
   closeOthers(index = this.active) {
     const keep = this.tabs[index];
     this.setTabs(this.tabs.filter((t) => t === keep || t.locked), keep);

From 640eaf6bd7e0ef35535acb4501ee95abdd24e5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Ivan=C4=8Di=C4=8D?= <tomaz.ivancic@gmail.com>
Date: Fri, 23 Oct 2026 16:45:18 +0200
Subject: [PATCH 6/7] Fix drag and drop to parent folders

Recognize the synthetic .. row as a destination for copy and move.
Allow Shift-drag to start after extending the selection and show the move hint.
---
 src/lib/dnd.svelte.ts | 10 ++++----
 src/lib/i18n/cs.ts    |  2 +-
 src/lib/i18n/en.ts    |  2 +-
 src/lib/pointer.ts    | 54 ++++++++++++++++++++++++-------------------
 4 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/lib/dnd.svelte.ts b/src/lib/dnd.svelte.ts
index 68d3372..9cd0d46 100644
--- a/src/lib/dnd.svelte.ts
+++ b/src/lib/dnd.svelte.ts
@@ -36,14 +36,16 @@ export function targetAt(x: number, y: number): DropTarget | null {
   const row = el?.closest<HTMLElement>('[data-key]');
   const key = row?.dataset.key ?? null;
   const tab = app.side(side).tab;
-  const entry = key ? tab.all.find((e) => e.key === key) : undefined;
-  return { side, entryKey: entry && entry.isDir && !(entry.flags & F.UP) ? entry.key : null };
+  // The `..` row is synthetic and only exists in `visible`, not `all`.
+  const entry = key ? tab.visible.find((e) => e.key === key) : undefined;
+  return { side, entryKey: entry && (entry.isDir || (entry.flags & F.UP) !== 0) ? entry.key : null };
 }
 
 function destOf(t: DropTarget): Location | null {
   const tab = app.side(t.side).tab;
   if (t.entryKey) {
-    const e = tab.all.find((x) => x.key === t.entryKey);
+    const e = tab.visible.find((x) => x.key === t.entryKey);
+    if (e?.flags & F.UP) return tab.listing?.parent ?? null;
     if (e) return childLoc(tab.location, e);
   }
   const loc = tab.location;
@@ -65,7 +67,7 @@ export function startDrag(from: SideName, entries: Entry[], x: number, y: number
 export function moveDrag(e: PointerEvent) {
   drag.x = e.clientX;
   drag.y = e.clientY;
-  drag.move = isMac ? e.metaKey : e.shiftKey;
+  drag.move = e.shiftKey || (isMac && e.metaKey);
   drag.over = targetAt(e.clientX, e.clientY);
 }
 
diff --git a/src/lib/i18n/cs.ts b/src/lib/i18n/cs.ts
index 3bc166d..d3ac37e 100644
--- a/src/lib/i18n/cs.ts
+++ b/src/lib/i18n/cs.ts
@@ -394,7 +394,7 @@ export const cs: Record<Key, string> & Record<string, string> = {
   'panel.quickSearch': 'Hledat',
   'panel.retry': 'Zkusit znovu',
   'panel.goHome': 'Domů',
-  'panel.dropCopy': 'Kopírovat sem',
+  'panel.dropCopy': 'Kopírovat sem · podržte Shift pro přesun',
   'panel.dropMove': 'Přesunout sem',
   'panel.searchResults': 'Výsledky hledání',
   'panel.editPath': 'Klikněte pro zadání cesty',
diff --git a/src/lib/i18n/en.ts b/src/lib/i18n/en.ts
index 83dfbf2..9620653 100644
--- a/src/lib/i18n/en.ts
+++ b/src/lib/i18n/en.ts
@@ -394,7 +394,7 @@ export const en = {
   'panel.quickSearch': 'Find',
   'panel.retry': 'Try again',
   'panel.goHome': 'Go home',
-  'panel.dropCopy': 'Copy here',
+  'panel.dropCopy': 'Copy here · hold Shift to move',
   'panel.dropMove': 'Move here',
   'panel.searchResults': 'Search results',
   'panel.editPath': 'Click to type a path',
diff --git a/src/lib/pointer.ts b/src/lib/pointer.ts
index 30b9429..9ee6bd2 100644
--- a/src/lib/pointer.ts
+++ b/src/lib/pointer.ts
@@ -20,6 +20,34 @@ let lastDown: { tab: Tab; key: string; at: number; x: number; y: number } | null
 let rightClickHandled = false;
 let rightSelectActive = false;
 
+/** Starts a file drag after the pointer crosses the movement threshold. */
+function watchItemDrag(e: PointerEvent, side: SideName, tab: Tab, entry: Entry) {
+  const sx = e.clientX;
+  const sy = e.clientY;
+  let dragging = false;
+  const move = (ev: PointerEvent) => {
+    if (!dragging && Math.hypot(ev.clientX - sx, ev.clientY - sy) > 6 && !(entry.flags & F.UP)) {
+      dragging = true;
+      const items = tab.isMarked(entry.key) ? tab.targets() : [entry];
+      startDrag(side, items, ev.clientX, ev.clientY);
+    }
+    if (!dragging) return;
+    const outside = ev.clientX < 0 || ev.clientY < 0 || ev.clientX >= window.innerWidth || ev.clientY >= window.innerHeight;
+    if (outside && drag.active && dragOutside()) {
+      up();
+      return;
+    }
+    moveDrag(ev);
+  };
+  const up = () => {
+    window.removeEventListener('pointermove', move);
+    window.removeEventListener('pointerup', up);
+    if (dragging && drag.active) void endDrag();
+  };
+  window.addEventListener('pointermove', move);
+  window.addEventListener('pointerup', up);
+}
+
 export function canOpenContextMenu(e: MouseEvent, entry: Entry | null): boolean {
   if (!settings.rightClickSelect) return true;
   if (!entry) return true;
@@ -173,6 +201,7 @@ export function itemPointerDown(e: PointerEvent, side: SideName, tab: Tab, entry
   const mod = isMac ? e.metaKey : e.ctrlKey;
   if (e.shiftKey) {
     tab.selectTo(index);
+    watchItemDrag(e, side, tab, entry);
     return;
   }
   if (mod) {
@@ -196,30 +225,7 @@ export function itemPointerDown(e: PointerEvent, side: SideName, tab: Tab, entry
     return;
   }
 
-  const sx = e.clientX;
-  const sy = e.clientY;
-  let dragging = false;
-  const move = (ev: PointerEvent) => {
-    if (!dragging && Math.hypot(ev.clientX - sx, ev.clientY - sy) > 6 && !(entry.flags & F.UP)) {
-      dragging = true;
-      const items = tab.isMarked(entry.key) ? tab.targets() : [entry];
-      startDrag(side, items, ev.clientX, ev.clientY);
-    }
-    if (!dragging) return;
-    const outside = ev.clientX < 0 || ev.clientY < 0 || ev.clientX >= window.innerWidth || ev.clientY >= window.innerHeight;
-    if (outside && drag.active && dragOutside()) {
-      up();
-      return;
-    }
-    moveDrag(ev);
-  };
-  const up = () => {
-    window.removeEventListener('pointermove', move);
-    window.removeEventListener('pointerup', up);
-    if (dragging && drag.active) void endDrag();
-  };
-  window.addEventListener('pointermove', move);
-  window.addEventListener('pointerup', up);
+  watchItemDrag(e, side, tab, entry);
 }
 
 /** Click on empty space below the items. */

From 3449898c185f29d617ef5e2d8e18a0b8d8212e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Ivan=C4=8Di=C4=8D?= <tomaz.ivancic@gmail.com>
Date: Fri, 23 Oct 2026 17:11:49 +0200
Subject: [PATCH 7/7] Persist favorites toolbar visibility

Remember whether the favorites shortcuts are shown across restarts. Place them left-aligned after Connect to Server with a vertical divider.
---
 src/components/FavoritesBar.svelte |  8 +++-----
 src/components/Toolbar.svelte      | 13 +++++++++----
 src/lib/state/settings.svelte.ts   |  3 +++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/FavoritesBar.svelte b/src/components/FavoritesBar.svelte
index 687b7e7..c808309 100644
--- a/src/components/FavoritesBar.svelte
+++ b/src/components/FavoritesBar.svelte
@@ -13,8 +13,6 @@
 
   let pointer: { x: number; y: number; location: HotlistItem['location']; moved: boolean } | null = null;
   let suppressClick = false;
-  let showFavorites = $state(false);
-
   const iconPx = Math.round(18 * dpr());
 
   function open(item: HotlistItem) {
@@ -61,10 +59,10 @@
 </script>
 
 <nav class="favorites" data-favorites-drop aria-label={t('cmd.hotlist')} class:drop={drag.active}>
-  <button class="toggle icon-btn" class:on={showFavorites} title={t('cmd.hotlist')} aria-label={t('cmd.hotlist')} aria-pressed={showFavorites} onclick={() => (showFavorites = !showFavorites)}>
+  <button class="toggle icon-btn" class:on={settings.favoritesBarOpen} title={t('cmd.hotlist')} aria-label={t('cmd.hotlist')} aria-pressed={settings.favoritesBarOpen} onclick={() => (settings.favoritesBarOpen = !settings.favoritesBarOpen)}>
     <Star size={17} strokeWidth={1.7} />
   </button>
-  {#if showFavorites}
+  {#if settings.favoritesBarOpen}
     <div class="items">
       {#each settings.hotlist as item, i (locKey(item.location))}
         <button
@@ -97,7 +95,7 @@
     min-width: 0;
     display: flex;
     align-items: center;
-    justify-content: center;
+    justify-content: flex-start;
     gap: 3px;
     overflow: hidden;
     padding: 0 4px;
diff --git a/src/components/Toolbar.svelte b/src/components/Toolbar.svelte
index 078038c..5156ec5 100644
--- a/src/components/Toolbar.svelte
+++ b/src/components/Toolbar.svelte
@@ -109,10 +109,9 @@
       <Server {size} strokeWidth={sw} />
     </button>
   </div>
-
-  </div>
-
+  <span class="divider" aria-hidden="true"></span>
   <FavoritesBar />
+  </div>
 
   <div class="trail" data-tauri-drag-region>
     <JobsIndicator />
@@ -137,7 +136,7 @@
     align-items: center;
     gap: 10px;
     min-width: 0;
-    flex: none;
+    flex: 1;
   }
   .lead {
     display: none;
@@ -168,6 +167,12 @@
     align-items: center;
     gap: 2px;
   }
+  .divider {
+    width: 1px;
+    height: 18px;
+    flex: none;
+    background: var(--border-strong);
+  }
   .segmented {
     display: flex;
     align-items: center;
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index cdf424f..c3acaec 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -37,6 +37,8 @@ export interface Settings {
   metaWidths: Record<string, number>;
   functionBar: boolean;
   toolbar: boolean;
+  /** Keep the favorites shortcuts visible in the toolbar. */
+  favoritesBarOpen: boolean;
   restoreSession: boolean;
   confirmDelete: boolean;
   useTrash: boolean;
@@ -93,6 +95,7 @@ export const defaultSettings = (): Settings => ({
   index: { enabled: true, roots: [], excludes: null, hidden: false, meta: true, skipCloud: false },
   functionBar: true,
   toolbar: true,
+  favoritesBarOpen: false,
   restoreSession: true,
   confirmDelete: true,
   useTrash: true,