feat: implement file and text drop handling for chat and add shrunk sidebar override for window view

This commit is contained in:
2026-10-24 16:28:13 +02:00
parent e35c87b3f2
commit 5401cfbc0a
13 changed files with 929 additions and 486 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ TextField {
implicitHeight: contentHeight + topPadding + bottomPadding implicitHeight: contentHeight + topPadding + bottomPadding
implicitWidth: contentWidth + leftPadding + rightPadding implicitWidth: contentWidth + leftPadding + rightPadding
placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.QtRendering renderType: TextField.QtRendering
selectedTextColor: color selectedTextColor: color
selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4) selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
+52 -1
View File
@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import Quickshell import Quickshell
import QtQuick.Layouts import QtQuick.Layouts
import ZShell.Services
import ZShell.Components import ZShell.Components
import ZShell.Config import ZShell.Config
import ZShell.Llm import ZShell.Llm
@@ -90,7 +91,9 @@ Item {
signal requestClose signal requestClose
readonly property bool atNewestEnd: !listLoader.item || listLoader.item.contentY < 4 readonly property bool atNewestEnd: !listLoader.item || listLoader.item.contentY < 4
readonly property bool importing: importIds.length > 0
property var importIds: []
property var pendingAttachments: [] property var pendingAttachments: []
function attachFiles(): void { function attachFiles(): void {
@@ -541,7 +544,7 @@ Item {
bg.border.color: Colors.palette.m3outlineVariant bg.border.color: Colors.palette.m3outlineVariant
bg.color: Colors.tPalette.m3surfaceContainerLowest bg.color: Colors.tPalette.m3surfaceContainerLowest
fastGlow: LlmClient.busy fastGlow: LlmClient.busy
glow.opacity: input.activeFocus && (!LlmClient.busy || ChatState.isWindow) glow.opacity: !ChatState.narrowSidebarExpanded ? (input.activeFocus && (!LlmClient.busy || ChatState.isWindow) ? 1 : 0) : 0
font: Tokens.font.body.small font: Tokens.font.body.small
implicitHeight: Math.min(root.height / 5, contentHeight + topPadding + bottomPadding) implicitHeight: Math.min(root.height / 5, contentHeight + topPadding + bottomPadding)
focus: true focus: true
@@ -578,4 +581,52 @@ Item {
root.send(text); root.send(text);
} }
} }
Connections {
target: DropImporter
function onImportFinished(id: int, paths: var, errors: var): void {
if (!root.importIds.includes(id))
return;
root.importIds = root.importIds.filter(i => i !== id);
if (paths.length > 0) {
const added = root.chatData.addAttachments(paths);
root.pendingAttachments = root.pendingAttachments.concat(added);
}
for (const e of errors)
console.warn("Drop import:", e);
}
}
DropArea {
id: dropArea
anchors.fill: parent
onEntered: drag => {
drag.accepted = drag.hasUrls || drag.hasText || drag.hasHtml || drag.formats.some(f => f.startsWith("image/"));
}
onDropped: drop => {
const formats = drop.formats;
const urls = drop.hasUrls ? drop.urls : [];
const text = drop.hasText ? drop.text : "";
const html = drop.hasHtml ? drop.html : "";
const imgFormat = formats.find(f => f.startsWith("image/"));
const raw = imgFormat ? drop.getDataAsArrayBuffer(imgFormat) : new ArrayBuffer(0);
switch (DropImporter.decide(urls, text, html, raw.byteLength > 0)) {
case DropImporter.Attach:
root.importIds = [...root.importIds, DropImporter.importAttachments(urls, html, raw)];
break;
case DropImporter.InsertText:
input.insert(input.cursorPosition, text || urls.map(u => u.toString()).join("\n"));
root.focusInput();
break;
}
drop.acceptProposedAction();
}
}
} }
+80 -28
View File
@@ -91,6 +91,50 @@ CustomRect {
opacity: root.slim ? 0 : 1 opacity: root.slim ? 0 : 1
state: titleText.readOnly ? "static" : "editing"
states: [
State {
name: "static"
PropertyChanges {
staticText.opacity: 1
}
PropertyChanges {
titleText.opacity: 0
}
},
State {
name: "editing"
PropertyChanges {
staticText.opacity: 0
}
PropertyChanges {
titleText.opacity: 1
}
}
]
transitions: [
// Going static: titleText fades out (animated), staticText snaps in
Transition {
to: "static"
Anim {
target: titleText
property: "opacity"
type: Anim.SlowEffects
}
},
// Going editing: staticText fades out (animated), titleText snaps in
Transition {
to: "editing"
Anim {
target: staticText
property: "opacity"
type: Anim.SlowEffects
}
}
]
Behavior on opacity { Behavior on opacity {
Anim { Anim {
type: Anim.DefaultEffects type: Anim.DefaultEffects
@@ -106,7 +150,7 @@ CustomRect {
color: Colors.layer(Colors.palette.m3surfaceContainerHighest, 1) color: Colors.layer(Colors.palette.m3surfaceContainerHighest, 1)
implicitHeight: titleText.implicitHeight + Tokens.padding.extraSmall * 2 implicitHeight: titleText.implicitHeight + Tokens.padding.extraSmall * 2
radius: Tokens.rounding.full radius: Tokens.rounding.full
implicitWidth: titleText.implicitWidth + Tokens.padding.large * 2 implicitWidth: titleText.width + Tokens.padding.large * 2
opacity: titleText.readOnly ? 0 : 1 opacity: titleText.readOnly ? 0 : 1
Behavior on opacity { Behavior on opacity {
@@ -122,11 +166,6 @@ CustomRect {
anchors.right: parent.right anchors.right: parent.right
implicitHeight: titleText.implicitHeight + Tokens.padding.small * 2 implicitHeight: titleText.implicitHeight + Tokens.padding.small * 2
layer.enabled: true
layer.effect: OpacityMask {
maskSource: fadeMask
}
TextFieldBase { TextFieldBase {
id: titleText id: titleText
@@ -134,10 +173,12 @@ CustomRect {
anchors.leftMargin: readOnly ? 0 : Tokens.padding.large anchors.leftMargin: readOnly ? 0 : Tokens.padding.large
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2 anchors.topMargin: readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2
width: Math.min(implicitWidth, parent.width - Tokens.padding.large * 2)
font: Tokens.font.body.medium font: Tokens.font.body.medium
text: root.modelData.title || qsTr("New chat") text: root.modelData.title || qsTr("New chat")
readOnly: true readOnly: true
color: Colors.palette.m3onSurface color: Colors.palette.m3onSurface
opacity: 0
Behavior on anchors.leftMargin { Behavior on anchors.leftMargin {
Anim {} Anim {}
@@ -146,6 +187,11 @@ CustomRect {
Anim {} Anim {}
} }
function cancelTitleEdit(): void {
text = root.modelData.title;
readOnly = true;
}
onEditingFinished: root.modelData.title = text onEditingFinished: root.modelData.title = text
onReadOnlyChanged: { onReadOnlyChanged: {
if (!readOnly) { if (!readOnly) {
@@ -156,27 +202,24 @@ CustomRect {
} }
} }
} }
CustomText {
id: staticText
anchors.left: parent.left
anchors.leftMargin: titleText.readOnly ? 0 : Tokens.padding.large
anchors.top: parent.top
anchors.topMargin: titleText.readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2
anchors.right: parent.right
font: titleText.font
text: titleText.text
elide: CustomText.ElideRight
Behavior on anchors.leftMargin {
Anim {}
} }
Behavior on anchors.topMargin {
CustomRect { Anim {}
id: fadeMask
anchors.fill: titleWrapper
layer.enabled: true
visible: false
gradient: Gradient {
orientation: Gradient.Horizontal
GradientStop {
color: Qt.rgba(1, 1, 1, 1.0)
position: 0.85
}
GradientStop {
color: Qt.rgba(1, 1, 1, 0)
position: 1.0
} }
} }
} }
@@ -323,7 +366,13 @@ CustomRect {
inactiveColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 3) inactiveColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 3)
inactiveOnColor: Colors.palette.m3onSurfaceVariant inactiveOnColor: Colors.palette.m3onSurfaceVariant
onClicked: root.remove(root.modelData) onClicked: {
if (!titleText.readOnly) {
titleText.cancelTitleEdit();
return;
}
root.remove(root.modelData);
}
} }
IconButton { IconButton {
@@ -366,7 +415,10 @@ CustomRect {
} }
StateLayer { StateLayer {
onClicked: root.expanded = !root.expanded onClicked: {
root.expanded = !root.expanded;
titleText.readOnly = true;
}
} }
MaterialIcon { MaterialIcon {
+21 -3
View File
@@ -140,7 +140,7 @@ Item {
label.transform: Rotation { label.transform: Rotation {
origin.y: fabRoot.label.height / 2 origin.y: fabRoot.label.height / 2
origin.x: fabRoot.label.width / 2 origin.x: fabRoot.label.width / 2
angle: ChatState.fabExpanded && (ChatState.narrowSidebarExpanded && !ChatState.isWide || !ChatState.isWindow) ? 135 : 0 angle: ChatState.fabExpanded && (ChatState.narrowSidebarExpanded || !ChatState.isWide || !ChatState.isWindow) ? 135 : 0
Behavior on angle { Behavior on angle {
Anim {} Anim {}
@@ -148,8 +148,9 @@ Item {
} }
onClicked: { onClicked: {
if (root.slim && !ChatState.narrowSidebarExpanded) { if ((root.slim && !ChatState.narrowSidebarExpanded) || ChatState.shrinkSidebarOverride) {
root.requestExpand(); root.requestExpand();
ChatState.shrinkSidebarOverride = false;
return; return;
} }
@@ -183,6 +184,10 @@ Item {
name: "pop out in window" name: "pop out in window"
icon: "open_in_new" icon: "open_in_new"
} }
ListElement {
name: "shrink sidebar"
icon: "left_panel_close"
}
} }
CustomRect { CustomRect {
@@ -196,7 +201,18 @@ Item {
radius: sLayer.pressed ? Tokens.rounding.small : implicitHeight / 2 radius: sLayer.pressed ? Tokens.rounding.small : implicitHeight / 2
color: Colors.palette.m3primaryContainer color: Colors.palette.m3primaryContainer
visible: !(modelData.name === "pop out in window" && ChatState.isWindow) visible: {
const n = modelData.name;
const w = ChatState.isWindow;
const wide = ChatState.isWide;
if (n === "pop out in window" && w)
return false;
if (n === "shrink sidebar" && (!w || !wide))
return false;
else
return true;
}
clip: true clip: true
Behavior on radius { Behavior on radius {
@@ -297,6 +313,8 @@ Item {
root.newChatRequest(); root.newChatRequest();
else if (name === "pop out in window") else if (name === "pop out in window")
Detach.create(); Detach.create();
else if (name === "shrink sidebar")
ChatState.shrinkSidebarOverride = true;
ChatState.fabExpanded = false; ChatState.fabExpanded = false;
} }
+4 -1
View File
@@ -19,7 +19,7 @@ Singleton {
property bool settledSlim: false property bool settledSlim: false
property bool settledWide: false property bool settledWide: false
property bool narrowSidebarExpanded: false property bool narrowSidebarExpanded: false
property bool windowIsWide: false property bool shrinkSidebarOverride: false
property ShellScreen screen property ShellScreen screen
property bool sidebarVisible: ShellState.forActive().sidebar property bool sidebarVisible: ShellState.forActive().sidebar
@@ -28,6 +28,9 @@ Singleton {
root.currentIdx = -1; root.currentIdx = -1;
} }
onIsWideChanged: if (isWide)
narrowSidebarExpanded = false
onSidebarVisibleChanged: if (!sidebarVisible) onSidebarVisibleChanged: if (!sidebarVisible)
fabExpanded = false fabExpanded = false
} }
@@ -220,9 +220,8 @@ CustomRect {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
color: root.codeHeaderColor color: root.codeHeaderColor
font: Tokens.font.label.small font: Tokens.font.label.builders.small.capitalization(Font.Capitalize).build()
text: CodeIcons.name(root.language) text: CodeIcons.name(root.language)
visible: root.language.length > 0
} }
Item { Item {
+185 -183
View File
@@ -66,378 +66,380 @@ Singleton {
readonly property string graphql: "M 18.39 96.852 l -4.6 -2.657 L 65.04 5.434 l 4.597 2.656 z m 0 0 M 12.734 87.105 H 115.23 v 5.31 H 12.734 z m 0 0 M 66.031 119.688 L 14.766 90.09 l 2.656 -4.602 l 51.266 29.602 z m 0 0 M 110.566 42.543 L 59.301 12.941 l 2.656 -4.597 l 51.266 29.597 z m 0 0 M 17.434 42.523 l -2.657 -4.601 l 51.27 -29.598 l 2.656 4.598 z m 0 0 M 109.621 96.852 L 58.375 8.09 l 4.598 -2.656 l 51.25 88.761 z m 0 0 M 16.8 34.398 h 5.313 v 59.204 h -5.312 z m 0 0 M 105.887 34.398 h 5.312 v 59.204 h -5.312 z m 0 0 M 65.129 117.441 l -2.32 -4.02 l 44.586 -25.745 l 2.32 4.02 z m 0 0 M 118.238 95.328 c -3.07 5.344 -9.918 7.168 -15.261 4.098 c -5.344 -3.074 -7.168 -9.922 -4.098 -15.266 c 3.074 -5.344 9.922 -7.168 15.266 -4.097 c 5.375 3.105 7.199 9.921 4.093 15.265 M 29.09 43.84 c -3.074 5.344 -9.922 7.168 -15.266 4.097 c -5.344 -3.074 -7.168 -9.921 -4.097 -15.265 c 3.074 -5.344 9.921 -7.168 15.265 -4.098 c 5.344 3.106 7.168 9.922 4.098 15.266 M 9.762 95.328 c -3.075 -5.344 -1.25 -12.16 4.093 -15.266 c 5.344 -3.07 12.16 -1.246 15.266 4.098 c 3.07 5.344 1.246 12.16 -4.098 15.266 c -5.375 3.07 -12.191 1.246 -15.261 -4.098 M 98.91 43.84 c -3.07 -5.344 -1.246 -12.16 4.098 -15.266 c 5.344 -3.07 12.16 -1.246 15.265 4.098 c 3.07 5.344 1.247 12.16 -4.097 15.266 c -5.344 3.07 -12.192 1.246 -15.266 -4.098 M 64 126.656 a 11.158 11.158 0 0 1 -11.168 -11.168 A 11.158 11.158 0 0 1 64 104.32 a 11.158 11.158 0 0 1 11.168 11.168 c 0 6.145 -4.992 11.168 -11.168 11.168 M 64 23.68 a 11.158 11.158 0 0 1 -11.168 -11.168 A 11.158 11.158 0 0 1 64 1.344 a 11.158 11.158 0 0 1 11.168 11.168 A 11.158 11.158 0 0 1 64 23.68" readonly property string graphql: "M 18.39 96.852 l -4.6 -2.657 L 65.04 5.434 l 4.597 2.656 z m 0 0 M 12.734 87.105 H 115.23 v 5.31 H 12.734 z m 0 0 M 66.031 119.688 L 14.766 90.09 l 2.656 -4.602 l 51.266 29.602 z m 0 0 M 110.566 42.543 L 59.301 12.941 l 2.656 -4.597 l 51.266 29.597 z m 0 0 M 17.434 42.523 l -2.657 -4.601 l 51.27 -29.598 l 2.656 4.598 z m 0 0 M 109.621 96.852 L 58.375 8.09 l 4.598 -2.656 l 51.25 88.761 z m 0 0 M 16.8 34.398 h 5.313 v 59.204 h -5.312 z m 0 0 M 105.887 34.398 h 5.312 v 59.204 h -5.312 z m 0 0 M 65.129 117.441 l -2.32 -4.02 l 44.586 -25.745 l 2.32 4.02 z m 0 0 M 118.238 95.328 c -3.07 5.344 -9.918 7.168 -15.261 4.098 c -5.344 -3.074 -7.168 -9.922 -4.098 -15.266 c 3.074 -5.344 9.922 -7.168 15.266 -4.097 c 5.375 3.105 7.199 9.921 4.093 15.265 M 29.09 43.84 c -3.074 5.344 -9.922 7.168 -15.266 4.097 c -5.344 -3.074 -7.168 -9.921 -4.097 -15.265 c 3.074 -5.344 9.921 -7.168 15.265 -4.098 c 5.344 3.106 7.168 9.922 4.098 15.266 M 9.762 95.328 c -3.075 -5.344 -1.25 -12.16 4.093 -15.266 c 5.344 -3.07 12.16 -1.246 15.266 4.098 c 3.07 5.344 1.246 12.16 -4.098 15.266 c -5.375 3.07 -12.191 1.246 -15.261 -4.098 M 98.91 43.84 c -3.07 -5.344 -1.246 -12.16 4.098 -15.266 c 5.344 -3.07 12.16 -1.246 15.265 4.098 c 3.07 5.344 1.247 12.16 -4.097 15.266 c -5.344 3.07 -12.192 1.246 -15.266 -4.098 M 64 126.656 a 11.158 11.158 0 0 1 -11.168 -11.168 A 11.158 11.158 0 0 1 64 104.32 a 11.158 11.158 0 0 1 11.168 11.168 c 0 6.145 -4.992 11.168 -11.168 11.168 M 64 23.68 a 11.158 11.158 0 0 1 -11.168 -11.168 A 11.158 11.158 0 0 1 64 1.344 a 11.158 11.158 0 0 1 11.168 11.168 A 11.158 11.158 0 0 1 64 23.68"
function path(language) { function path(language) {
const key = language.toLowerCase() const key = language.toLowerCase();
switch (key) { switch (key) {
case "c": case "c":
return c return c;
case "cpp": case "cpp":
return cpp return cpp;
case "csharp": case "csharp":
return csharp return csharp;
case "python": case "python":
return python return python;
case "rust": case "rust":
return rust return rust;
case "javascript": case "javascript":
return javascript return javascript;
case "typescript": case "typescript":
return typescript return typescript;
case "bash": case "bash":
return bash return bash;
case "zsh": case "zsh":
return zsh return zsh;
case "powershell": case "powershell":
return powershell return powershell;
case "cmake": case "cmake":
return cmake return cmake;
case "lua": case "lua":
return lua return lua;
case "java": case "java":
return java return java;
case "kotlin": case "kotlin":
return kotlin return kotlin;
case "swift": case "swift":
return swift return swift;
case "go": case "go":
return go return go;
case "dart": case "dart":
return dart return dart;
case "php": case "php":
return php return php;
case "ruby": case "ruby":
return ruby return ruby;
case "scala": case "scala":
return scala return scala;
case "haskell": case "haskell":
return haskell return haskell;
case "elixir": case "elixir":
return elixir return elixir;
case "erlang": case "erlang":
return erlang return erlang;
case "clojure": case "clojure":
return clojure return clojure;
case "r": case "r":
return r return r;
case "perl": case "perl":
return perl return perl;
case "zig": case "zig":
return zig return zig;
case "nim": case "nim":
return nim return nim;
case "ocaml": case "ocaml":
return ocaml return ocaml;
case "fsharp": case "fsharp":
return fsharp return fsharp;
case "visualbasic": case "visualbasic":
return visualbasic return visualbasic;
case "fortran": case "fortran":
return fortran return fortran;
case "crystal": case "crystal":
return crystal return crystal;
case "gleam": case "gleam":
return gleam return gleam;
case "julia": case "julia":
return julia return julia;
case "objectivec": case "objectivec":
return objectivec return objectivec;
case "vala": case "vala":
return vala return vala;
case "groovy": case "groovy":
return groovy return groovy;
case "racket": case "racket":
return racket return racket;
case "haxe": case "haxe":
return haxe return haxe;
case "purescript": case "purescript":
return purescript return purescript;
case "delphi": case "delphi":
return delphi return delphi;
case "coffeescript": case "coffeescript":
return coffeescript return coffeescript;
case "elm": case "elm":
return elm return elm;
case "awk": case "awk":
return awk return awk;
case "matlab": case "matlab":
return matlab return matlab;
case "solidity": case "solidity":
return solidity return solidity;
case "wasm": case "wasm":
return wasm return wasm;
case "vim": case "vim":
return vim return vim;
case "sql": case "sql":
return sql return sql;
case "json": case "json":
return json return json;
case "yaml": case "yaml":
return yaml return yaml;
case "xml": case "xml":
return xml return xml;
case "html": case "html":
return html return html;
case "css": case "css":
return css return css;
case "sass": case "sass":
return sass return sass;
case "markdown": case "markdown":
return markdown return markdown;
case "docker": case "docker":
return docker return docker;
case "latex": case "latex":
return latex return latex;
case "graphql": case "graphql":
return graphql return graphql;
case "cpp": case "cpp":
return cpp return cpp;
case "cc": case "cc":
return cpp return cpp;
case "cxx": case "cxx":
return cpp return cpp;
case "cs": case "cs":
return csharp return csharp;
case "js": case "js":
return javascript return javascript;
case "jsx": case "jsx":
return javascript return javascript;
case "ts": case "ts":
return typescript return typescript;
case "tsx": case "tsx":
return typescript return typescript;
case "py": case "py":
return python return python;
case "sh": case "sh":
return bash return bash;
case "shell": case "shell":
return bash return bash;
case "ps1": case "ps1":
return powershell return powershell;
case "vb": case "vb":
return visualbasic return visualbasic;
case "objective-c": case "objective-c":
return objectivec return objectivec;
case "obj-c": case "obj-c":
return objectivec return objectivec;
case "groovyscript": case "groovyscript":
return groovy return groovy;
case "pascal": case "pascal":
return delphi return delphi;
case "coffee": case "coffee":
return coffeescript return coffeescript;
case "mysql": case "mysql":
return sql return sql;
case "postgres": case "postgres":
return sql return sql;
case "postgresql": case "postgresql":
return sql return sql;
case "sqlite": case "sqlite":
return sql return sql;
case "yml": case "yml":
return yaml return yaml;
case "htm": case "htm":
return html return html;
case "scss": case "scss":
return sass return sass;
case "md": case "md":
return markdown return markdown;
case "dockerfile": case "dockerfile":
return docker return docker;
case "docker-compose": case "docker-compose":
return docker return docker;
case "tex": case "tex":
return latex return latex;
case "gql": case "gql":
return graphql return graphql;
default: default:
return "" return "";
} }
} }
function name(language) { function name(language) {
switch (language.toLowerCase()) { switch (language.toLowerCase()) {
case "c": case "c":
return "C" return "C";
case "cpp": case "cpp":
return "C++" return "C++";
case "csharp": case "csharp":
return "C#" return "C#";
case "python": case "python":
return "Python" return "Python";
case "rust": case "rust":
return "Rust" return "Rust";
case "javascript": case "javascript":
return "JavaScript" return "JavaScript";
case "typescript": case "typescript":
return "TypeScript" return "TypeScript";
case "bash": case "bash":
return "Bash" return "Bash";
case "zsh": case "zsh":
return "Zsh" return "Zsh";
case "powershell": case "powershell":
return "PowerShell" return "PowerShell";
case "cmake": case "cmake":
return "CMake" return "CMake";
case "lua": case "lua":
return "Lua" return "Lua";
case "java": case "java":
return "Java" return "Java";
case "kotlin": case "kotlin":
return "Kotlin" return "Kotlin";
case "swift": case "swift":
return "Swift" return "Swift";
case "go": case "go":
return "Go" return "Go";
case "dart": case "dart":
return "Dart" return "Dart";
case "php": case "php":
return "PHP" return "PHP";
case "ruby": case "ruby":
return "Ruby" return "Ruby";
case "scala": case "scala":
return "Scala" return "Scala";
case "haskell": case "haskell":
return "Haskell" return "Haskell";
case "elixir": case "elixir":
return "Elixir" return "Elixir";
case "erlang": case "erlang":
return "Erlang" return "Erlang";
case "clojure": case "clojure":
return "Clojure" return "Clojure";
case "r": case "r":
return "R" return "R";
case "perl": case "perl":
return "Perl" return "Perl";
case "zig": case "zig":
return "Zig" return "Zig";
case "nim": case "nim":
return "Nim" return "Nim";
case "ocaml": case "ocaml":
return "OCaml" return "OCaml";
case "fsharp": case "fsharp":
return "F#" return "F#";
case "visualbasic": case "visualbasic":
return "Visual Basic" return "Visual Basic";
case "fortran": case "fortran":
return "Fortran" return "Fortran";
case "crystal": case "crystal":
return "Crystal" return "Crystal";
case "gleam": case "gleam":
return "Gleam" return "Gleam";
case "julia": case "julia":
return "Julia" return "Julia";
case "objectivec": case "objectivec":
return "Objective-C" return "Objective-C";
case "vala": case "vala":
return "Vala" return "Vala";
case "groovy": case "groovy":
return "Groovy" return "Groovy";
case "racket": case "racket":
return "Racket" return "Racket";
case "haxe": case "haxe":
return "Haxe" return "Haxe";
case "purescript": case "purescript":
return "PureScript" return "PureScript";
case "delphi": case "delphi":
return "Delphi" return "Delphi";
case "coffeescript": case "coffeescript":
return "CoffeeScript" return "CoffeeScript";
case "elm": case "elm":
return "Elm" return "Elm";
case "awk": case "awk":
return "AWK" return "AWK";
case "matlab": case "matlab":
return "MATLAB" return "MATLAB";
case "solidity": case "solidity":
return "Solidity" return "Solidity";
case "wasm": case "wasm":
return "Wasm" return "Wasm";
case "vim": case "vim":
return "Vim" return "Vim";
case "sql": case "sql":
return "SQL" return "SQL";
case "json": case "json":
return "JSON" return "JSON";
case "yaml": case "yaml":
return "YAML" return "YAML";
case "xml": case "xml":
return "XML" return "XML";
case "html": case "html":
return "HTML" return "HTML";
case "css": case "css":
return "CSS" return "CSS";
case "sass": case "sass":
return "Sass" return "Sass";
case "markdown": case "markdown":
return "Markdown" return "Markdown";
case "docker": case "docker":
return "Docker" return "Docker";
case "latex": case "latex":
return "LaTeX" return "LaTeX";
case "graphql": case "graphql":
return "GraphQL" return "GraphQL";
case "cpp": case "cpp":
return "C++" return "C++";
case "cc": case "cc":
return "C++" return "C++";
case "cxx": case "cxx":
return "C++" return "C++";
case "cs": case "cs":
return "C#" return "C#";
case "js": case "js":
return "JavaScript" return "JavaScript";
case "jsx": case "jsx":
return "JavaScript" return "JavaScript";
case "ts": case "ts":
return "TypeScript" return "TypeScript";
case "tsx": case "tsx":
return "TypeScript" return "TypeScript";
case "py": case "py":
return "Python" return "Python";
case "sh": case "sh":
return "Bash" return "Bash";
case "shell": case "shell":
return "Bash" return "Bash";
case "ps1": case "ps1":
return "PowerShell" return "PowerShell";
case "vb": case "vb":
return "Visual Basic" return "Visual Basic";
case "objective-c": case "objective-c":
return "Objective-C" return "Objective-C";
case "obj-c": case "obj-c":
return "Objective-C" return "Objective-C";
case "groovyscript": case "groovyscript":
return "Groovy" return "Groovy";
case "pascal": case "pascal":
return "Delphi" return "Delphi";
case "coffee": case "coffee":
return "CoffeeScript" return "CoffeeScript";
case "mysql": case "mysql":
return "SQL" return "SQL";
case "postgres": case "postgres":
return "SQL" return "SQL";
case "postgresql": case "postgresql":
return "SQL" return "SQL";
case "sqlite": case "sqlite":
return "SQL" return "SQL";
case "yml": case "yml":
return "YAML" return "YAML";
case "htm": case "htm":
return "HTML" return "HTML";
case "scss": case "scss":
return "Sass" return "Sass";
case "md": case "md":
return "Markdown" return "Markdown";
case "dockerfile": case "dockerfile":
return "Docker" return "Docker";
case "docker-compose": case "docker-compose":
return "Docker" return "Docker";
case "tex": case "tex":
return "LaTeX" return "LaTeX";
case "gql": case "gql":
return "GraphQL" return "GraphQL";
case "":
return "Code";
default: default:
return language return language;
} }
} }
} }
+9 -18
View File
@@ -21,12 +21,8 @@ Item {
property bool chatOpen: ChatState.chatSession !== null property bool chatOpen: ChatState.chatSession !== null
readonly property bool isWide: root.width >= root.breakpoint readonly property bool isWide: root.width >= root.breakpoint
readonly property bool wideExpandedSidebar: isWide && !ChatState.shrinkSidebarOverride
readonly property bool showList: isWide || !chatOpen readonly property bool narrowExpandedSidebar: !isWide && ChatState.narrowSidebarExpanded
readonly property bool showContent: !isWide && chatOpen
function openConversation(conv: ChatSession, index: int): void {
}
BlobGroup { BlobGroup {
id: blobGroup id: blobGroup
@@ -54,9 +50,9 @@ Item {
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: Tokens.padding.medium anchors.margins: Tokens.padding.medium
implicitWidth: root.isWide || ChatState.narrowSidebarExpanded ? Config.sidebar.sizes.width : root.iconSize implicitWidth: root.wideExpandedSidebar || root.narrowExpandedSidebar ? Config.sidebar.sizes.width : root.iconSize
highlight: true highlight: true
slim: !root.isWide && !ChatState.narrowSidebarExpanded slim: !root.wideExpandedSidebar && !root.narrowExpandedSidebar
z: 1 z: 1
Behavior on implicitWidth { Behavior on implicitWidth {
@@ -86,13 +82,13 @@ Item {
} }
} }
ClipRect { Item {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: invertedRect.borderLeft anchors.leftMargin: invertedRect.borderLeft
anchors.topMargin: invertedRect.borderTop anchors.topMargin: invertedRect.borderTop
anchors.bottomMargin: invertedRect.borderBottom anchors.bottomMargin: invertedRect.borderBottom
anchors.rightMargin: invertedRect.borderRight anchors.rightMargin: invertedRect.borderRight
radius: invertedRect.radius clip: true
children: [contentArea, dim] children: [contentArea, dim]
} }
@@ -100,9 +96,10 @@ Item {
CustomRect { CustomRect {
id: dim id: dim
anchors.fill: parent anchors.fill: parent
radius: invertedRect.radius
color: Colors.palette.m3shadow color: Colors.palette.m3shadow
opacity: ChatState.narrowSidebarExpanded && !root.isWide ? 0.3 : 0 opacity: root.narrowExpandedSidebar ? 0.3 : 0
z: 1 z: 1
Behavior on opacity { Behavior on opacity {
@@ -155,7 +152,7 @@ Item {
id: dimArea id: dimArea
anchors.fill: parent anchors.fill: parent
preventStealing: true preventStealing: true
enabled: !root.isWide && ChatState.narrowSidebarExpanded enabled: root.narrowExpandedSidebar
cursorShape: undefined cursorShape: undefined
onClicked: { onClicked: {
@@ -175,12 +172,6 @@ Item {
} }
} }
Binding {
target: ChatState
property: "windowIsWide"
value: root.showList
}
Binding { Binding {
target: ChatState target: ChatState
property: "isWide" property: "isWide"
+1 -1
View File
@@ -52,7 +52,7 @@ FontBuilder FontBuilder::letterSpacing(qreal spacing, bool absolute) {
return *this; return *this;
} }
FontBuilder FontBuilder::capitalisation(QFont::Capitalization cap) { FontBuilder FontBuilder::capitalization(QFont::Capitalization cap) {
m_font.setCapitalization(cap); m_font.setCapitalization(cap);
return *this; return *this;
} }
+1 -1
View File
@@ -23,7 +23,7 @@ class FontBuilder {
[[nodiscard]] Q_INVOKABLE FontBuilder [[nodiscard]] Q_INVOKABLE FontBuilder
letterSpacing(qreal spacing, bool absolute = true); letterSpacing(qreal spacing, bool absolute = true);
[[nodiscard]] Q_INVOKABLE FontBuilder [[nodiscard]] Q_INVOKABLE FontBuilder
capitalisation(QFont::Capitalization cap); capitalization(QFont::Capitalization cap);
[[nodiscard]] Q_INVOKABLE FontBuilder vaxis(const QString& tag, float value); [[nodiscard]] Q_INVOKABLE FontBuilder vaxis(const QString& tag, float value);
[[nodiscard]] Q_INVOKABLE FontBuilder vaxes(const QVariantMap& axes); [[nodiscard]] Q_INVOKABLE FontBuilder vaxes(const QVariantMap& axes);
[[nodiscard]] Q_INVOKABLE QFont build() const; [[nodiscard]] Q_INVOKABLE QFont build() const;
+2
View File
@@ -22,10 +22,12 @@ qml_module(ZShell-services
networkusage.hpp networkusage.cpp networkusage.hpp networkusage.cpp
lyriccandidate.hpp lyriccandidate.cpp lyriccandidate.hpp lyriccandidate.cpp
lyrics.hpp lyrics.cpp lyrics.hpp lyrics.cpp
dropimporter.hpp dropimporter.cpp
LIBRARIES LIBRARIES
Qt6::Core Qt6::Core
Qt6::Qml Qt6::Qml
Qt6::Concurrent Qt6::Concurrent
Qt6::Network
PkgConfig::Pipewire PkgConfig::Pipewire
PkgConfig::Aubio PkgConfig::Aubio
PkgConfig::Cava PkgConfig::Cava
+263
View File
@@ -0,0 +1,263 @@
#include "dropimporter.hpp"
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QMetaObject>
#include <QMimeDatabase>
#include <QNetworkReply>
#include <QRegularExpression>
namespace {
constexpr qint64 kMaxBytes = 100 * 1024 * 1024;
bool isHttp(const QUrl& u) {
return u.scheme() == QLatin1String("http") ||
u.scheme() == QLatin1String("https");
}
QString firstImgSrc(const QString& html) {
static const QRegularExpression re(
R"(<img\b[^>]*?\bsrc\s*=\s*["']([^"']+)["'])",
QRegularExpression::CaseInsensitiveOption);
const auto m = re.match(html);
if (!m.hasMatch()) return {};
return m.captured(1).replace(QLatin1String("&amp;"), QLatin1String("&"));
}
bool looksLikeUrl(const QString& text) {
const QString t = text.trimmed();
if (t.isEmpty() || t.contains(QRegularExpression(QStringLiteral("\\s"))))
return false;
const QUrl u(t);
return u.isValid() && (isHttp(u) || u.isLocalFile());
}
QString sanitize(QString name) {
name = QFileInfo(name).fileName();
name.replace(
QRegularExpression(QStringLiteral("[\\\\/:*?\"<>|\\x00-\\x1f]")),
QStringLiteral("_"));
return name.left(120);
}
QString fileNameFor(QNetworkReply* reply, const QUrl& url) {
static const QRegularExpression cd(
QStringLiteral("filename\\*?=(?:UTF-8'')?\"?([^\";]+)\"?"),
QRegularExpression::CaseInsensitiveOption);
const auto m =
cd.match(QString::fromUtf8(reply->rawHeader("Content-Disposition")));
QString name = m.hasMatch()
? QUrl::fromPercentEncoding(m.captured(1).toUtf8())
: url.fileName();
name = sanitize(name);
return name.isEmpty() ? QStringLiteral("download") : name;
}
} // namespace
namespace ZShell::Services {
DropImporter::DropImporter(QObject* parent) : QObject(parent) {}
DropImporter::Decision DropImporter::decide(
const QList<QUrl>& urls,
const QString& text,
const QString& html,
bool hasRawImage) const {
for (const QUrl& u : urls)
if (u.isLocalFile()) return Attach;
const QString src = firstImgSrc(html);
if (hasRawImage ||
(!src.isEmpty() && (text.trimmed().isEmpty() || looksLikeUrl(text))))
return Attach;
QMimeDatabase db;
for (const QUrl& u : urls) {
if (!isHttp(u) || QFileInfo(u.path()).suffix().isEmpty()) continue;
const QMimeType mt = db.mimeTypeForUrl(u);
if (!mt.isDefault() && !mt.inherits(QStringLiteral("text/html")))
return Attach;
}
if (!text.isEmpty() || !urls.isEmpty()) return InsertText;
return Ignore;
}
int DropImporter::importAttachments(
const QList<QUrl>& urls, const QString& html, const QByteArray& rawImage) {
const int id = ++m_nextId;
m_requests[id].pending = 1;
if (!rawImage.isEmpty()) {
saveBytes(id, rawImage);
} else if (const QString src = firstImgSrc(html); !src.isEmpty()) {
if (src.startsWith(QLatin1String("data:"), Qt::CaseInsensitive)) {
const int comma = src.indexOf(QLatin1Char(','));
if (comma < 0) {
failWith(id, tr("Malformed data URI"));
} else {
const bool b64 = src.left(comma).contains(
QLatin1String(";base64"), Qt::CaseInsensitive);
const QString payload = src.mid(comma + 1);
saveBytes(
id,
b64 ? QByteArray::fromBase64(payload.toLatin1())
: QByteArray::fromPercentEncoding(payload.toUtf8()));
}
} else {
const QUrl u(src);
if (u.isLocalFile())
addLocal(id, u);
else if (isHttp(u))
download(id, u);
else
failWith(id, tr("Unsupported image source"));
}
} else {
for (const QUrl& u : urls) {
if (u.isLocalFile())
addLocal(id, u);
else if (isHttp(u))
download(id, u);
else
failWith(id, tr("Unsupported URL: %1").arg(u.toString()));
}
}
QMetaObject::invokeMethod(
this, [this, id] { finishUnit(id); }, Qt::QueuedConnection);
return id;
}
void DropImporter::addLocal(int id, const QUrl& url) {
const QFileInfo fi(url.toLocalFile());
if (!fi.exists())
failWith(id, tr("File not found: %1").arg(fi.filePath()));
else if (fi.isDir())
failWith(id, tr("Folders can't be attached: %1").arg(fi.fileName()));
else if (fi.size() > kMaxBytes)
failWith(id, tr("File too large: %1").arg(fi.fileName()));
else
succeed(id, fi.absoluteFilePath());
}
void DropImporter::saveBytes(int id, const QByteArray& bytes) {
if (bytes.isEmpty() || bytes.size() > kMaxBytes) {
failWith(id, tr("Empty or oversized data"));
return;
}
const QString dir = newSubdir();
if (dir.isEmpty()) {
failWith(id, tr("No temp directory"));
return;
}
const QString suffix =
QMimeDatabase().mimeTypeForData(bytes).preferredSuffix();
const QString path =
dir + QStringLiteral("/dropped") +
(suffix.isEmpty() ? QString() : QLatin1Char('.') + suffix);
QFile f(path);
if (!f.open(QIODevice::WriteOnly) || f.write(bytes) != bytes.size()) {
failWith(id, tr("Could not write temp file"));
return;
}
f.close();
succeed(id, path);
}
void DropImporter::download(int id, const QUrl& url) {
const QString dir = newSubdir();
if (dir.isEmpty()) {
failWith(id, tr("No temp directory"));
return;
}
++m_requests[id].pending;
QNetworkRequest req(url);
req.setAttribute(
QNetworkRequest::RedirectPolicyAttribute,
QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkReply* reply = m_nam.get(req);
auto* file = new QFile(dir + QStringLiteral("/download.part"), reply);
connect(reply, &QNetworkReply::readyRead, this, [reply, file] {
if (!file->isOpen() && !file->open(QIODevice::WriteOnly)) {
reply->abort();
return;
}
file->write(reply->readAll());
if (file->size() > kMaxBytes) reply->abort();
});
connect(
reply,
&QNetworkReply::finished,
this,
[this, reply, file, id, dir, url] {
reply->deleteLater();
const bool tooBig = file->size() > kMaxBytes;
const bool wrote = file->isOpen();
file->close();
if (tooBig) {
failWith(id, tr("Download too large: %1").arg(url.toString()));
} else if (reply->error() != QNetworkReply::NoError) {
failWith(
id,
tr("Download failed (%1): %2")
.arg(url.toString(), reply->errorString()));
} else if (!wrote) {
failWith(id, tr("Empty response: %1").arg(url.toString()));
} else {
const QString name = fileNameFor(reply, url);
QString finalPath = dir + QLatin1Char('/') + name;
if (QFile::rename(file->fileName(), finalPath)) {
if (QFileInfo(name).suffix().isEmpty()) {
const QString sfx =
QMimeDatabase()
.mimeTypeForFile(
finalPath, QMimeDatabase::MatchContent)
.preferredSuffix();
if (!sfx.isEmpty() &&
QFile::rename(
finalPath, finalPath + QLatin1Char('.') + sfx))
finalPath += QLatin1Char('.') + sfx;
}
succeed(id, finalPath);
} else {
failWith(id, tr("Could not store download"));
}
}
finishUnit(id);
});
}
void DropImporter::succeed(int id, const QString& path) {
if (auto it = m_requests.find(id); it != m_requests.end())
it->files.append(path);
}
void DropImporter::failWith(int id, const QString& message) {
if (auto it = m_requests.find(id); it != m_requests.end())
it->errors.append(message);
}
void DropImporter::finishUnit(int id) {
auto it = m_requests.find(id);
if (it == m_requests.end() || --it->pending > 0) return;
const Request r = *it;
m_requests.erase(it);
emit importFinished(id, r.files, r.errors);
}
QString DropImporter::newSubdir() {
if (!m_tempDir.isValid()) return {};
const QString p = m_tempDir.filePath(QString::number(++m_counter));
return QDir().mkpath(p) ? p : QString();
}
} // namespace ZShell::Services
+62
View File
@@ -0,0 +1,62 @@
#pragma once
#include <QHash>
#include <QList>
#include <QNetworkAccessManager>
#include <QObject>
#include <QQmlEngine>
#include <QStringList>
#include <QTemporaryDir>
#include <QUrl>
namespace ZShell::Services {
class DropImporter : public QObject {
Q_OBJECT
QML_ELEMENT
QML_SINGLETON
public:
enum Decision { Ignore, InsertText, Attach };
Q_ENUM(Decision)
explicit DropImporter(QObject* parent = nullptr);
Q_INVOKABLE Decision decide(
const QList<QUrl>& urls,
const QString& text,
const QString& html,
bool hasRawImage) const;
Q_INVOKABLE int importAttachments(
const QList<QUrl>& urls,
const QString& html,
const QByteArray& rawImage);
signals:
void importFinished(
int id, const QStringList& paths, const QStringList& errors);
private:
struct Request {
int pending = 0;
QStringList files;
QStringList errors;
};
void addLocal(int id, const QUrl& url);
void download(int id, const QUrl& url);
void saveBytes(int id, const QByteArray& bytes);
void succeed(int id, const QString& path);
void failWith(int id, const QString& message);
void finishUnit(int id);
QString newSubdir();
QNetworkAccessManager m_nam;
QTemporaryDir m_tempDir;
QHash<int, Request> m_requests;
int m_nextId = 0;
int m_counter = 0;
};
} // namespace ZShell::Services