From e7e793c3048f25fa100480826f8368246317ec5b Mon Sep 17 00:00:00 2001 From: "Flora (opencode)" Date: Mon, 17 Aug 2026 14:58:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5=D0=BC?= =?UTF-8?q?=D1=8B=20=D0=B8=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=B0=D0=BF=D0=BA=D0=B8:=20Basic=20style=20(=D0=B5=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=81=D0=B2=D0=B5=D1=82=D0=BB=D1=8B=D0=B9?= =?UTF-8?q?=20=D0=B2=D0=B8=D0=B4),=20FolderDialog=20=E2=80=94=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D0=B5=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=B2=D0=BB=D0=B5=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF?= =?UTF-8?q?=D1=83=D1=82=D0=B8=20=D0=B8=D0=B7=20URL=20(selectedFolder.toStr?= =?UTF-8?q?ing=20=E2=86=92=20strip=20file://)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qml/wizard/WelcomeWizard.qml | 9 ++++++++- src/main.cpp | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/qml/wizard/WelcomeWizard.qml b/qml/wizard/WelcomeWizard.qml index 4a9e517..d547c09 100644 --- a/qml/wizard/WelcomeWizard.qml +++ b/qml/wizard/WelcomeWizard.qml @@ -59,7 +59,14 @@ Dialog { FolderDialog { id: folderDialog title: qsTr("Выберите папку хранилища") - onAccepted: root.vaultPath = selectedFolder.localFile ?? "" + onAccepted: { + // selectedFolder — URL вида "file:///path/to/folder" + var u = selectedFolder.toString() + if (u.startsWith("file://")) + root.vaultPath = u.substring(7) + else + root.vaultPath = u + } } Label { id: step1Error diff --git a/src/main.cpp b/src/main.cpp index 0d229e6..c9eb070 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "app/VaultManager.h" #include "app/WindowController.h" @@ -18,6 +19,8 @@ int main(int argc, char *argv[]) { + // Единообразный светлый стиль — без нативной тёмной темы macOS + QQuickStyle::setStyle("Basic"); QGuiApplication app(argc, argv); app.setApplicationName("Flora"); app.setOrganizationName("Flora");