From c939ca8934dac113c6765bd677dbc2540fc51c8b Mon Sep 17 00:00:00 2001 From: reionwong Date: Mon, 19 Jul 2021 11:47:08 +0800 Subject: [PATCH] Improve tabbar details --- .../lib/color-schemes/Cutefish-Dark.colorscheme | 2 +- src/processhelper.cpp | 12 ++++++++++++ src/processhelper.h | 1 + src/qml/Terminal.qml | 2 +- src/qml/main.qml | 3 ++- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/qmltermwidget/lib/color-schemes/Cutefish-Dark.colorscheme b/qmltermwidget/lib/color-schemes/Cutefish-Dark.colorscheme index a692b69..916f4dd 100644 --- a/qmltermwidget/lib/color-schemes/Cutefish-Dark.colorscheme +++ b/qmltermwidget/lib/color-schemes/Cutefish-Dark.colorscheme @@ -1,6 +1,6 @@ [Background] Bold=false -Color=46, 46, 46 +Color=28, 28, 29 Transparency=false [BackgroundIntense] diff --git a/src/processhelper.cpp b/src/processhelper.cpp index 2e9b9ed..deac390 100644 --- a/src/processhelper.cpp +++ b/src/processhelper.cpp @@ -18,7 +18,9 @@ */ #include "processhelper.h" +#include #include +#include ProcessHelper *SELF = nullptr; @@ -40,3 +42,13 @@ bool ProcessHelper::startDetached(const QString &program, const QStringList &arg { return QProcess::startDetached(program, arguments); } + +bool ProcessHelper::openUrl(const QString &url) +{ + QUrl _url = QUrl::fromUserInput(url); + + if (url.isNull()) + return false; + + return QDesktopServices::openUrl(_url); +} diff --git a/src/processhelper.h b/src/processhelper.h index d20bb8d..c6f93e5 100644 --- a/src/processhelper.h +++ b/src/processhelper.h @@ -31,6 +31,7 @@ public: explicit ProcessHelper(QObject *parent = nullptr); Q_INVOKABLE bool startDetached(const QString &program, const QStringList &arguments); + Q_INVOKABLE bool openUrl(const QString &url); }; diff --git a/src/qml/Terminal.qml b/src/qml/Terminal.qml index 551bf46..bce1e8d 100644 --- a/src/qml/Terminal.qml +++ b/src/qml/Terminal.qml @@ -175,7 +175,7 @@ Page { MenuItem { text: qsTr("Open File Manager") - onTriggered: Process.startDetached("gio", ["open", _session.currentDir]) + onTriggered: Process.openUrl(_session.currentDir) } } diff --git a/src/qml/main.qml b/src/qml/main.qml index 79a8467..790eb30 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -34,6 +34,7 @@ FishUI.Window { height: settings.height title: currentItem && currentItem.terminal ? currentItem.terminal.session.title : "" + background.color: FishUI.Theme.secondBackgroundColor header.height: 45 property int currentIndex: -1 @@ -71,7 +72,7 @@ FishUI.Window { anchors.leftMargin: FishUI.Units.smallSpacing anchors.rightMargin: FishUI.Units.smallSpacing anchors.topMargin: FishUI.Units.smallSpacing - anchors.bottomMargin: FishUI.Units.smallSpacing / 2 + anchors.bottomMargin: FishUI.Units.smallSpacing spacing: FishUI.Units.smallSpacing ListView {